Renamed ike_natd_v1 to isakmp_natd

src/libcharon/Makefile.am

@@ -89,7 +89,6 @@ sa/tasks/ike_delete.c sa/tasks/ike_delete.h \
 sa/tasks/ike_dpd.c sa/tasks/ike_dpd.h \
 sa/tasks/ike_init.c sa/tasks/ike_init.h \
 sa/tasks/ike_natd.c sa/tasks/ike_natd.h \
-sa/tasks/ike_natd_v1.c sa/tasks/ike_natd_v1.h \
 sa/tasks/ike_mobike.c sa/tasks/ike_mobike.h \
 sa/tasks/ike_rekey.c sa/tasks/ike_rekey.h \
 sa/tasks/ike_reauth.c sa/tasks/ike_reauth.h \
@@ -100,6 +99,7 @@ sa/tasks/main_mode.c sa/tasks/main_mode.h \
 sa/tasks/informational.c sa/tasks/informational.h \
 sa/tasks/isakmp_cert_pre.c sa/tasks/isakmp_cert_pre.h \
 sa/tasks/isakmp_cert_post.c sa/tasks/isakmp_cert_post.h \
+sa/tasks/isakmp_natd.c sa/tasks/isakmp_natd.h \
 sa/tasks/isakmp_delete.c sa/tasks/isakmp_delete.h \
 sa/tasks/xauth.c sa/tasks/xauth.h \
 sa/tasks/quick_mode.c sa/tasks/quick_mode.h \

src/libcharon/sa/ike_sa.c

@@ -47,9 +47,9 @@
 #include <sa/tasks/main_mode.h>
 #include <sa/tasks/isakmp_cert_pre.h>
 #include <sa/tasks/isakmp_cert_post.h>
+#include <sa/tasks/isakmp_natd.h>
 #include <sa/tasks/quick_mode.h>
 #include <sa/tasks/quick_delete.h>
-#include <sa/tasks/ike_natd_v1.h>
 #include <sa/tasks/ike_vendor_v1.h>
 #include <sa/tasks/isakmp_delete.h>
 #include <processing/jobs/retransmit_job.h>
@@ -1127,7 +1127,7 @@ METHOD(ike_sa_t, initiate, status_t,
 			this->task_manager->queue_task(this->task_manager, task);
 			task = (task_t*)isakmp_cert_post_create(&this->public, TRUE);
 			this->task_manager->queue_task(this->task_manager, task);
-			task = (task_t*)ike_natd_v1_create(&this->public, TRUE);
+			task = (task_t*)isakmp_natd_create(&this->public, TRUE);
 			this->task_manager->queue_task(this->task_manager, task);
 		}
 		else

src/libcharon/sa/task_manager_v1.c

@@ -24,7 +24,7 @@
 #include <sa/tasks/xauth.h>
 #include <sa/tasks/mode_config.h>
 #include <sa/tasks/informational.h>
-#include <sa/tasks/ike_natd_v1.h>
+#include <sa/tasks/isakmp_natd.h>
 #include <sa/tasks/ike_vendor_v1.h>
 #include <sa/tasks/isakmp_cert_pre.h>
 #include <sa/tasks/isakmp_cert_post.h>
@@ -305,7 +305,7 @@ METHOD(task_manager_t, initiate, status_t,
 				{
 					exchange = ID_PROT;
 					activate_task(this, TASK_ISAKMP_CERT_POST);
-					activate_task(this, TASK_IKE_NATD_V1);
+					activate_task(this, TASK_ISAKMP_NATD);
 				}
 				break;
 			case IKE_CONNECTING:
@@ -666,7 +666,7 @@ static status_t process_request(private_task_manager_t *this,
 				this->passive_tasks->insert_last(this->passive_tasks, task);
 				task = (task_t*)isakmp_cert_post_create(this->ike_sa, FALSE);
 				this->passive_tasks->insert_last(this->passive_tasks, task);
-				task = (task_t *)ike_natd_v1_create(this->ike_sa, FALSE);
+				task = (task_t *)isakmp_natd_create(this->ike_sa, FALSE);
 				this->passive_tasks->insert_last(this->passive_tasks, task);
 				break;
 			case AGGRESSIVE:

src/libcharon/sa/tasks/isakmp_natd.c

@@ -15,7 +15,7 @@
  * for more details.
  */
 
-#include "ike_natd_v1.h"
+#include "isakmp_natd.h"
 
 #include <string.h>
 
@@ -26,17 +26,17 @@
 #include <crypto/hashers/hasher.h>
 #include <encoding/payloads/hash_payload.h>
 
-typedef struct private_ike_natd_v1_t private_ike_natd_v1_t;
+typedef struct private_isakmp_natd_t private_isakmp_natd_t;
 
 /**
  * Private members of a ike_natt_t task.
  */
-struct private_ike_natd_v1_t {
+struct private_isakmp_natd_t {
 
 	/**
 	 * Public interface.
 	 */
-	ike_natd_v1_t public;
+	isakmp_natd_t public;
 
 	/**
 	 * Assigned IKE_SA.
@@ -77,7 +77,7 @@ struct private_ike_natd_v1_t {
 /**
  * Build NAT detection hash for a host.
  */
-static chunk_t generate_natd_hash(private_ike_natd_v1_t *this,
+static chunk_t generate_natd_hash(private_isakmp_natd_t *this,
 								  ike_sa_id_t *ike_sa_id, host_t *host)
 {
 	hasher_t *hasher;
@@ -110,7 +110,7 @@ static chunk_t generate_natd_hash(private_ike_natd_v1_t *this,
 /**
  * Build a faked NAT-D payload to enforce UDP encapsulation.
  */
-static chunk_t generate_natd_hash_faked(private_ike_natd_v1_t *this)
+static chunk_t generate_natd_hash_faked(private_isakmp_natd_t *this)
 {
 	hasher_t *hasher;
 	chunk_t chunk;
@@ -136,7 +136,7 @@ static chunk_t generate_natd_hash_faked(private_ike_natd_v1_t *this)
 /**
  * Build a NAT-D payload.
  */
-static hash_payload_t *build_natd_payload(private_ike_natd_v1_t *this, bool src,
+static hash_payload_t *build_natd_payload(private_isakmp_natd_t *this, bool src,
 										  host_t *host)
 {
 	hash_payload_t *payload;
@@ -162,7 +162,7 @@ static hash_payload_t *build_natd_payload(private_ike_natd_v1_t *this, bool src,
 /**
  * Add NAT-D payloads to the message.
  */
-static void add_natd_payloads(private_ike_natd_v1_t *this, message_t *message)
+static void add_natd_payloads(private_isakmp_natd_t *this, message_t *message)
 {
 	hash_payload_t *payload;
 	host_t *host;
@@ -183,7 +183,7 @@ static void add_natd_payloads(private_ike_natd_v1_t *this, message_t *message)
 /**
  * Read NAT-D payloads from message and evaluate them.
  */
-static void process_payloads(private_ike_natd_v1_t *this, message_t *message)
+static void process_payloads(private_isakmp_natd_t *this, message_t *message)
 {
 	enumerator_t *enumerator;
 	payload_t *payload;
@@ -255,7 +255,7 @@ static void process_payloads(private_ike_natd_v1_t *this, message_t *message)
 }
 
 METHOD(task_t, build_i, status_t,
-	private_ike_natd_v1_t *this, message_t *message)
+	private_isakmp_natd_t *this, message_t *message)
 {
 	status_t result = NEED_MORE;
 
@@ -284,7 +284,7 @@ METHOD(task_t, build_i, status_t,
 }
 
 METHOD(task_t, process_i, status_t,
-	private_ike_natd_v1_t *this, message_t *message)
+	private_isakmp_natd_t *this, message_t *message)
 {
 	status_t result = NEED_MORE;
 
@@ -323,7 +323,7 @@ METHOD(task_t, process_i, status_t,
 }
 
 METHOD(task_t, process_r, status_t,
-	private_ike_natd_v1_t *this, message_t *message)
+	private_isakmp_natd_t *this, message_t *message)
 {
 	status_t result = NEED_MORE;
 
@@ -357,7 +357,7 @@ METHOD(task_t, process_r, status_t,
 }
 
 METHOD(task_t, build_r, status_t,
-	private_ike_natd_v1_t *this, message_t *message)
+	private_isakmp_natd_t *this, message_t *message)
 {
 	switch (message->get_exchange_type(message))
 	{
@@ -384,13 +384,13 @@ METHOD(task_t, build_r, status_t,
 }
 
 METHOD(task_t, get_type, task_type_t,
-	private_ike_natd_v1_t *this)
+	private_isakmp_natd_t *this)
 {
-	return TASK_IKE_NATD_V1;
+	return TASK_ISAKMP_NATD;
 }
 
 METHOD(task_t, migrate, void,
-	private_ike_natd_v1_t *this, ike_sa_t *ike_sa)
+	private_isakmp_natd_t *this, ike_sa_t *ike_sa)
 {
 	this->ike_sa = ike_sa;
 	this->src_seen = FALSE;
@@ -400,7 +400,7 @@ METHOD(task_t, migrate, void,
 }
 
 METHOD(task_t, destroy, void,
-	private_ike_natd_v1_t *this)
+	private_isakmp_natd_t *this)
 {
 	free(this);
 }
@@ -408,9 +408,9 @@ METHOD(task_t, destroy, void,
 /*
  * Described in header.
  */
-ike_natd_v1_t *ike_natd_v1_create(ike_sa_t *ike_sa, bool initiator)
+isakmp_natd_t *isakmp_natd_create(ike_sa_t *ike_sa, bool initiator)
 {
-	private_ike_natd_v1_t *this;
+	private_isakmp_natd_t *this;
 
 	INIT(this,
 		.public = {

src/libcharon/sa/tasks/isakmp_natd.h

@@ -14,23 +14,23 @@
  */
 
 /**
- * @defgroup ike_natd_v1 ike_natd_v1
+ * @defgroup isakmp_natd isakmp_natd
  * @{ @ingroup tasks
  */
 
-#ifndef IKE_NATD_V1_H_
+#ifndef ISAKMP_NATD_H_
-#define IKE_NATD_V1_H_
+#define ISAKMP_NATD_H_
 
-typedef struct ike_natd_v1_t ike_natd_v1_t;
+typedef struct isakmp_natd_t isakmp_natd_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
 #include <sa/tasks/task.h>
 
 /**
- * Task of type ike_natd_v1, detects NAT situation in IKEv1 Phase 1.
+ * Task of type ISAKMP_NATD, detects NAT situation in IKEv1 Phase 1.
  */
-struct ike_natd_v1_t {
+struct isakmp_natd_t {
 
 	/**
 	 * Implements the task_t interface
@@ -39,12 +39,12 @@ struct ike_natd_v1_t {
 };
 
 /**
- * Create a new ike_natd_v1 task.
+ * Create a new ISAKMP_NATD task.
  *
  * @param ike_sa		IKE_SA this task works for
  * @param initiator		TRUE if task is the original initiator
- * @return				ike_natd_v1 task to handle by the task_manager
+ * @return				isakmp_natd task to handle by the task_manager
  */
-ike_natd_v1_t *ike_natd_v1_create(ike_sa_t *ike_sa, bool initiator);
+isakmp_natd_t *isakmp_natd_create(ike_sa_t *ike_sa, bool initiator);
 
-#endif /** IKE_NATD_V1_H_ @}*/
+#endif /** ISAKMP_NATD_H_ @}*/

src/libcharon/sa/tasks/task.c

@@ -44,7 +44,7 @@ ENUM(task_type_names, TASK_IKE_INIT, TASK_ISAKMP_CERT_POST,
 	"QUICK_MODE",
 	"QUICK_DELETE",
 	"VENDOR_V1",
-	"IKE_NATD_V1",
+	"ISAKMP_NATD",
 	"ISAKMP_CERT_PRE",
 	"ISAKMP_CERT_POST",
 );

src/libcharon/sa/tasks/task.h

@@ -86,7 +86,7 @@ enum task_type_t {
 	/** IKEv1 vendor ID payload handling */
 	TASK_VENDOR_V1,
 	/** IKEv1 NAT detection */
-	TASK_IKE_NATD_V1,
+	TASK_ISAKMP_NATD,
 	/** IKEv1 pre-authentication certificate handling */
 	TASK_ISAKMP_CERT_PRE,
 	/** IKEv1 post-authentication certificate handling */