denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add reqid field and getter function to child_cfg_t.

Browse Source
This commit is contained in:
Reto Buerki
2010-05-04 14:38:34 +02:00
committed by Martin Willi
parent 1f83541d7b
commit 277fcf9f86
9 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/config/child_cfg.c
+16 -1
View File
@@ -111,6 +111,11 @@ struct private_child_cfg_t {
*/
u_int32_t inactivity;
/**
* Reqid to install CHIL_SA with
*/
u_int32_t reqid;
/**
* set up IPsec transport SA in MIPv6 proxy mode
*/
@@ -445,6 +450,14 @@ static u_int32_t get_inactivity(private_child_cfg_t *this)
return this->inactivity;
}
/**
* 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.
*/
@@ -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;
src/libcharon/config/child_cfg.h
+10 -2
View File
@@ -238,6 +238,13 @@ struct child_cfg_t {
*/
u_int32_t (*get_inactivity)(child_cfg_t *this);
/**
* Specific reqid to use for CHILD_SA
*
* @return reqid
*/
u_int32_t (*get_reqid)(child_cfg_t *this);
/**
* Sets two options needed for Mobile IPv6 interoperability
*
@@ -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
* @return child_cfg_t object
* @param reqid specific reqid to use for CHILD_SA, 0 for auto assign
* @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_ @}*/