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 /src/libstrongswan/utils/utils.c | |
| 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.
Diffstat (limited to 'src/libstrongswan/utils/utils.c')
| -rw-r--r-- | src/libstrongswan/utils/utils.c | 8 |
1 files changed, 6 insertions, 2 deletions
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; } /** |