From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 5 Oct 2010 14:16:21 +0000 (+0200)
Subject: Simplified apply_port function in mobike task.
X-Git-Tag: 4.5.0~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be9013421135af2d3af55cce14c670aea7975144;p=thirdparty%2Fstrongswan.git

Simplified apply_port function in mobike task.
---

diff --git a/src/libcharon/sa/tasks/ike_mobike.c b/src/libcharon/sa/tasks/ike_mobike.c
index 8d963a2895..4906e83124 100644
--- a/src/libcharon/sa/tasks/ike_mobike.c
+++ b/src/libcharon/sa/tasks/ike_mobike.c
@@ -270,26 +270,19 @@ static void update_children(private_ike_mobike_t *this)
 }
 
 /**
- * Apply port of old address if it equals new, port otherwise
+ * Apply the port of the old host, if its ip equals the new, use port otherwise.
  */
-static void apply_port(private_ike_mobike_t *this, host_t *host, host_t *old,
-					   u_int16_t port)
+static void apply_port(host_t *host, host_t *old, u_int16_t port)
 {
 	if (host->ip_equals(host, old))
 	{
-		host->set_port(host, old->get_port(old));
+		port = old->get_port(old);
 	}
-	else
+	else if (port == IKEV2_UDP_PORT)
 	{
-		if (port == IKEV2_UDP_PORT)
-		{
-			host->set_port(host, IKEV2_NATT_PORT);
-		}
-		else
-		{
-			host->set_port(host, port);
-		}
+		port = IKEV2_NATT_PORT;
 	}
+	host->set_port(host, port);
 }
 
 /**
@@ -315,7 +308,7 @@ static void transmit(private_ike_mobike_t *this, packet_t *packet)
 									hydra->kernel_interface, other_old, NULL);
 	if (me)
 	{
-		apply_port(this, me, me_old, ike_cfg->get_my_port(ike_cfg));
+		apply_port(me, me_old, ike_cfg->get_my_port(ike_cfg));
 		DBG1(DBG_IKE, "checking original path %#H - %#H", me, other_old);
 		copy = packet->clone(packet);
 		copy->set_source(copy, me);
@@ -335,9 +328,9 @@ static void transmit(private_ike_mobike_t *this, packet_t *packet)
 				continue;
 			}
 			/* reuse port for an active address, 4500 otherwise */
-			apply_port(this, me, me_old, ike_cfg->get_my_port(ike_cfg));
+			apply_port(me, me_old, ike_cfg->get_my_port(ike_cfg));
 			other = other->clone(other);
-			apply_port(this, other, other_old, ike_cfg->get_other_port(ike_cfg));
+			apply_port(other, other_old, ike_cfg->get_other_port(ike_cfg));
 			DBG1(DBG_IKE, "checking path %#H - %#H", me, other);
 			copy = packet->clone(packet);
 			copy->set_source(copy, me);