charon-tkm: Return current refcount when releasing ID

diff --git a/src/charon-tkm/src/tkm/tkm_id_manager.c b/src/charon-tkm/src/tkm/tkm_id_manager.c
index 2d28c3c450d2a77bf9f6cf09614f23873cca39a0..9a2ede03e06fa8742021bcc685a67fd095694b5f 100644 (file)
--- a/src/charon-tkm/src/tkm/tkm_id_manager.c
+++ b/src/charon-tkm/src/tkm/tkm_id_manager.c
@@ -130,27 +130,28 @@ METHOD(tkm_id_manager_t, acquire_ref, bool,
        return TRUE;
 }
 
-METHOD(tkm_id_manager_t, release_id, bool,
+METHOD(tkm_id_manager_t, release_id, int,
        private_tkm_id_manager_t * const this, const tkm_context_kind_t kind,
        const int id)
 {
        const int idx = id - 1;
+       int refcount = 0;
 
        if (!is_valid_kind(kind))
        {
                DBG1(DBG_LIB, "tried to release id %d for invalid context kind '%d'",
                         id, kind);
-               return FALSE;
+               return -1;
        }
 
        this->locks[kind]->write_lock(this->locks[kind]);
        if (this->ctxids[kind][idx] > 0)
        {
-               this->ctxids[kind][idx]--;
+               refcount = --this->ctxids[kind][idx];
        }
        this->locks[kind]->unlock(this->locks[kind]);
 
-       return TRUE;
+       return refcount;
 }
 
 

diff --git a/src/charon-tkm/src/tkm/tkm_id_manager.h b/src/charon-tkm/src/tkm/tkm_id_manager.h
index ec7b07f7e1d56829d38b748e9a1ee126a2affd4c..1c48b57f1df919c8413e640399d9bf790e3f385b 100644 (file)
--- a/src/charon-tkm/src/tkm/tkm_id_manager.h
+++ b/src/charon-tkm/src/tkm/tkm_id_manager.h
@@ -90,11 +90,11 @@ struct tkm_id_manager_t {
         *
         * @param kind                  kind of context id to release
         * @param id                    id to release
-        * @return                              TRUE if id was released, FALSE otherwise
+        * @return                              current refcount if id was released, -1 otherwise
         */
-       bool (*release_id)(tkm_id_manager_t * const this,
-                                          const tkm_context_kind_t kind,
-                                          const int id);
+       int (*release_id)(tkm_id_manager_t * const this,
+                                         const tkm_context_kind_t kind,
+                                         const int id);
 
        /**
         * Destroy a tkm_id_manager instance.

diff --git a/src/charon-tkm/tests/id_manager_tests.c b/src/charon-tkm/tests/id_manager_tests.c
index 392379aa9a2fa8a7f0524c40549d79bdece1892f..fb5e56a054d663eba426c890d36b4bc148f9d029 100644 (file)
--- a/src/charon-tkm/tests/id_manager_tests.c
+++ b/src/charon-tkm/tests/id_manager_tests.c
@@ -151,19 +151,18 @@ END_TEST
 
 START_TEST(test_release_id)
 {
-       int i, id = 0;
-       bool released = false;
+       int i, count, id = 0;
        tkm_id_manager_t *idmgr = tkm_id_manager_create(limits);
 
        for (i = 0; i < TKM_CTX_MAX; i++)
        {
                id = idmgr->acquire_id(idmgr, i);
-               released = idmgr->release_id(idmgr, i, id);
+               count = idmgr->release_id(idmgr, i, id);
 
-               fail_unless(released, "Error releasing id of context kind %d", i);
+               fail_unless(count == 0, "Error releasing id of context kind %d", i);
 
-               /* Reset released variable */
-               released = FALSE;
+               /* Reset count variable */
+               count = 0;
        }
 
        idmgr->destroy(idmgr);
@@ -172,17 +171,17 @@ END_TEST
 
 START_TEST(test_release_id_invalid_kind)
 {
-       bool released = TRUE;
+       int count = 0;
        tkm_id_manager_t *idmgr = tkm_id_manager_create(limits);
 
-       released = idmgr->release_id(idmgr, TKM_CTX_MAX, 1);
-       fail_if(released, "Released id for invalid context kind %d", TKM_CTX_MAX);
+       count = idmgr->release_id(idmgr, TKM_CTX_MAX, 1);
+       fail_if(count >= 0, "Released id for invalid context kind %d", TKM_CTX_MAX);
 
        /* Reset test variable */
-       released = TRUE;
+       count = 0;
 
-       released = idmgr->release_id(idmgr, -1, 1);
-       fail_if(released, "Released id for invalid context kind %d", -1);
+       count = idmgr->release_id(idmgr, -1, 1);
+       fail_if(count >= 0, "Released id for invalid context kind %d", -1);
 
        idmgr->destroy(idmgr);
 }
@@ -190,11 +189,11 @@ END_TEST
 
 START_TEST(test_release_id_nonexistent)
 {
-       bool released = FALSE;
+       int count = 0;
        tkm_id_manager_t *idmgr = tkm_id_manager_create(limits);
 
-       released = idmgr->release_id(idmgr, TKM_CTX_NONCE, 1);
-       fail_unless(released, "Release of nonexistent id failed");
+       count = idmgr->release_id(idmgr, TKM_CTX_NONCE, 1);
+       fail_unless(count == 0, "Release of nonexistent id failed");
 
        idmgr->destroy(idmgr);
 }