From: Martin Willi <martin@revosec.ch>
Date: Mon, 10 Dec 2012 16:01:00 +0000 (+0100)
Subject: Inherit virtual IP and attributes from old to new, not from new to old
X-Git-Tag: 5.0.2dr4~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43b4c2ea75ff5434730988f4c3a7cd0ac33ae6fd;p=thirdparty%2Fstrongswan.git

Inherit virtual IP and attributes from old to new, not from new to old
---

diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index 48621111db..de050cd3cf 100644
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -1979,14 +1979,14 @@ METHOD(ike_sa_t, inherit, void,
 	this->other_id = other->other_id->clone(other->other_id);
 
 	/* apply assigned virtual IPs... */
-	while (this->my_vips->remove_last(this->my_vips, (void**)&vip) == SUCCESS)
+	while (other->my_vips->remove_last(other->my_vips, (void**)&vip) == SUCCESS)
 	{
-		other->my_vips->insert_first(other->my_vips, vip);
+		this->my_vips->insert_first(this->my_vips, vip);
 	}
-	while (this->other_vips->remove_last(this->other_vips,
-										 (void**)&vip) == SUCCESS)
+	while (other->other_vips->remove_last(other->other_vips,
+										  (void**)&vip) == SUCCESS)
 	{
-		other->other_vips->insert_first(other->other_vips, vip);
+		this->other_vips->insert_first(this->other_vips, vip);
 	}
 
 	/* authentication information */