Renamed ike_vendor_v1 to isakmp_vendor
authorMartin Willi <martin@revosec.ch>
Mon, 19 Dec 2011 10:28:54 +0000 (11:28 +0100)
committerMartin Willi <martin@revosec.ch>
Tue, 20 Mar 2012 16:31:26 +0000 (17:31 +0100)
src/libcharon/Makefile.am
src/libcharon/sa/ike_sa.c
src/libcharon/sa/task_manager_v1.c
src/libcharon/sa/tasks/ike_vendor_v1.c [deleted file]
src/libcharon/sa/tasks/ike_vendor_v1.h [deleted file]
src/libcharon/sa/tasks/isakmp_vendor.c [new file with mode: 0644]
src/libcharon/sa/tasks/isakmp_vendor.h [new file with mode: 0644]
src/libcharon/sa/tasks/task.c
src/libcharon/sa/tasks/task.h

index 0edb674..95bec09 100644 (file)
@@ -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 \
index b1ef154..331b001 100644 (file)
@@ -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);
index ab029bd..dea4dcb 100644 (file)
@@ -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);
diff --git a/src/libcharon/sa/tasks/ike_vendor_v1.c b/src/libcharon/sa/tasks/ike_vendor_v1.c
deleted file mode 100644 (file)
index 8a75631..0000000
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright (C) 2009 Martin Willi
- * Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-#include "ike_vendor_v1.h"
-
-#include <daemon.h>
-#include <encoding/payloads/vendor_id_payload.h>
-
-typedef struct private_ike_vendor_v1_t private_ike_vendor_v1_t;
-
-/**
- * Private data of an ike_vendor_v1_t object.
- */
-struct private_ike_vendor_v1_t {
-
-       /**
-        * Public ike_vendor_v1_t interface.
-        */
-       ike_vendor_v1_t public;
-
-       /**
-        * Associated IKE_SA
-        */
-       ike_sa_t *ike_sa;
-
-       /**
-        * Are we the inititator of this task
-        */
-       bool initiator;
-};
-
-/**
- * IKEv1 Vendor ID database
- */
-static struct {
-       /* Description */
-       char *desc;
-       /* extension flag negotiated with vendor ID, if any */
-       ike_extension_t extension;
-       /* send yourself? */
-       bool send;
-       /* length of vendor ID string */
-       int len;
-       /* vendor ID string */
-       char *id;
-} vendor_ids[] = {
-
-       /* strongSwan MD5("strongSwan") */
-       { "strongSwan", EXT_STRONGSWAN, FALSE, 16,
-         "\x88\x2f\xe5\x6d\x6f\xd2\x0d\xbc\x22\x51\x61\x3b\x2e\xbe\x5b\xeb"},
-
-       /* XAuth, MD5("draft-ietf-ipsra-isakmp-xauth-06.txt") */
-       { "XAuth", EXT_XAUTH, TRUE, 8,
-         "\x09\x00\x26\x89\xdf\xd6\xb7\x12"},
-
-       /* NAT-Traversal, MD5("RFC 3947") */
-       { "NAT-T (RFC 3947)", EXT_NATT, TRUE, 16,
-         "\x4a\x13\x1c\x81\x07\x03\x58\x45\x5c\x57\x28\xf2\x0e\x95\x45\x2f"},
-
-       /* draft-ietf-ipsec-dpd-00 */
-       { "DPD", 0, FALSE, 16,
-         "\xaf\xca\xd7\x13\x68\xa1\xf1\xc9\x6b\x86\x96\xfc\x77\x57\x01\x00"},
-
-       { "draft-stenberg-ipsec-nat-traversal-01", 0, FALSE, 16,
-         "\x27\xba\xb5\xdc\x01\xea\x07\x60\xea\x4e\x31\x90\xac\x27\xc0\xd0"},
-
-       { "draft-stenberg-ipsec-nat-traversal-02", 0, FALSE, 16,
-         "\x61\x05\xc4\x22\xe7\x68\x47\xe4\x3f\x96\x84\x80\x12\x92\xae\xcd"},
-
-       { "draft-ietf-ipsec-nat-t-ike-00", 0, FALSE, 16,
-         "\x44\x85\x15\x2d\x18\xb6\xbb\xcd\x0b\xe8\xa8\x46\x95\x79\xdd\xcc"},
-
-       { "draft-ietf-ipsec-nat-t-ike-02", 0, FALSE, 16,
-         "\xcd\x60\x46\x43\x35\xdf\x21\xf8\x7c\xfd\xb2\xfc\x68\xb6\xa4\x48"},
-
-       { "draft-ietf-ipsec-nat-t-ike-02", 0, FALSE, 16,
-         "\x90\xcb\x80\x91\x3e\xbb\x69\x6e\x08\x63\x81\xb5\xec\x42\x7b\x1f"},
-
-       { "draft-ietf-ipsec-nat-t-ike-03", 0, FALSE, 16,
-         "\x7d\x94\x19\xa6\x53\x10\xca\x6f\x2c\x17\x9d\x92\x15\x52\x9d\x56"},
-
-       { "Cisco Unity", 0, FALSE, 16,
-         "\x12\xf5\xf2\x8c\x45\x71\x68\xa9\x70\x2d\x9f\xe2\x74\xcc\x01\x00"},
-};
-
-METHOD(task_t, build, status_t,
-       private_ike_vendor_v1_t *this, message_t *message)
-{
-       vendor_id_payload_t *vid_payload;
-       bool strongswan;
-       int i;
-
-       strongswan = lib->settings->get_bool(lib->settings,
-                                                                                "charon.send_vendor_id", FALSE);
-       for (i = 0; i < countof(vendor_ids); i++)
-       {
-               if (vendor_ids[i].send ||
-                       (vendor_ids[i].extension == EXT_STRONGSWAN && strongswan))
-               {
-                       vid_payload = vendor_id_payload_create_data(VENDOR_ID_V1,
-                               chunk_clone(chunk_create(vendor_ids[i].id, vendor_ids[i].len)));
-                       message->add_payload(message, &vid_payload->payload_interface);
-               }
-       }
-       return this->initiator ? NEED_MORE : SUCCESS;
-}
-
-METHOD(task_t, process, status_t,
-       private_ike_vendor_v1_t *this, message_t *message)
-{
-       enumerator_t *enumerator;
-       payload_t *payload;
-       int i;
-
-       enumerator = message->create_payload_enumerator(message);
-       while (enumerator->enumerate(enumerator, &payload))
-       {
-               if (payload->get_type(payload) == VENDOR_ID_V1)
-               {
-                       vendor_id_payload_t *vid;
-                       bool found = FALSE;
-                       chunk_t data;
-
-                       vid = (vendor_id_payload_t*)payload;
-                       data = vid->get_data(vid);
-
-                       for (i = 0; i < countof(vendor_ids); i++)
-                       {
-                               if (chunk_equals(data, chunk_create(vendor_ids[i].id,
-                                                                                                       vendor_ids[i].len)))
-                               {
-                                       DBG1(DBG_IKE, "received %s vendor id", vendor_ids[i].desc);
-                                       if (vendor_ids[i].extension)
-                                       {
-                                               this->ike_sa->enable_extension(this->ike_sa,
-                                                                                                          vendor_ids[i].extension);
-                                       }
-                                       found = TRUE;
-                               }
-                       }
-                       if (!found)
-                       {
-                               DBG1(DBG_ENC, "received unknown vendor id: %#B", &data);
-                       }
-               }
-       }
-       enumerator->destroy(enumerator);
-
-       return this->initiator ? SUCCESS : NEED_MORE;
-}
-
-METHOD(task_t, migrate, void,
-       private_ike_vendor_v1_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)
-{
-       return TASK_VENDOR_V1;
-}
-
-METHOD(task_t, destroy, void,
-       private_ike_vendor_v1_t *this)
-{
-       free(this);
-}
-
-/**
- * See header
- */
-ike_vendor_v1_t *ike_vendor_v1_create(ike_sa_t *ike_sa, bool initiator)
-{
-       private_ike_vendor_v1_t *this;
-
-       INIT(this,
-               .public = {
-                       .task = {
-                               .build = _build,
-                               .process = _process,
-                               .migrate = _migrate,
-                               .get_type = _get_type,
-                               .destroy = _destroy,
-                       },
-               },
-               .initiator = initiator,
-               .ike_sa = ike_sa,
-       );
-
-       return &this->public;
-}
diff --git a/src/libcharon/sa/tasks/ike_vendor_v1.h b/src/libcharon/sa/tasks/ike_vendor_v1.h
deleted file mode 100644 (file)
index 60e96eb..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2011 Martin Willi
- * Copyright (C) 2011 revosec AG
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-/**
- * @defgroup ike_vendor_v1 ike_vendor_v1
- * @{ @ingroup tasks
- */
-
-#ifndef IKE_VENDOR_V1_H_
-#define IKE_VENDOR_V1_H_
-
-typedef struct ike_vendor_v1_t ike_vendor_v1_t;
-
-#include <library.h>
-#include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
-
-/**
- * Vendor ID processing task for IKEv1.
- */
-struct ike_vendor_v1_t {
-
-       /**
-        * Implements task interface.
-        */
-       task_t task;
-};
-
-/**
- * Create a ike_vendor_v1 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);
-
-#endif /** ike_vendor_v1_H_ @}*/
diff --git a/src/libcharon/sa/tasks/isakmp_vendor.c b/src/libcharon/sa/tasks/isakmp_vendor.c
new file mode 100644 (file)
index 0000000..a1d6486
--- /dev/null
@@ -0,0 +1,204 @@
+/*
+ * Copyright (C) 2009 Martin Willi
+ * Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+#include "isakmp_vendor.h"
+
+#include <daemon.h>
+#include <encoding/payloads/vendor_id_payload.h>
+
+typedef struct private_isakmp_vendor_t private_isakmp_vendor_t;
+
+/**
+ * Private data of an isakmp_vendor_t object.
+ */
+struct private_isakmp_vendor_t {
+
+       /**
+        * Public isakmp_vendor_t interface.
+        */
+       isakmp_vendor_t public;
+
+       /**
+        * Associated IKE_SA
+        */
+       ike_sa_t *ike_sa;
+
+       /**
+        * Are we the inititator of this task
+        */
+       bool initiator;
+};
+
+/**
+ * IKEv1 Vendor ID database
+ */
+static struct {
+       /* Description */
+       char *desc;
+       /* extension flag negotiated with vendor ID, if any */
+       ike_extension_t extension;
+       /* send yourself? */
+       bool send;
+       /* length of vendor ID string */
+       int len;
+       /* vendor ID string */
+       char *id;
+} vendor_ids[] = {
+
+       /* strongSwan MD5("strongSwan") */
+       { "strongSwan", EXT_STRONGSWAN, FALSE, 16,
+         "\x88\x2f\xe5\x6d\x6f\xd2\x0d\xbc\x22\x51\x61\x3b\x2e\xbe\x5b\xeb"},
+
+       /* XAuth, MD5("draft-ietf-ipsra-isakmp-xauth-06.txt") */
+       { "XAuth", EXT_XAUTH, TRUE, 8,
+         "\x09\x00\x26\x89\xdf\xd6\xb7\x12"},
+
+       /* NAT-Traversal, MD5("RFC 3947") */
+       { "NAT-T (RFC 3947)", EXT_NATT, TRUE, 16,
+         "\x4a\x13\x1c\x81\x07\x03\x58\x45\x5c\x57\x28\xf2\x0e\x95\x45\x2f"},
+
+       /* draft-ietf-ipsec-dpd-00 */
+       { "DPD", 0, FALSE, 16,
+         "\xaf\xca\xd7\x13\x68\xa1\xf1\xc9\x6b\x86\x96\xfc\x77\x57\x01\x00"},
+
+       { "draft-stenberg-ipsec-nat-traversal-01", 0, FALSE, 16,
+         "\x27\xba\xb5\xdc\x01\xea\x07\x60\xea\x4e\x31\x90\xac\x27\xc0\xd0"},
+
+       { "draft-stenberg-ipsec-nat-traversal-02", 0, FALSE, 16,
+         "\x61\x05\xc4\x22\xe7\x68\x47\xe4\x3f\x96\x84\x80\x12\x92\xae\xcd"},
+
+       { "draft-ietf-ipsec-nat-t-ike-00", 0, FALSE, 16,
+         "\x44\x85\x15\x2d\x18\xb6\xbb\xcd\x0b\xe8\xa8\x46\x95\x79\xdd\xcc"},
+
+       { "draft-ietf-ipsec-nat-t-ike-02", 0, FALSE, 16,
+         "\xcd\x60\x46\x43\x35\xdf\x21\xf8\x7c\xfd\xb2\xfc\x68\xb6\xa4\x48"},
+
+       { "draft-ietf-ipsec-nat-t-ike-02", 0, FALSE, 16,
+         "\x90\xcb\x80\x91\x3e\xbb\x69\x6e\x08\x63\x81\xb5\xec\x42\x7b\x1f"},
+
+       { "draft-ietf-ipsec-nat-t-ike-03", 0, FALSE, 16,
+         "\x7d\x94\x19\xa6\x53\x10\xca\x6f\x2c\x17\x9d\x92\x15\x52\x9d\x56"},
+
+       { "Cisco Unity", 0, FALSE, 16,
+         "\x12\xf5\xf2\x8c\x45\x71\x68\xa9\x70\x2d\x9f\xe2\x74\xcc\x01\x00"},
+};
+
+METHOD(task_t, build, status_t,
+       private_isakmp_vendor_t *this, message_t *message)
+{
+       vendor_id_payload_t *vid_payload;
+       bool strongswan;
+       int i;
+
+       strongswan = lib->settings->get_bool(lib->settings,
+                                                                                "charon.send_vendor_id", FALSE);
+       for (i = 0; i < countof(vendor_ids); i++)
+       {
+               if (vendor_ids[i].send ||
+                       (vendor_ids[i].extension == EXT_STRONGSWAN && strongswan))
+               {
+                       vid_payload = vendor_id_payload_create_data(VENDOR_ID_V1,
+                               chunk_clone(chunk_create(vendor_ids[i].id, vendor_ids[i].len)));
+                       message->add_payload(message, &vid_payload->payload_interface);
+               }
+       }
+       return this->initiator ? NEED_MORE : SUCCESS;
+}
+
+METHOD(task_t, process, status_t,
+       private_isakmp_vendor_t *this, message_t *message)
+{
+       enumerator_t *enumerator;
+       payload_t *payload;
+       int i;
+
+       enumerator = message->create_payload_enumerator(message);
+       while (enumerator->enumerate(enumerator, &payload))
+       {
+               if (payload->get_type(payload) == VENDOR_ID_V1)
+               {
+                       vendor_id_payload_t *vid;
+                       bool found = FALSE;
+                       chunk_t data;
+
+                       vid = (vendor_id_payload_t*)payload;
+                       data = vid->get_data(vid);
+
+                       for (i = 0; i < countof(vendor_ids); i++)
+                       {
+                               if (chunk_equals(data, chunk_create(vendor_ids[i].id,
+                                                                                                       vendor_ids[i].len)))
+                               {
+                                       DBG1(DBG_IKE, "received %s vendor id", vendor_ids[i].desc);
+                                       if (vendor_ids[i].extension)
+                                       {
+                                               this->ike_sa->enable_extension(this->ike_sa,
+                                                                                                          vendor_ids[i].extension);
+                                       }
+                                       found = TRUE;
+                               }
+                       }
+                       if (!found)
+                       {
+                               DBG1(DBG_ENC, "received unknown vendor id: %#B", &data);
+                       }
+               }
+       }
+       enumerator->destroy(enumerator);
+
+       return this->initiator ? SUCCESS : NEED_MORE;
+}
+
+METHOD(task_t, migrate, void,
+       private_isakmp_vendor_t *this, ike_sa_t *ike_sa)
+{
+       this->ike_sa = ike_sa;
+}
+
+METHOD(task_t, get_type, task_type_t,
+       private_isakmp_vendor_t *this)
+{
+       return TASK_ISAKMP_VENDOR;
+}
+
+METHOD(task_t, destroy, void,
+       private_isakmp_vendor_t *this)
+{
+       free(this);
+}
+
+/**
+ * See header
+ */
+isakmp_vendor_t *isakmp_vendor_create(ike_sa_t *ike_sa, bool initiator)
+{
+       private_isakmp_vendor_t *this;
+
+       INIT(this,
+               .public = {
+                       .task = {
+                               .build = _build,
+                               .process = _process,
+                               .migrate = _migrate,
+                               .get_type = _get_type,
+                               .destroy = _destroy,
+                       },
+               },
+               .initiator = initiator,
+               .ike_sa = ike_sa,
+       );
+
+       return &this->public;
+}
diff --git a/src/libcharon/sa/tasks/isakmp_vendor.h b/src/libcharon/sa/tasks/isakmp_vendor.h
new file mode 100644 (file)
index 0000000..e6ceb2e
--- /dev/null
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2011 Martin Willi
+ * Copyright (C) 2011 revosec AG
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+/**
+ * @defgroup isakmp_vendor isakmp_vendor
+ * @{ @ingroup tasks
+ */
+
+#ifndef ISAKMP_VENDOR_H_
+#define ISAKMP_VENDOR_H_
+
+typedef struct isakmp_vendor_t isakmp_vendor_t;
+
+#include <library.h>
+#include <sa/ike_sa.h>
+#include <sa/tasks/task.h>
+
+/**
+ * Vendor ID processing task for IKEv1.
+ */
+struct isakmp_vendor_t {
+
+       /**
+        * Implements task interface.
+        */
+       task_t task;
+};
+
+/**
+ * Create a isakmp_vendor instance.
+ *
+ * @param ike_sa               IKE_SA this task works for
+ * @param initiator            TRUE if task is the original initiator
+ */
+isakmp_vendor_t *isakmp_vendor_create(ike_sa_t *ike_sa, bool initiator);
+
+#endif /** ISAKMP_VENDOR_H_ @}*/
index c3e67e3..ce61c40 100644 (file)
@@ -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",
index a45cff9..0afdf43 100644 (file)
@@ -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 */