aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReto Buerki <buerki@swiss-it.ch>2010-04-22 17:03:27 +0200
committerMartin Willi <martin@revosec.ch>2010-05-04 14:38:34 +0200
commit2b26a9c30d2c0629ee6015a5d5a7099d94efdd95 (patch)
treea348724168956543b98314b9ef0c5217ad238344
parent93be4ac44dbd8374e6c69a712edd4db01af5d167 (diff)
downloadstrongswan-2b26a9c30d2c0629ee6015a5d5a7099d94efdd95.tar.bz2
strongswan-2b26a9c30d2c0629ee6015a5d5a7099d94efdd95.tar.xz
Add reqid keyword to config connection section.
-rw-r--r--src/starter/args.c1
-rw-r--r--src/starter/confread.h1
-rw-r--r--src/starter/keywords.h3
-rw-r--r--src/starter/keywords.txt1
4 files changed, 5 insertions, 1 deletions
diff --git a/src/starter/args.c b/src/starter/args.c
index 512f2f46f..ad9d5e485 100644
--- a/src/starter/args.c
+++ b/src/starter/args.c
@@ -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 },
diff --git a/src/starter/confread.h b/src/starter/confread.h
index 199fab642..d7276986c 100644
--- a/src/starter/confread.h
+++ b/src/starter/confread.h
@@ -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;
diff --git a/src/starter/keywords.h b/src/starter/keywords.h
index 6c3907a6a..c845b30be 100644
--- a/src/starter/keywords.h
+++ b/src/starter/keywords.h
@@ -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,
diff --git a/src/starter/keywords.txt b/src/starter/keywords.txt
index 12037a685..8c05730a7 100644
--- a/src/starter/keywords.txt
+++ b/src/starter/keywords.txt
@@ -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