Add reqid keyword to config connection section.
authorReto Buerki <buerki@swiss-it.ch>
Thu, 22 Apr 2010 15:03:27 +0000 (17:03 +0200)
committerMartin Willi <martin@revosec.ch>
Tue, 4 May 2010 12:38:34 +0000 (14:38 +0200)
src/starter/args.c
src/starter/confread.h
src/starter/keywords.h
src/starter/keywords.txt

index 512f2f4..ad9d5e4 100644 (file)
@@ -233,6 +233,7 @@ static const token_info_t token_info[] =
        { ARG_ENUM, offsetof(starter_conn_t, me_mediation), LST_bool                   },
        { ARG_STR,  offsetof(starter_conn_t, me_mediated_by), NULL                     },
        { ARG_STR,  offsetof(starter_conn_t, me_peerid), NULL                          },
+       { ARG_UINT, offsetof(starter_conn_t, reqid), NULL                              },
 
        /* ca section keywords */
        { ARG_STR,  offsetof(starter_ca_t, name), NULL                                 },
index 199fab6..d727698 100644 (file)
@@ -120,6 +120,7 @@ struct starter_conn {
                u_int64_t       sa_ipsec_margin_packets;
                unsigned long   sa_keying_tries;
                unsigned long   sa_rekey_fuzz;
+               u_int32_t       reqid;
                sa_family_t     addr_family;
                sa_family_t     tunnel_addr_family;
                bool            install_policy;
index 6c3907a..c845b30 100644 (file)
@@ -96,9 +96,10 @@ typedef enum {
        KW_MEDIATION,
        KW_MEDIATED_BY,
        KW_ME_PEERID,
+       KW_REQID,
 
 #define KW_CONN_FIRST   KW_CONN_SETUP
-#define KW_CONN_LAST    KW_ME_PEERID
+#define KW_CONN_LAST    KW_REQID
 
    /* ca section keywords */
        KW_CA_NAME,
index 12037a6..8c05730 100644 (file)
@@ -87,6 +87,7 @@ xauth,             KW_XAUTH
 mediation,         KW_MEDIATION
 mediated_by,       KW_MEDIATED_BY
 me_peerid,         KW_ME_PEERID
+reqid,             KW_REQID
 cacert,            KW_CACERT
 ldaphost,          KW_LDAPHOST
 ldapbase,          KW_LDAPBASE