diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2015-09-21 13:42:15 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-11-20 10:44:39 +0200 |
| commit | 941ec20df80cbe0f0287742d06859d80fb343736 (patch) | |
| tree | 35bb77dce133a620f1d77365e8402885579b3c24 | |
| parent | 6aea77701f72bfb7aad62ca0d3bb3f4b8794e5ed (diff) | |
| download | strongswan-941ec20df80cbe0f0287742d06859d80fb343736.tar.bz2 strongswan-941ec20df80cbe0f0287742d06859d80fb343736.tar.xz | |
vici: add (deprecated) async parameter
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>
| -rw-r--r-- | src/libcharon/plugins/vici/vici_control.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libcharon/plugins/vici/vici_control.c b/src/libcharon/plugins/vici/vici_control.c index 94bb2eecb..73e5c662c 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; } |