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

Use ref_get() to make sure CHILD_SA reqids are unique

Browse Source
This commit is contained in:
Martin Willi
2013-06-11 15:54:27 +02:00
parent 3160b92adb
commit d64f6ef6ae
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/child_sa.c
+9 -2
View File
@@ -1083,7 +1083,7 @@ METHOD(child_sa_t, destroy, void,
child_sa_t * child_sa_create(host_t *me, host_t* other, child_sa_t * child_sa_create(host_t *me, host_t* other,
child_cfg_t *config, u_int32_t rekey, bool encap) child_cfg_t *config, u_int32_t rekey, bool encap)
{ {
static u_int32_t reqid = 0; static refcount_t reqid = 0;
private_child_sa_t *this; private_child_sa_t *this;
INIT(this, INIT(this,
@@ -1142,7 +1142,14 @@ child_sa_t * child_sa_create(host_t *me, host_t* other,
if (!this->reqid) if (!this->reqid)
{ {
/* reuse old reqid if we are rekeying an existing CHILD_SA */ /* reuse old reqid if we are rekeying an existing CHILD_SA */
this->reqid = rekey ? rekey : ++reqid; if (rekey)
{
this->reqid = rekey;
}
else
{
this->reqid = ref_get(&reqid);
}
} }
if (this->mark_in.value == MARK_REQID) if (this->mark_in.value == MARK_REQID)