diff options
| author | Yves-Alexis Perez <corsac@corsac.net> | 2012-06-28 21:16:07 +0200 |
|---|---|---|
| committer | Yves-Alexis Perez <corsac@corsac.net> | 2012-06-28 21:16:07 +0200 |
| commit | a3b482a8facde4b453ad821bfe40effbe3d17903 (patch) | |
| tree | 636f02074b05b7473f5db1fe60fa2bceb0094a62 /src/starter/args.c | |
| parent | d816a1afbd841e9943bb439fe4e110b7c4970550 (diff) | |
| parent | b34738ed08c2227300d554b139e2495ca5da97d6 (diff) | |
| download | vyos-strongswan-a3b482a8facde4b453ad821bfe40effbe3d17903.tar.gz vyos-strongswan-a3b482a8facde4b453ad821bfe40effbe3d17903.zip | |
Merge tag 'upstream/4.6.4'
Upstream version 4.6.4
Diffstat (limited to 'src/starter/args.c')
| -rw-r--r-- | src/starter/args.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/starter/args.c b/src/starter/args.c index 4d8003aab..65d0a753c 100644 --- a/src/starter/args.c +++ b/src/starter/args.c @@ -24,7 +24,6 @@ #include "../pluto/log.h" #include "keywords.h" -#include "parser.h" #include "confread.h" #include "args.h" @@ -130,6 +129,7 @@ static const char *LST_plutodebug[] = { "control", "lifecycle", "klips", + "kernel", "dns", "natt", "oppo", @@ -228,6 +228,7 @@ static const token_info_t token_info[] = { ARG_TIME, offsetof(starter_conn_t, dpd_delay), NULL }, { ARG_TIME, offsetof(starter_conn_t, dpd_timeout), NULL }, { ARG_ENUM, offsetof(starter_conn_t, dpd_action), LST_dpd_action }, + { ARG_ENUM, offsetof(starter_conn_t, close_action), LST_dpd_action }, { ARG_TIME, offsetof(starter_conn_t, inactivity), NULL }, { ARG_MISC, 0, NULL /* KW_MODECONFIG */ }, { ARG_MISC, 0, NULL /* KW_XAUTH */ }, @@ -254,7 +255,7 @@ static const token_info_t token_info[] = { ARG_STR, offsetof(starter_ca_t, certuribase), NULL }, /* end keywords */ - { ARG_MISC, 0, NULL /* KW_HOST */ }, + { ARG_STR, offsetof(starter_end_t, host), NULL }, { ARG_UINT, offsetof(starter_end_t, ikeport), NULL }, { ARG_MISC, 0, NULL /* KW_NEXTHOP */ }, { ARG_STR, offsetof(starter_end_t, subnet), NULL }, |