diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2015-07-17 11:55:55 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2015-07-17 11:57:00 +0300 |
| commit | 6f2ac56727056f7ba7c55640459e40bbb1f17ef6 (patch) | |
| tree | f3a10eed7ccd10552b1dbf475e4edcb856468f6b /main/strongswan/1004-vici-support-asynchronous-initiation.patch | |
| parent | 562d4b1c781fc780fa893878ea3a6b850d6dbddb (diff) | |
| download | aports-6f2ac56727056f7ba7c55640459e40bbb1f17ef6.tar.bz2 aports-6f2ac56727056f7ba7c55640459e40bbb1f17ef6.tar.xz | |
amin/strongswan: upstream patch for applying limits to initiated connections
Diffstat (limited to 'main/strongswan/1004-vici-support-asynchronous-initiation.patch')
| -rw-r--r-- | main/strongswan/1004-vici-support-asynchronous-initiation.patch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/main/strongswan/1004-vici-support-asynchronous-initiation.patch b/main/strongswan/1004-vici-support-asynchronous-initiation.patch index eefda89fd5..5c99482796 100644 --- a/main/strongswan/1004-vici-support-asynchronous-initiation.patch +++ b/main/strongswan/1004-vici-support-asynchronous-initiation.patch @@ -1,7 +1,7 @@ -From 18c8cb346648a385878d6cde8d1d95fa22cf0a9b Mon Sep 17 00:00:00 2001 +From 4564b52fdbb6e588398178e607023fbac2819da8 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 +Subject: [PATCH] vici: support asynchronous initiation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -12,36 +12,36 @@ Signed-off-by: Timo Teräs <timo.teras@iki.fi> 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 +index d37e11f..66478fd 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; +@@ -187,7 +187,7 @@ CALLBACK(initiate, vici_message_t*, host_t *my_host = NULL, *other_host = NULL; char *child, *my_host_str, *other_host_str; -- u_int timeout; -+ u_int timeout, async; + u_int timeout; +- bool limits; ++ bool limits, async; log_info_t log = { .dispatcher = this->dispatcher, .id = id, -@@ -194,6 +194,7 @@ CALLBACK(initiate, vici_message_t*, - +@@ -196,6 +196,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"); + limits = request->get_bool(request, FALSE, "init-limits"); ++ async = request->get_bool(request, FALSE, "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*, +@@ -224,7 +225,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)) +- (controller_cb_t)log_vici, &log, timeout, limits)) + async ? NULL : (controller_cb_t)log_vici, -+ &log, timeout)) ++ &log, timeout, limits)) { case SUCCESS: msg = send_reply(this, NULL); -- -2.4.2 +2.4.5 |