From: Martin Willi <martin@revosec.ch>
Date: Tue, 15 May 2012 12:27:16 +0000 (+0200)
Subject: Send unanswered follow up R_U_THERE messages with the same DPD seq
X-Git-Tag: 5.0.0~263
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebf829f2eb2484a0576824a53b34a98cd22017ef;p=thirdparty%2Fstrongswan.git

Send unanswered follow up R_U_THERE messages with the same DPD seq
---

diff --git a/src/libcharon/sa/ikev1/task_manager_v1.c b/src/libcharon/sa/ikev1/task_manager_v1.c
index 1dc9bf59f0..891f3d6d3c 100755
--- a/src/libcharon/sa/ikev1/task_manager_v1.c
+++ b/src/libcharon/sa/ikev1/task_manager_v1.c
@@ -783,8 +783,14 @@ static status_t process_request(private_task_manager_t *this,
 													   this->dpd_recv++);
 					dpd = TRUE;
 				}
-				else if (message->get_notify(message, DPD_R_U_THERE_ACK))
+				else if ((notify = message->get_notify(message,
+													   DPD_R_U_THERE_ACK)))
 				{
+					data = notify->get_notification_data(notify);
+					if (data.len == 4 && untoh32(data.ptr) == this->dpd_send)
+					{
+						this->dpd_send++;
+					}
 					task = (task_t *)isakmp_dpd_create(this->ike_sa, TRUE,
 													   this->dpd_send - 1);
 					dpd = TRUE;