From: Adrian-Ken Rueegsegger <ken@codelabs.ch>
Date: Wed, 19 Dec 2012 14:58:17 +0000 (+0100)
Subject: Call isa_skip_create_first when keeping IKE SA
X-Git-Tag: 5.0.3rc1~39^2~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89b1d5f32c00283e471a51d3c26baf0919dd890c;p=thirdparty%2Fstrongswan.git

Call isa_skip_create_first when keeping IKE SA

An ALERT_KEEP_ON_CHILD_SA_FAILURE alert is issued when child SA establishment
fails but the corresponding IKE SA is not destroyed. To allow later creation
of child SAs the ISA context must be signaled that the implicity first child SA
creation was skipped.
---

diff --git a/src/charon-tkm/src/tkm/tkm_listener.c b/src/charon-tkm/src/tkm/tkm_listener.c
index 1ec8e122aa..47cfef5ac1 100644
--- a/src/charon-tkm/src/tkm/tkm_listener.c
+++ b/src/charon-tkm/src/tkm/tkm_listener.c
@@ -194,6 +194,25 @@ static bool build_cert_chain(const ike_sa_t * const ike_sa, cc_id_type cc_id)
 	return FALSE;
 }
 
+METHOD(listener_t, alert, bool,
+	private_tkm_listener_t *this, ike_sa_t *ike_sa,
+	alert_t alert, va_list args)
+{
+	if (alert == ALERT_KEEP_ON_CHILD_SA_FAILURE)
+	{
+		tkm_keymat_t * const keymat = (tkm_keymat_t*)ike_sa->get_keymat(ike_sa);
+		const isa_id_type isa_id = keymat->get_isa_id(keymat);
+		DBG1(DBG_IKE, "TKM alert listener called for ISA context %llu", isa_id);
+		if (ike_isa_skip_create_first(isa_id) != TKM_OK)
+		{
+			DBG1(DBG_IKE, "Skip of first child SA creation failed for ISA "
+				 "context %llu", isa_id);
+		}
+	}
+
+	return TRUE;
+}
+
 METHOD(listener_t, authorize, bool,
 	private_tkm_listener_t *this, ike_sa_t *ike_sa,
 	bool final, bool *success)
@@ -305,6 +324,7 @@ tkm_listener_t *tkm_listener_create()
 			.listener = {
 				.authorize = _authorize,
 				.message = _message,
+				.alert = _alert,
 			},
 			.destroy = _destroy,
 		},