diff options
Diffstat (limited to 'main/strongswan/0004-vici-support-asynchronous-initiation.patch')
| -rw-r--r-- | main/strongswan/0004-vici-support-asynchronous-initiation.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/main/strongswan/0004-vici-support-asynchronous-initiation.patch b/main/strongswan/0004-vici-support-asynchronous-initiation.patch new file mode 100644 index 000000000..eefda89fd --- /dev/null +++ b/main/strongswan/0004-vici-support-asynchronous-initiation.patch @@ -0,0 +1,47 @@ +From 18c8cb346648a385878d6cde8d1d95fa22cf0a9b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Thu, 28 May 2015 13:06:51 +0300 +Subject: [PATCH 4/4] vici: support asynchronous initiation +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Timo Teräs <timo.teras@iki.fi> +--- + src/libcharon/plugins/vici/vici_control.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/libcharon/plugins/vici/vici_control.c b/src/libcharon/plugins/vici/vici_control.c +index 9a58399..e9bcb90 100644 +--- a/src/libcharon/plugins/vici/vici_control.c ++++ b/src/libcharon/plugins/vici/vici_control.c +@@ -186,7 +186,7 @@ CALLBACK(initiate, vici_message_t*, + peer_cfg_t *peer_cfg; + host_t *my_host = NULL, *other_host = NULL; + char *child, *my_host_str, *other_host_str; +- u_int timeout; ++ u_int timeout, async; + log_info_t log = { + .dispatcher = this->dispatcher, + .id = id, +@@ -194,6 +194,7 @@ CALLBACK(initiate, vici_message_t*, + + child = request->get_str(request, NULL, "child"); + timeout = request->get_int(request, 0, "timeout"); ++ async = request->get_int(request, 0, "async"); + log.level = request->get_int(request, 1, "loglevel"); + my_host_str = request->get_str(request, NULL, "my-host"); + other_host_str = request->get_str(request, NULL, "other-host"); +@@ -222,7 +223,8 @@ CALLBACK(initiate, vici_message_t*, + } + switch (charon->controller->initiate(charon->controller, + peer_cfg, child_cfg, my_host, other_host, +- (controller_cb_t)log_vici, &log, timeout)) ++ async ? NULL : (controller_cb_t)log_vici, ++ &log, timeout)) + { + case SUCCESS: + msg = send_reply(this, NULL); +-- +2.4.2 + |