From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 28 Jul 2014 12:09:10 +0000 (+0200)
Subject: ikev2: Reduce timeout if path probing was enabled
X-Git-Tag: 5.2.1dr1~65^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acd69fc291bea4f8e85680505af0bd751e8b36a9;p=thirdparty%2Fstrongswan.git

ikev2: Reduce timeout if path probing was enabled
---

diff --git a/src/libcharon/sa/ikev2/task_manager_v2.c b/src/libcharon/sa/ikev2/task_manager_v2.c
index c73bf01687..58f6bc61d3 100644
--- a/src/libcharon/sa/ikev2/task_manager_v2.c
+++ b/src/libcharon/sa/ikev2/task_manager_v2.c
@@ -274,13 +274,20 @@ METHOD(task_manager_t, retransmit, status_t,
 				packet = this->initiating.packet->clone(this->initiating.packet);
 				charon->sender->send(charon->sender, packet);
 			}
-			else if (!mobike->transmit(mobike, this->initiating.packet))
+			else
 			{
-				DBG1(DBG_IKE, "no route found to reach peer, MOBIKE update "
-					 "deferred");
-				this->ike_sa->set_condition(this->ike_sa, COND_STALE, TRUE);
-				this->initiating.deferred = TRUE;
-				return SUCCESS;
+				if (!mobike->transmit(mobike, this->initiating.packet))
+				{
+					DBG1(DBG_IKE, "no route found to reach peer, MOBIKE update "
+						 "deferred");
+					this->ike_sa->set_condition(this->ike_sa, COND_STALE, TRUE);
+					this->initiating.deferred = TRUE;
+					return SUCCESS;
+				}
+				else if (mobike->is_probing(mobike))
+				{
+					timeout = ROUTEABILITY_CHECK_INTERVAL;
+				}
 			}
 		}
 		else