denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use a single task_type_t enum name for ME and non-ME variant

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:31:21 +01:00
parent 7b25135ecf
commit 137c06babf
1 changed files with 27 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/tasks/task.c
+27 -55
View File
@@ -16,61 +16,33 @@
#include "task.h" #include "task.h"
ENUM(task_type_names, TASK_IKE_INIT, TASK_IKE_CERT_POST_V1,
"IKE_INIT",
"IKE_NATD",
"IKE_MOBIKE",
"IKE_AUTH",
"IKE_AUTH_LIFETIME",
"IKE_CERT_PRE",
"IKE_CERT_POST",
"IKE_CONFIG",
"IKE_REKEY",
"IKE_REAUTH",
"IKE_DELETE",
"IKE_DPD",
"IKE_VENDOR",
#ifdef ME #ifdef ME
ENUM(task_type_names, TASK_IKE_INIT, TASK_IKE_CERT_POST_V1,
"IKE_INIT",
"IKE_NATD",
"IKE_MOBIKE",
"IKE_AUTH",
"IKE_AUTH_LIFETIME",
"IKE_CERT_PRE",
"IKE_CERT_POST",
"IKE_CONFIG",
"IKE_REKEY",
"IKE_REAUTH",
"IKE_DELETE",
"IKE_DPD",
"IKE_VENDOR",
"IKE_ME", "IKE_ME",
"CHILD_CREATE",
"CHILD_DELETE",
"CHILD_REKEY",
"MAIN_MODE",
"INFORMATIONAL",
"XAUTH",
"MODE_CONFIG",
"QUICK_MODE",
"VENDOR_V1",
"IKE_NATD_V1",
"IKE_CERT_PRE_V1",
"IKE_CERT_POST_V1",
);
#else
ENUM(task_type_names, TASK_IKE_INIT, TASK_IKE_CERT_POST_V1,
"IKE_INIT",
"IKE_NATD",
"IKE_MOBIKE",
"IKE_AUTH",
"IKE_AUTH_LIFETIME",
"IKE_CERT_PRE",
"IKE_CERT_POST",
"IKE_CONFIG",
"IKE_REKEY",
"IKE_REAUTH",
"IKE_DELETE",
"IKE_DPD",
"IKE_VENDOR",
"CHILD_CREATE",
"CHILD_DELETE",
"CHILD_REKEY",
"MAIN_MODE",
"INFORMATIONAL",
"XAUTH",
"MODE_CONFIG",
"QUICK_MODE",
"VENDOR_V1",
"IKE_NATD_V1",
"IKE_CERT_PRE_V1",
"IKE_CERT_POST_V1",
);
#endif /* ME */ #endif /* ME */
"CHILD_CREATE",
"CHILD_DELETE",
"CHILD_REKEY",
"MAIN_MODE",
"INFORMATIONAL",
"XAUTH",
"MODE_CONFIG",
"QUICK_MODE",
"VENDOR_V1",
"IKE_NATD_V1",
"IKE_CERT_PRE_V1",
"IKE_CERT_POST_V1",
);