From cf76c429031d9a673a13116a50bec629a7de08c5 Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@strongswan.org>
Date: Thu, 24 Sep 2009 14:14:30 +0200
Subject: [PATCH] Do not create a replacement IKE_SA if we have CHILD_SAs to
 route only

---
 src/charon/sa/ike_sa.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/charon/sa/ike_sa.c b/src/charon/sa/ike_sa.c
index 02e2fec45..dc420dab1 100644
--- a/src/charon/sa/ike_sa.c
+++ b/src/charon/sa/ike_sa.c
@@ -1549,7 +1549,7 @@ static status_t reestablish(private_ike_sa_t *this)
 	iterator_t *iterator;
 	child_sa_t *child_sa;
 	child_cfg_t *child_cfg;
-	bool required = FALSE;
+	bool restart = FALSE;
 	status_t status = FAILED;
 
 	/* check if we have children to keep up at all */
@@ -1568,8 +1568,11 @@ static status_t reestablish(private_ike_sa_t *this)
 		switch (action)
 		{
 			case ACTION_RESTART:
+				restart = TRUE;
+				break;
 			case ACTION_ROUTE:
-				required = TRUE;
+				charon->traps->install(charon->traps, this->peer_cfg, child_cfg);
+				break;
 			default:
 				break;
 		}
@@ -1579,10 +1582,10 @@ static status_t reestablish(private_ike_sa_t *this)
 	/* mediation connections have no children, keep them up anyway */
 	if (this->peer_cfg->is_mediation(this->peer_cfg))
 	{
-		required = TRUE;
+		restart = TRUE;
 	}
 #endif /* ME */
-	if (!required)
+	if (!restart)
 	{
 		return FAILED;
 	}
@@ -1641,10 +1644,6 @@ static status_t reestablish(private_ike_sa_t *this)
 					child_cfg->get_ref(child_cfg);
 					status = new->initiate(new, child_cfg, 0, NULL, NULL);
 					break;
-				case ACTION_ROUTE:
-					charon->traps->install(charon->traps,
-										   this->peer_cfg, child_cfg);
-					break;
 				default:
 					continue;
 			}