From: Reto Buerki <buerki@swiss-it.ch>
Date: Thu, 22 Apr 2010 15:03:27 +0000 (+0200)
Subject: Add reqid keyword to config connection section.
X-Git-Tag: 4.4.1~300
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b26a9c30d2c0629ee6015a5d5a7099d94efdd95;p=thirdparty%2Fstrongswan.git

Add reqid keyword to config connection section.
---

diff --git a/src/starter/args.c b/src/starter/args.c
index 512f2f46f2..ad9d5e4859 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 199fab642b..d7276986c8 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 6c3907a6a3..c845b30be9 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 12037a6857..8c05730a7c 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