From: Reto Buerki <reet@codelabs.ch>
Date: Thu, 9 Aug 2012 14:13:55 +0000 (+0200)
Subject: id_manager: Use limits given by TKM
X-Git-Tag: 5.0.3rc1~39^2~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84967b44392cd61b2c251086d07c0685e42f56b8;p=thirdparty%2Fstrongswan.git

id_manager: Use limits given by TKM
---

diff --git a/src/charon-tkm/src/tkm/tkm_id_manager.c b/src/charon-tkm/src/tkm/tkm_id_manager.c
index 8426a2cef9..f069e0eba9 100644
--- a/src/charon-tkm/src/tkm/tkm_id_manager.c
+++ b/src/charon-tkm/src/tkm/tkm_id_manager.c
@@ -44,6 +44,11 @@ struct private_tkm_id_manager_t {
 	 */
 	bool* ctxids[TKM_CTX_MAX];
 
+	/**
+	 * Per-kind context limits.
+	 */
+	tkm_limits_t limits;
+
 	/**
 	 * rwlocks for context id lists
 	 */
@@ -66,7 +71,8 @@ static bool is_valid_kind(const tkm_context_kind_t kind)
 METHOD(tkm_id_manager_t, acquire_id, int,
 	private_tkm_id_manager_t * const this, const tkm_context_kind_t kind)
 {
-	int j, id = 0;
+	int id = 0;
+	uint64_t j;
 
 	if (!is_valid_kind(kind))
 	{
@@ -76,7 +82,7 @@ METHOD(tkm_id_manager_t, acquire_id, int,
 	}
 
 	this->locks[kind]->write_lock(this->locks[kind]);
-	for (j = 0; j < TKM_LIMIT; j++)
+	for (j = 0; j < this->limits[kind]; j++)
 	{
 		if (this->ctxids[kind][j])
 		{
@@ -135,7 +141,8 @@ METHOD(tkm_id_manager_t, destroy, void,
 tkm_id_manager_t *tkm_id_manager_create(const tkm_limits_t limits)
 {
 	private_tkm_id_manager_t *this;
-	int i, j;
+	int i;
+	uint64_t j;
 
 	INIT(this,
 		.public = {
@@ -147,13 +154,16 @@ tkm_id_manager_t *tkm_id_manager_create(const tkm_limits_t limits)
 
 	for (i = 0; i < TKM_CTX_MAX; i++)
 	{
-		this->ctxids[i] = malloc(TKM_LIMIT * sizeof(bool));
+		this->limits[i] = limits[i];
+		this->ctxids[i] = malloc(limits[i] * sizeof(bool));
 		this->locks[i] = rwlock_create(RWLOCK_TYPE_DEFAULT);
-		for (j = 0; j < TKM_LIMIT; j++)
+		for (j = 0; j < limits[i]; j++)
 		{
 			/* available id slots are in true state (is_available) */
 			this->ctxids[i][j] = true;
 		}
+		DBG2(DBG_LIB, "%N initialized, %llu slot(s)",
+				tkm_context_kind_names, i, limits[i]);
 	}
 
 	return &this->public;