diff options
| author | Martin Willi <martin@revosec.ch> | 2013-06-11 15:51:50 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2013-06-11 15:54:27 +0200 |
| commit | d024a4652c6a791318e3b17b27006678315a7449 (patch) | |
| tree | 56769e5b57f1b0d7ca12fedf03dd9cd017f0717a | |
| parent | 37a60cad3cfbf9ce98b6c76564f419fe884a1d71 (diff) | |
| parent | 3568abe7be1efdd8d95b6711a552fefc8089fff8 (diff) | |
| download | strongswan-d024a4652c6a791318e3b17b27006678315a7449.tar.bz2 strongswan-d024a4652c6a791318e3b17b27006678315a7449.tar.xz | |
Merge branch 'unique-sas'
Makes IKE_SA unique ID and CHILD_SA reqid counters atomic.
| -rw-r--r-- | src/libcharon/sa/child_sa.c | 11 | ||||
| -rw-r--r-- | src/libcharon/sa/ike_sa.c | 4 | ||||
| -rw-r--r-- | src/libstrongswan/utils/utils.c | 8 | ||||
| -rw-r--r-- | src/libstrongswan/utils/utils.h | 5 |
4 files changed, 20 insertions, 8 deletions
diff --git a/src/libcharon/sa/child_sa.c b/src/libcharon/sa/child_sa.c index 34435a140..a14b03949 100644 --- a/src/libcharon/sa/child_sa.c +++ b/src/libcharon/sa/child_sa.c @@ -1083,7 +1083,7 @@ METHOD(child_sa_t, destroy, void, child_sa_t * child_sa_create(host_t *me, host_t* other, 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; INIT(this, @@ -1142,7 +1142,14 @@ child_sa_t * child_sa_create(host_t *me, host_t* other, if (!this->reqid) { /* 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) diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c index d7a9076b8..e25191782 100644 --- a/src/libcharon/sa/ike_sa.c +++ b/src/libcharon/sa/ike_sa.c @@ -2169,7 +2169,7 @@ ike_sa_t * ike_sa_create(ike_sa_id_t *ike_sa_id, bool initiator, ike_version_t version) { private_ike_sa_t *this; - static u_int32_t unique_id = 0; + static refcount_t unique_id = 0; if (version == IKE_ANY) { /* prefer IKEv2 if protocol not specified */ @@ -2281,7 +2281,7 @@ ike_sa_t * ike_sa_create(ike_sa_id_t *ike_sa_id, bool initiator, .other_auth = auth_cfg_create(), .my_auths = linked_list_create(), .other_auths = linked_list_create(), - .unique_id = ++unique_id, + .unique_id = ref_get(&unique_id), .peer_addresses = linked_list_create(), .my_vips = linked_list_create(), .other_vips = linked_list_create(), diff --git a/src/libstrongswan/utils/utils.c b/src/libstrongswan/utils/utils.c index aa59f4a4d..30084cd81 100644 --- a/src/libstrongswan/utils/utils.c +++ b/src/libstrongswan/utils/utils.c @@ -466,11 +466,15 @@ static pthread_mutex_t ref_mutex = PTHREAD_MUTEX_INITIALIZER; /** * Increase refcount */ -void ref_get(refcount_t *ref) +refcount_t ref_get(refcount_t *ref) { + refcount_t current; + pthread_mutex_lock(&ref_mutex); - (*ref)++; + current = ++(*ref); pthread_mutex_unlock(&ref_mutex); + + return current; } /** diff --git a/src/libstrongswan/utils/utils.h b/src/libstrongswan/utils/utils.h index ff1a007c1..8cc48513b 100644 --- a/src/libstrongswan/utils/utils.h +++ b/src/libstrongswan/utils/utils.h @@ -661,7 +661,7 @@ typedef volatile u_int refcount_t; #ifdef HAVE_GCC_ATOMIC_OPERATIONS -#define ref_get(ref) {__sync_fetch_and_add(ref, 1); } +#define ref_get(ref) __sync_add_and_fetch(ref, 1) #define ref_put(ref) (!__sync_sub_and_fetch(ref, 1)) #define cas_bool(ptr, oldval, newval) \ @@ -677,8 +677,9 @@ typedef volatile u_int refcount_t; * Increments the reference counter atomic. * * @param ref pointer to ref counter + * @return new value of ref */ -void ref_get(refcount_t *ref); +refcount_t ref_get(refcount_t *ref); /** * Put back a unused reference. |