1 files changed, 35 insertions, 1 deletions

diff --git a/src/libcharon/sa/ikev1/tasks/informational.c b/src/libcharon/sa/ikev1/tasks/informational.c
index 999b497dc..2af641e86 100644..100755
--- a/src/libcharon/sa/ikev1/tasks/informational.c
+++ b/src/libcharon/sa/ikev1/tasks/informational.c
@@ -18,6 +18,8 @@
 #include <daemon.h>
 #include <sa/ikev1/tasks/isakmp_delete.h>
 #include <sa/ikev1/tasks/quick_delete.h>
+#include <sa/ikev1/tasks/isakmp_dpd.h>
+
 #include <encoding/payloads/delete_payload.h>
 
 typedef struct private_informational_t private_informational_t;
@@ -46,6 +48,16 @@ struct private_informational_t {
 	 * Delete subtask
 	 */
 	task_t *del;
+
+	/**
+	 * DPD subtask
+	 */
+	task_t *dpd;
+
+	/**
+	 * DPD sequence number
+	 */
+	u_int32_t dpd_seqnr;
 };
 
 METHOD(task_t, build_i, status_t,
@@ -80,6 +92,15 @@ METHOD(task_t, process_r, status_t,
 					this->ike_sa->set_condition(this->ike_sa,
 												COND_INIT_CONTACT_SEEN, TRUE);
 				}
+				else if (type == DPD_R_U_THERE)
+				{
+					DBG3(DBG_IKE, "received DPD request");
+					this->dpd = (task_t*)isakmp_dpd_create(this->ike_sa, notify, this->dpd_seqnr);
+				}
+				else if (type == DPD_R_U_THERE_ACK)
+				{
+					DBG3(DBG_IKE, "received DPD request ack");
+				}
 				else if (type < 16384)
 				{
 					DBG1(DBG_IKE, "received %N error notify",
@@ -123,6 +144,11 @@ METHOD(task_t, process_r, status_t,
 	{
 		return this->del->process(this->del, message);
 	}
+
+	if (this->dpd && status == SUCCESS)
+	{
+		return this->dpd->process(this->dpd, message);
+	}
 	return status;
 }
 
@@ -133,6 +159,13 @@ METHOD(task_t, build_r, status_t,
 	{
 		return this->del->build(this->del, message);
 	}
+
+	if (this->dpd)
+	{
+		status_t status = this->dpd->build(this->dpd, message);
+		this->dpd->destroy(this->dpd);
+		return status;
+	}
 	return FAILED;
 }
 
@@ -165,7 +198,7 @@ METHOD(task_t, destroy, void,
 /*
  * Described in header.
  */
-informational_t *informational_create(ike_sa_t *ike_sa, notify_payload_t *notify)
+informational_t *informational_create(ike_sa_t *ike_sa, notify_payload_t *notify, u_int32_t dpd_seqnr)
 {
 	private_informational_t *this;
 
@@ -179,6 +212,7 @@ informational_t *informational_create(ike_sa_t *ike_sa, notify_payload_t *notify
 		},
 		.ike_sa = ike_sa,
 		.notify = notify,
+		.dpd_seqnr = dpd_seqnr,
 	);
 
 	if (notify)