- applied patch from andreas

- added charonstart option to config - new ikev2 tests for UML
2006-05-06 07:09:45 +00:00
parent 9820c0e208
commit 65cf07ac1d
16 changed files with 684 additions and 723 deletions
@@ -86,10 +86,8 @@ static const char *LST_packetdefault[] = {

 static const char *LST_keyexchange[] = {
    "ike",
-#ifdef IKEV2
    "ikev1",
    "ikev2",
-#endif /* IKEV2 */
     NULL
 };

@@ -150,6 +148,8 @@ static const token_info_t token_info[] =
    /* config setup keywords */
    { ARG_LST,  offsetof(starter_config_t, setup.interfaces), NULL                 },
    { ARG_STR,  offsetof(starter_config_t, setup.dumpdir), NULL                    },
+    { ARG_ENUM, offsetof(starter_config_t, setup.charonstart), LST_bool            },
+    { ARG_ENUM, offsetof(starter_config_t, setup.plutostart), LST_bool             },

    /* pluto keywords */
    { ARG_LST,  offsetof(starter_config_t, setup.plutodebug), LST_plutodebug       },