From 49104abddf3d71d5abf5cf75dc7f95fa6c55fa63 Mon Sep 17 00:00:00 2001
From: Rene Mayrhofer <rene@mayrhofer.eu.org>
Date: Fri, 26 Oct 2007 14:10:02 +0000
Subject: [svn-upgrade] Integrating new upstream version, strongswan (4.1.8)

---
 src/charon/control/interface_manager.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'src/charon/control/interface_manager.c')

diff --git a/src/charon/control/interface_manager.c b/src/charon/control/interface_manager.c
index 700174c5b..c71036567 100644
--- a/src/charon/control/interface_manager.c
+++ b/src/charon/control/interface_manager.c
@@ -290,6 +290,13 @@ static status_t initiate(private_interface_manager_t *this,
 	}
 	charon->ike_sa_manager->checkin(charon->ike_sa_manager, ike_sa);
 	
+	if (callback == NULL)
+	{
+		/* don't wait for a result if no callback is specified */
+		charon->bus->set_listen_state(charon->bus, FALSE);
+		return NEED_MORE;
+	}
+	
 	/* wait until we get a result */
 	while (TRUE)
 	{
@@ -669,6 +676,14 @@ static void load_interfaces(private_interface_manager_t *this)
 	closedir(dir);
 }
 
+/**
+ * See header
+ */
+bool interface_manager_cb_empty(void *param, signal_t signal, level_t level,
+								ike_sa_t *ike_sa, char *format, va_list args)
+{
+	return TRUE;
+}
 
 /**
  * Implementation of stroke_t.destroy.
-- 
cgit v1.2.3