support of force_keepalive parameter
authorAndreas Steffen <andreas.steffen@strongswan.org>
Wed, 2 Apr 2008 18:35:23 +0000 (18:35 -0000)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Wed, 2 Apr 2008 18:35:23 +0000 (18:35 -0000)
src/starter/args.c
src/starter/confread.h
src/starter/invokepluto.c
src/starter/keywords.h
src/starter/keywords.txt

index 479321c..075956d 100644 (file)
@@ -171,6 +171,7 @@ static const token_info_t token_info[] =
     { ARG_ENUM, offsetof(starter_config_t, setup.nocrsend), LST_bool               },
     { ARG_ENUM, offsetof(starter_config_t, setup.nat_traversal), LST_bool          },
     { ARG_TIME, offsetof(starter_config_t, setup.keep_alive), NULL                 },
+    { ARG_ENUM, offsetof(starter_config_t, setup.force_keepalive), LST_bool        },
     { ARG_STR,  offsetof(starter_config_t, setup.virtual_private), NULL            },
     { ARG_STR,  offsetof(starter_config_t, setup.pkcs11module), NULL               },
     { ARG_STR,  offsetof(starter_config_t, setup.pkcs11initargs), NULL             },
index b866a91..4ccf628 100644 (file)
@@ -184,6 +184,7 @@ struct starter_config {
                bool     nocrsend;
                bool     nat_traversal;
                u_int    keep_alive;
+               u_int    force_keepalive;
                char     *virtual_private;
                char     *pkcs11module;
                char     *pkcs11initargs;
index 7c995f8..b3a8749 100644 (file)
@@ -167,6 +167,10 @@ starter_start_pluto (starter_config_t *cfg, bool debug)
     {
        arg[argc++] = "--nat_traversal";
     }
+    if (cfg->setup.force_keepalive)
+    {
+       arg[argc++] = "--force_keepalive";
+    }
     if (cfg->setup.keep_alive)
     {
        static char buf2[15];
index f71b008..84c5ab7 100644 (file)
@@ -39,6 +39,7 @@ typedef enum {
     KW_NOCRSEND,
     KW_NAT_TRAVERSAL,
     KW_KEEP_ALIVE,
+    KW_FORCE_KEEPALIVE,
     KW_VIRTUAL_PRIVATE,
     KW_PKCS11MODULE,
     KW_PKCS11INITARGS,
index af9eaa0..470397a 100644 (file)
@@ -47,6 +47,7 @@ strictcrlpolicy,   KW_STRICTCRLPOLICY
 nocrsend,          KW_NOCRSEND
 nat_traversal,     KW_NAT_TRAVERSAL
 keep_alive,        KW_KEEP_ALIVE
+force_keepalive,   KW_FORCE_KEEPALIVE
 virtual_private,   KW_VIRTUAL_PRIVATE
 eap,               KW_EAP
 mobike,                   KW_MOBIKE