From: Reto Buerki <reet@codelabs.ch>
Date: Thu, 30 Aug 2012 12:36:06 +0000 (+0200)
Subject: Add TKM_CTX_ISA (IKE SA context)
X-Git-Tag: 5.0.3rc1~39^2~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fb3e5ed104e12822fa5a62fcd3db27b52bc1f67;p=thirdparty%2Fstrongswan.git

Add TKM_CTX_ISA (IKE SA context)
---

diff --git a/src/charon-tkm/src/tkm/tkm.c b/src/charon-tkm/src/tkm/tkm.c
index e9862e0269..31e01c6b90 100644
--- a/src/charon-tkm/src/tkm/tkm.c
+++ b/src/charon-tkm/src/tkm/tkm.c
@@ -75,8 +75,7 @@ bool tkm_init()
 		return FALSE;
 	}
 
-	/* only nonce and DH context limits are currently needed */
-	const tkm_limits_t limits = {nc, dh};
+	const tkm_limits_t limits = {nc, dh, isa};
 
 	INIT(this,
 		.public = {
diff --git a/src/charon-tkm/src/tkm/tkm_id_manager.c b/src/charon-tkm/src/tkm/tkm_id_manager.c
index 8cafa41934..486a91225d 100644
--- a/src/charon-tkm/src/tkm/tkm_id_manager.c
+++ b/src/charon-tkm/src/tkm/tkm_id_manager.c
@@ -22,10 +22,11 @@
 
 #define TKM_LIMIT 100
 
-ENUM_BEGIN(tkm_context_kind_names, TKM_CTX_NONCE, TKM_CTX_DH,
+ENUM_BEGIN(tkm_context_kind_names, TKM_CTX_NONCE, TKM_CTX_ISA,
 	"NONCE_CONTEXT",
-	"DH_CONTEXT");
-ENUM_END(tkm_context_kind_names, TKM_CTX_DH);
+	"DH_CONTEXT",
+	"ISA_CONTEXT");
+ENUM_END(tkm_context_kind_names, TKM_CTX_ISA);
 
 typedef struct private_tkm_id_manager_t private_tkm_id_manager_t;
 
diff --git a/src/charon-tkm/src/tkm/tkm_id_manager.h b/src/charon-tkm/src/tkm/tkm_id_manager.h
index 9fbdb2d722..8a9b6d4988 100644
--- a/src/charon-tkm/src/tkm/tkm_id_manager.h
+++ b/src/charon-tkm/src/tkm/tkm_id_manager.h
@@ -30,6 +30,8 @@ enum tkm_context_kind_t {
 	TKM_CTX_NONCE,
 	/** Diffie-Hellman context */
 	TKM_CTX_DH,
+	/** IKE SA context */
+	TKM_CTX_ISA,
 
 	/** helper to determine the number of elements in this enum */
 	TKM_CTX_MAX,
diff --git a/src/charon-tkm/tests/id_manager_tests.c b/src/charon-tkm/tests/id_manager_tests.c
index 86e80aee0f..59c82fe717 100644
--- a/src/charon-tkm/tests/id_manager_tests.c
+++ b/src/charon-tkm/tests/id_manager_tests.c
@@ -18,7 +18,7 @@
 
 #include "tkm_id_manager.h"
 
-static const tkm_limits_t limits = {125, 100};
+static const tkm_limits_t limits = {125, 100, 30};
 
 START_TEST(test_id_mgr_creation)
 {