applied new changes from NATT team

DPD only done when no IPsec and IKE traffic processed
	minor changes here and there

src/charon/config/configuration.c

@@ -55,12 +55,6 @@
  */
 #define KEEPALIVE_INTERVAL 2000000
 
-/**
- * Keepalive timeout in milliseconds.
- * Not implemented yet.
- */
-#define KEEPALIVE_TIMEOUT 30000000
-
 /**
  * DPD interval in milliseconds.
  */
@@ -112,14 +106,6 @@ static u_int32_t get_keepalive_interval (private_configuration_t *this)
 	return KEEPALIVE_INTERVAL;
 }
 
-/**
- * Implementation of configuration_t.get_keepalive_timeout.
- */
-static u_int32_t get_keepalive_timeout (private_configuration_t *this)
-{
-	return KEEPALIVE_TIMEOUT;
-}
-
 /**
  * Implementation of configuration_t.get_dpd_interval.
  */
@@ -148,7 +134,6 @@ configuration_t *configuration_create()
 	this->public.get_retransmit_timeout = (status_t (*) (configuration_t *, u_int32_t retransmit_count, u_int32_t *timeout))get_retransmit_timeout;
 	this->public.get_half_open_ike_sa_timeout = (u_int32_t (*) (configuration_t *)) get_half_open_ike_sa_timeout;
 	this->public.get_keepalive_interval = (u_int32_t (*) (configuration_t *)) get_keepalive_interval;
-	this->public.get_keepalive_timeout = (u_int32_t (*) (configuration_t *)) get_keepalive_timeout;
 	this->public.get_dpd_interval = (u_int32_t (*) (configuration_t *)) get_dpd_interval;
 	
 	return (&this->public);

src/charon/config/configuration.h

@@ -80,17 +80,6 @@ struct configuration_t {
 	 */	
 	u_int32_t (*get_keepalive_interval) (configuration_t *this);
 
-	/**
-	 * @brief Returns the keepalive timeout in ms.
-	 * 
-	 * The keepalive timeout defines how long we should keep sending
-	 * NAT keepalives after closing an IKE_SA.
-	 * 
-	 * @param this				calling object
-	 * @return					timeout in milliseconds (ms)
-	 */	
-	u_int32_t (*get_keepalive_timeout) (configuration_t *this);
-
 	/**
 	 * @brief Returns the DPD interval in ms.
 	 * 

src/charon/config/connections/connection.c

@@ -22,7 +22,7 @@
 
 #include <string.h>
 
-#include "connection.h"
+#include <config/connections/connection.h>
 
 #include <utils/linked_list.h>
 #include <utils/logger.h>