From: Reto Buerki <[email protected]>
---
src/libcharon/config/child_cfg.c | 17 ++++++++++++++++-
src/libcharon/config/child_cfg.h | 10 +++++++++-
src/libcharon/plugins/stroke/stroke_config.c | 2 +-
3 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/src/libcharon/config/child_cfg.c b/src/libcharon/config/child_cfg.c
index 8410b3f..0c7f011 100644
--- a/src/libcharon/config/child_cfg.c
+++ b/src/libcharon/config/child_cfg.c
@@ -112,6 +112,11 @@ struct private_child_cfg_t {
u_int32_t inactivity;
/**
+ * Unique request id
+ */
+ u_int32_t reqid;
+
+ /**
* set up IPsec transport SA in MIPv6 proxy mode
*/
bool proxy_mode;
@@ -446,6 +451,14 @@ static u_int32_t get_inactivity(private_child_cfg_t *this)
}
/**
+ * Implementation of child_cfg_t.get_reqid.
+ */
+static u_int32_t get_reqid(private_child_cfg_t *this)
+{
+ return this->reqid;
+}
+
+/**
* Implementation of child_cfg_t.set_mipv6_options.
*/
static void set_mipv6_options(private_child_cfg_t *this, bool proxy_mode,
@@ -506,7 +519,7 @@ child_cfg_t *child_cfg_create(char *name, lifetime_cfg_t
*lifetime,
char *updown, bool
hostaccess,
ipsec_mode_t mode,
action_t dpd_action,
action_t
close_action, bool ipcomp,
- u_int32_t inactivity)
+ u_int32_t inactivity,
u_int32_t reqid)
{
private_child_cfg_t *this = malloc_thing(private_child_cfg_t);
@@ -526,6 +539,7 @@ child_cfg_t *child_cfg_create(char *name, lifetime_cfg_t
*lifetime,
this->public.set_mipv6_options = (void (*)
(child_cfg_t*,bool,bool))set_mipv6_options;
this->public.use_ipcomp = (bool (*) (child_cfg_t *))use_ipcomp;
this->public.get_inactivity = (u_int32_t (*) (child_cfg_t
*))get_inactivity;
+ this->public.get_reqid = (u_int32_t (*) (child_cfg_t *))get_reqid;
this->public.use_proxy_mode = (bool (*) (child_cfg_t *))use_proxy_mode;
this->public.install_policy = (bool (*) (child_cfg_t *))install_policy;
this->public.get_ref = (child_cfg_t* (*) (child_cfg_t*))get_ref;
@@ -539,6 +553,7 @@ child_cfg_t *child_cfg_create(char *name, lifetime_cfg_t
*lifetime,
this->close_action = close_action;
this->use_ipcomp = ipcomp;
this->inactivity = inactivity;
+ this->reqid = reqid;
this->proxy_mode = FALSE;
this->install_policy = TRUE;
this->refcount = 1;
diff --git a/src/libcharon/config/child_cfg.h b/src/libcharon/config/child_cfg.h
index c6186ea..3b53b58 100644
--- a/src/libcharon/config/child_cfg.h
+++ b/src/libcharon/config/child_cfg.h
@@ -239,6 +239,13 @@ struct child_cfg_t {
u_int32_t (*get_inactivity)(child_cfg_t *this);
/**
+ * Get request id.
+ *
+ * @return request id
+ */
+ u_int32_t (*get_reqid)(child_cfg_t *this);
+
+ /**
* Sets two options needed for Mobile IPv6 interoperability
*
* @param proxy_mode use IPsec transport proxy mode (default FALSE)
@@ -299,12 +306,13 @@ struct child_cfg_t {
* @param close_action close action
* @param ipcomp use IPComp, if peer supports it
* @param inactivity inactivity timeout in s before closing a
CHILD_SA
+ * @param reqid connection request id
* @return child_cfg_t object
*/
child_cfg_t *child_cfg_create(char *name, lifetime_cfg_t *lifetime,
char *updown, bool
hostaccess,
ipsec_mode_t mode,
action_t dpd_action,
action_t
close_action, bool ipcomp,
- u_int32_t inactivity);
+ u_int32_t inactivity,
u_int32_t reqid);
#endif /** CHILD_CFG_H_ @}*/
diff --git a/src/libcharon/plugins/stroke/stroke_config.c
b/src/libcharon/plugins/stroke/stroke_config.c
index bbc1e7a..c86d145 100644
--- a/src/libcharon/plugins/stroke/stroke_config.c
+++ b/src/libcharon/plugins/stroke/stroke_config.c
@@ -787,7 +787,7 @@ static child_cfg_t *build_child_cfg(private_stroke_config_t
*this,
msg->add_conn.name, &lifetime,
msg->add_conn.me.updown,
msg->add_conn.me.hostaccess,
msg->add_conn.mode, dpd, dpd,
msg->add_conn.ipcomp,
- msg->add_conn.inactivity);
+ msg->add_conn.inactivity, msg->add_conn.reqid);
child_cfg->set_mipv6_options(child_cfg, msg->add_conn.proxy_mode,
msg->add_conn.install_policy);
add_ts(this, &msg->add_conn.me, child_cfg, TRUE);
--
1.6.3.3
_______________________________________________
Dev mailing list
[email protected]
https://lists.strongswan.org/mailman/listinfo/dev
