Renamed ike_vendor_v1 to isakmp_vendor

src/libcharon/Makefile.am

@@ -94,12 +94,12 @@ sa/tasks/ike_rekey.c sa/tasks/ike_rekey.h \
 sa/tasks/ike_reauth.c sa/tasks/ike_reauth.h \
 sa/tasks/ike_auth_lifetime.c sa/tasks/ike_auth_lifetime.h \
 sa/tasks/ike_vendor.c sa/tasks/ike_vendor.h \
-sa/tasks/ike_vendor_v1.c sa/tasks/ike_vendor_v1.h \
 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_vendor.c sa/tasks/isakmp_vendor.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

@@ -50,7 +50,7 @@
 #include <sa/tasks/isakmp_natd.h>
 #include <sa/tasks/quick_mode.h>
 #include <sa/tasks/quick_delete.h>
-#include <sa/tasks/ike_vendor_v1.h>
+#include <sa/tasks/isakmp_vendor.h>
 #include <sa/tasks/isakmp_delete.h>
 #include <processing/jobs/retransmit_job.h>
 #include <processing/jobs/delete_ike_sa_job.h>
@@ -1119,7 +1119,7 @@ METHOD(ike_sa_t, initiate, status_t,
 
 		if (this->version == IKEV1)
 		{
-			task = (task_t*)ike_vendor_v1_create(&this->public, TRUE);
+			task = (task_t*)isakmp_vendor_create(&this->public, TRUE);
 			this->task_manager->queue_task(this->task_manager, task);
 			task = (task_t*)isakmp_cert_pre_create(&this->public, TRUE);
 			this->task_manager->queue_task(this->task_manager, task);

src/libcharon/sa/task_manager_v1.c

@@ -25,7 +25,7 @@
 #include <sa/tasks/mode_config.h>
 #include <sa/tasks/informational.h>
 #include <sa/tasks/isakmp_natd.h>
-#include <sa/tasks/ike_vendor_v1.h>
+#include <sa/tasks/isakmp_vendor.h>
 #include <sa/tasks/isakmp_cert_pre.h>
 #include <sa/tasks/isakmp_cert_post.h>
 #include <processing/jobs/retransmit_job.h>
@@ -299,7 +299,7 @@ METHOD(task_manager_t, initiate, status_t,
 		switch (this->ike_sa->get_state(this->ike_sa))
 		{
 			case IKE_CREATED:
-				activate_task(this, TASK_VENDOR_V1);
+				activate_task(this, TASK_ISAKMP_VENDOR);
 				activate_task(this, TASK_ISAKMP_CERT_PRE);
 				if (activate_task(this, TASK_MAIN_MODE))
 				{
@@ -658,7 +658,7 @@ static status_t process_request(private_task_manager_t *this,
 		switch (message->get_exchange_type(message))
 		{
 			case ID_PROT:
-				task = (task_t *)ike_vendor_v1_create(this->ike_sa, FALSE);
+				task = (task_t *)isakmp_vendor_create(this->ike_sa, FALSE);
 				this->passive_tasks->insert_last(this->passive_tasks, task);
 				task = (task_t*)isakmp_cert_pre_create(this->ike_sa, FALSE);
 				this->passive_tasks->insert_last(this->passive_tasks, task);

src/libcharon/sa/tasks/isakmp_vendor.c

@@ -13,22 +13,22 @@
  * for more details.
  */
 
-#include "ike_vendor_v1.h"
+#include "isakmp_vendor.h"
 
 #include <daemon.h>
 #include <encoding/payloads/vendor_id_payload.h>
 
-typedef struct private_ike_vendor_v1_t private_ike_vendor_v1_t;
+typedef struct private_isakmp_vendor_t private_isakmp_vendor_t;
 
 /**
- * Private data of an ike_vendor_v1_t object.
+ * Private data of an isakmp_vendor_t object.
  */
-struct private_ike_vendor_v1_t {
+struct private_isakmp_vendor_t {
 
 	/**
-	 * Public ike_vendor_v1_t interface.
+	 * Public isakmp_vendor_t interface.
 	 */
-	ike_vendor_v1_t public;
+	isakmp_vendor_t public;
 
 	/**
 	 * Associated IKE_SA
@@ -96,7 +96,7 @@ static struct {
 };
 
 METHOD(task_t, build, status_t,
-	private_ike_vendor_v1_t *this, message_t *message)
+	private_isakmp_vendor_t *this, message_t *message)
 {
 	vendor_id_payload_t *vid_payload;
 	bool strongswan;
@@ -118,7 +118,7 @@ METHOD(task_t, build, status_t,
 }
 
 METHOD(task_t, process, status_t,
-	private_ike_vendor_v1_t *this, message_t *message)
+	private_isakmp_vendor_t *this, message_t *message)
 {
 	enumerator_t *enumerator;
 	payload_t *payload;
@@ -162,19 +162,19 @@ METHOD(task_t, process, status_t,
 }
 
 METHOD(task_t, migrate, void,
-	private_ike_vendor_v1_t *this, ike_sa_t *ike_sa)
+	private_isakmp_vendor_t *this, ike_sa_t *ike_sa)
 {
 	this->ike_sa = ike_sa;
 }
 
 METHOD(task_t, get_type, task_type_t,
-	private_ike_vendor_v1_t *this)
+	private_isakmp_vendor_t *this)
 {
-	return TASK_VENDOR_V1;
+	return TASK_ISAKMP_VENDOR;
 }
 
 METHOD(task_t, destroy, void,
-	private_ike_vendor_v1_t *this)
+	private_isakmp_vendor_t *this)
 {
 	free(this);
 }
@@ -182,9 +182,9 @@ METHOD(task_t, destroy, void,
 /**
  * See header
  */
-ike_vendor_v1_t *ike_vendor_v1_create(ike_sa_t *ike_sa, bool initiator)
+isakmp_vendor_t *isakmp_vendor_create(ike_sa_t *ike_sa, bool initiator)
 {
-	private_ike_vendor_v1_t *this;
+	private_isakmp_vendor_t *this;
 
 	INIT(this,
 		.public = {

src/libcharon/sa/tasks/isakmp_vendor.h

@@ -14,14 +14,14 @@
  */
 
 /**
- * @defgroup ike_vendor_v1 ike_vendor_v1
+ * @defgroup isakmp_vendor isakmp_vendor
  * @{ @ingroup tasks
  */
 
-#ifndef IKE_VENDOR_V1_H_
+#ifndef ISAKMP_VENDOR_H_
-#define IKE_VENDOR_V1_H_
+#define ISAKMP_VENDOR_H_
 
-typedef struct ike_vendor_v1_t ike_vendor_v1_t;
+typedef struct isakmp_vendor_t isakmp_vendor_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
@@ -30,7 +30,7 @@ typedef struct ike_vendor_v1_t ike_vendor_v1_t;
 /**
  * Vendor ID processing task for IKEv1.
  */
-struct ike_vendor_v1_t {
+struct isakmp_vendor_t {
 
 	/**
 	 * Implements task interface.
@@ -39,11 +39,11 @@ struct ike_vendor_v1_t {
 };
 
 /**
- * Create a ike_vendor_v1 instance.
+ * Create a isakmp_vendor instance.
  *
  * @param ike_sa		IKE_SA this task works for
  * @param initiator		TRUE if task is the original initiator
  */
-ike_vendor_v1_t *ike_vendor_v1_create(ike_sa_t *ike_sa, bool initiator);
+isakmp_vendor_t *isakmp_vendor_create(ike_sa_t *ike_sa, bool initiator);
 
-#endif /** ike_vendor_v1_H_ @}*/
+#endif /** ISAKMP_VENDOR_H_ @}*/

src/libcharon/sa/tasks/task.c

@@ -43,7 +43,7 @@ ENUM(task_type_names, TASK_IKE_INIT, TASK_ISAKMP_CERT_POST,
 	"MODE_CONFIG",
 	"QUICK_MODE",
 	"QUICK_DELETE",
-	"VENDOR_V1",
+	"ISAKMP_VENDOR",
 	"ISAKMP_NATD",
 	"ISAKMP_CERT_PRE",
 	"ISAKMP_CERT_POST",

src/libcharon/sa/tasks/task.h

@@ -84,7 +84,7 @@ enum task_type_t {
 	/** IKEv1 delete of a quick mode SA */
 	TASK_QUICK_DELETE,
 	/** IKEv1 vendor ID payload handling */
-	TASK_VENDOR_V1,
+	TASK_ISAKMP_VENDOR,
 	/** IKEv1 NAT detection */
 	TASK_ISAKMP_NATD,
 	/** IKEv1 pre-authentication certificate handling */