diff options
author | Christian Poessinger <christian@poessinger.com> | 2020-06-12 00:59:57 +0200 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2020-06-12 01:00:19 +0200 |
commit | 1014d39807a14d266d35db5a94eae2d26e6ea336 (patch) | |
tree | 6f48c09d5852f1a7419ef8257354ee0e48faf100 /debian/patches/1006-vici-add-deprecated-async-parameter.patch | |
parent | fd286871448acc36f8d727c07405ba8ff91d1d2b (diff) | |
download | vyos-strongswan-1014d39807a14d266d35db5a94eae2d26e6ea336.tar.gz vyos-strongswan-1014d39807a14d266d35db5a94eae2d26e6ea336.zip |
dmvpn: add required patches for FRR NHRP implementation
Patches are not active. To activate bth patches add their corresponding
file name to debian/patches/series.
From FRR docs:
nhrpd needs tight integration with IKE daemon for various reasons. Currently
only strongSwan is supported as IKE daemon. nhrpd connects to strongSwan using
VICI protocol based on UNIX socket (hardcoded now as /var/run/charon.vici).
strongSwan currently needs few patches applied. Please check out bot git
- https://git.alpinelinux.org/user/tteras/strongswan/log/?h=tteras-release
- https://git.alpinelinux.org/user/tteras/strongswan/log/?h=tteras
repositories for the patches.
Diffstat (limited to 'debian/patches/1006-vici-add-deprecated-async-parameter.patch')
-rw-r--r-- | debian/patches/1006-vici-add-deprecated-async-parameter.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/debian/patches/1006-vici-add-deprecated-async-parameter.patch b/debian/patches/1006-vici-add-deprecated-async-parameter.patch new file mode 100644 index 000000000..90ae658d4 --- /dev/null +++ b/debian/patches/1006-vici-add-deprecated-async-parameter.patch @@ -0,0 +1,49 @@ +From 0c33419af4403597aac1f75e8d044150ecc2f03c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Mon, 21 Sep 2015 13:42:15 +0300 +Subject: [PATCH] vici: add (deprecated) async parameter +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is obsoleted by the new "timeout=-1" option that achieves +the same. Only for compatibility with old versions of quagga-nhrp. + +Signed-off-by: Timo Teräs <timo.teras@iki.fi> +--- + src/libcharon/plugins/vici/vici_control.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/libcharon/plugins/vici/vici_control.c b/src/libcharon/plugins/vici/vici_control.c +index 9c6b86741..718d14b3c 100644 +--- a/src/libcharon/plugins/vici/vici_control.c ++++ b/src/libcharon/plugins/vici/vici_control.c +@@ -197,7 +197,7 @@ CALLBACK(initiate, vici_message_t*, + host_t *my_host = NULL, *other_host = NULL; + char *child, *ike, *my_host_str, *other_host_str; + int timeout; +- bool limits; ++ bool limits, async; + controller_cb_t log_cb = NULL; + log_info_t log = { + .dispatcher = this->dispatcher, +@@ -208,6 +208,7 @@ CALLBACK(initiate, vici_message_t*, + ike = request->get_str(request, NULL, "ike"); + timeout = request->get_int(request, 0, "timeout"); + 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"); +@@ -216,7 +217,7 @@ CALLBACK(initiate, vici_message_t*, + { + return send_reply(this, "missing configuration name"); + } +- if (timeout >= 0) ++ if (timeout >= 0 && !async) + { + log_cb = (controller_cb_t)log_vici; + } +-- +2.20.1 + |