From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Tue, 29 Jan 2008 01:41:47 +0000 (-0000)
Subject: NAT-T conditions were not inherited during IKE_SA rekeying
X-Git-Tag: 4.1.11~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0e40caafbd7;p=thirdparty%2Fstrongswan.git

NAT-T conditions were not inherited during IKE_SA rekeying
---

diff --git a/src/charon/sa/ike_sa.c b/src/charon/sa/ike_sa.c
index 9cada2cb50..93aa08965a 100644
--- a/src/charon/sa/ike_sa.c
+++ b/src/charon/sa/ike_sa.c
@@ -2090,7 +2090,14 @@ static status_t inherit(private_ike_sa_t *this, private_ike_sa_t *other)
 	{
 		this->dns_servers->insert_first(this->dns_servers, ip);
 	}
-	
+
+	/* inherit NAT-T conditions */
+	this->conditions = other->conditions;
+	if (this->conditions & COND_NAT_HERE)
+	{
+		send_keepalive(this);
+	}
+
 	/* adopt all children */
 	while (other->child_sas->remove_last(other->child_sas,
 		   								 (void**)&child_sa) == SUCCESS)