From: Martin Willi <martin@revosec.ch>
Date: Fri, 20 Jan 2012 12:54:39 +0000 (+0100)
Subject: Don't re-resolve addresses during initiate if they have already been set
X-Git-Tag: 5.0.0~338^2~9^2~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a994050e9ce0ab4b1c058d15096b6d657d3ca1c8;p=thirdparty%2Fstrongswan.git

Don't re-resolve addresses during initiate if they have already been set
---

diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index 5a27de5e7f..c5683e93b5 100644
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -1077,7 +1077,11 @@ METHOD(ike_sa_t, initiate, status_t,
 {
 	if (this->state == IKE_CREATED)
 	{
-		resolve_hosts(this);
+		if (this->my_host->is_anyaddr(this->my_host) ||
+			this->other_host->is_anyaddr(this->other_host))
+		{
+			resolve_hosts(this);
+		}
 
 		if (this->other_host->is_anyaddr(this->other_host)
 #ifdef ME