aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libcharon/daemon.h21
-rw-r--r--src/libcharon/sa/authenticator.h2
-rw-r--r--src/libcharon/sa/ikev1/authenticators/hybrid_authenticator.h2
-rw-r--r--src/libcharon/sa/ikev1/authenticators/psk_v1_authenticator.h2
-rw-r--r--src/libcharon/sa/ikev1/authenticators/pubkey_v1_authenticator.h2
-rw-r--r--src/libcharon/sa/ikev1/keymat_v1.h2
-rwxr-xr-xsrc/libcharon/sa/ikev1/task_manager_v1.h2
-rw-r--r--src/libcharon/sa/ikev1/tasks/aggressive_mode.h2
-rwxr-xr-xsrc/libcharon/sa/ikev1/tasks/informational.h2
-rw-r--r--src/libcharon/sa/ikev1/tasks/isakmp_cert_post.h2
-rw-r--r--src/libcharon/sa/ikev1/tasks/isakmp_cert_pre.h2
-rw-r--r--src/libcharon/sa/ikev1/tasks/isakmp_delete.h2
-rwxr-xr-xsrc/libcharon/sa/ikev1/tasks/isakmp_dpd.h2
-rw-r--r--src/libcharon/sa/ikev1/tasks/isakmp_natd.h2
-rw-r--r--src/libcharon/sa/ikev1/tasks/isakmp_vendor.h2
-rw-r--r--src/libcharon/sa/ikev1/tasks/main_mode.h2
-rw-r--r--src/libcharon/sa/ikev1/tasks/mode_config.h2
-rw-r--r--src/libcharon/sa/ikev1/tasks/quick_delete.h2
-rw-r--r--src/libcharon/sa/ikev1/tasks/quick_mode.h2
-rw-r--r--src/libcharon/sa/ikev1/tasks/xauth.h4
-rw-r--r--src/libcharon/sa/ikev2/authenticators/eap_authenticator.h2
-rw-r--r--src/libcharon/sa/ikev2/authenticators/psk_authenticator.h2
-rw-r--r--src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.h2
-rw-r--r--src/libcharon/sa/ikev2/connect_manager.h2
-rw-r--r--src/libcharon/sa/ikev2/keymat_v2.h2
-rw-r--r--src/libcharon/sa/ikev2/mediation_manager.h2
-rw-r--r--src/libcharon/sa/ikev2/task_manager_v2.h2
-rw-r--r--src/libcharon/sa/ikev2/tasks/child_create.h2
-rw-r--r--src/libcharon/sa/ikev2/tasks/child_delete.h2
-rw-r--r--src/libcharon/sa/ikev2/tasks/child_rekey.h2
-rw-r--r--src/libcharon/sa/ikev2/tasks/ike_auth.h2
-rw-r--r--src/libcharon/sa/ikev2/tasks/ike_auth_lifetime.h2
-rw-r--r--src/libcharon/sa/ikev2/tasks/ike_cert_post.h2
-rw-r--r--src/libcharon/sa/ikev2/tasks/ike_cert_pre.h2
-rw-r--r--src/libcharon/sa/ikev2/tasks/ike_config.h2
-rw-r--r--src/libcharon/sa/ikev2/tasks/ike_delete.h2
-rw-r--r--src/libcharon/sa/ikev2/tasks/ike_dpd.h2
-rw-r--r--src/libcharon/sa/ikev2/tasks/ike_init.h2
-rw-r--r--src/libcharon/sa/ikev2/tasks/ike_me.h2
-rw-r--r--src/libcharon/sa/ikev2/tasks/ike_mobike.h2
-rw-r--r--src/libcharon/sa/ikev2/tasks/ike_natd.h4
-rw-r--r--src/libcharon/sa/ikev2/tasks/ike_reauth.h2
-rw-r--r--src/libcharon/sa/ikev2/tasks/ike_rekey.h2
-rw-r--r--src/libcharon/sa/ikev2/tasks/ike_vendor.h2
-rwxr-xr-xsrc/libcharon/sa/task.h2
-rw-r--r--src/libstrongswan/eap/eap.h4
46 files changed, 66 insertions, 51 deletions
diff --git a/src/libcharon/daemon.h b/src/libcharon/daemon.h
index 5ea3f45bf..c679ccb1c 100644
--- a/src/libcharon/daemon.h
+++ b/src/libcharon/daemon.h
@@ -55,15 +55,30 @@
* @defgroup sa sa
* @ingroup libcharon
*
- * @defgroup authenticators authenticators
+ * @defgroup ikev1 ikev1
* @ingroup sa
*
+ * @defgroup ikev2 ikev2
+ * @ingroup sa
+ *
+ * @defgroup authenticators_v1 authenticators
+ * @ingroup ikev1
+ *
+ * @defgroup authenticators_v2 authenticators
+ * @ingroup ikev2
+ *
* @defgroup eap eap
- * @ingroup authenticators
+ * @ingroup sa
*
- * @defgroup tasks tasks
+ * @defgroup xauth xauth
* @ingroup sa
*
+ * @defgroup tasks_v1 tasks
+ * @ingroup ikev1
+ *
+ * @defgroup tasks_v2 tasks
+ * @ingroup ikev2
+ *
* @addtogroup libcharon
* @{
*
diff --git a/src/libcharon/sa/authenticator.h b/src/libcharon/sa/authenticator.h
index 86b42da7a..914f42d9d 100644
--- a/src/libcharon/sa/authenticator.h
+++ b/src/libcharon/sa/authenticator.h
@@ -17,7 +17,7 @@
/**
* @defgroup authenticator authenticator
- * @{ @ingroup authenticators
+ * @{ @ingroup sa
*/
#ifndef AUTHENTICATOR_H_
diff --git a/src/libcharon/sa/ikev1/authenticators/hybrid_authenticator.h b/src/libcharon/sa/ikev1/authenticators/hybrid_authenticator.h
index 6a0bb1e59..69e596959 100644
--- a/src/libcharon/sa/ikev1/authenticators/hybrid_authenticator.h
+++ b/src/libcharon/sa/ikev1/authenticators/hybrid_authenticator.h
@@ -15,7 +15,7 @@
/**
* @defgroup hybrid_authenticator hybrid_authenticator
- * @{ @ingroup authenticators
+ * @{ @ingroup authenticators_v1
*/
#ifndef HYBRID_AUTHENTICATOR_H_
diff --git a/src/libcharon/sa/ikev1/authenticators/psk_v1_authenticator.h b/src/libcharon/sa/ikev1/authenticators/psk_v1_authenticator.h
index d48410074..cc9e18ba1 100644
--- a/src/libcharon/sa/ikev1/authenticators/psk_v1_authenticator.h
+++ b/src/libcharon/sa/ikev1/authenticators/psk_v1_authenticator.h
@@ -15,7 +15,7 @@
/**
* @defgroup psk_v1_authenticator psk_v1_authenticator
- * @{ @ingroup authenticators
+ * @{ @ingroup authenticators_v1
*/
#ifndef PSK_V1_AUTHENTICATOR_H_
diff --git a/src/libcharon/sa/ikev1/authenticators/pubkey_v1_authenticator.h b/src/libcharon/sa/ikev1/authenticators/pubkey_v1_authenticator.h
index 154d83c26..385664cf3 100644
--- a/src/libcharon/sa/ikev1/authenticators/pubkey_v1_authenticator.h
+++ b/src/libcharon/sa/ikev1/authenticators/pubkey_v1_authenticator.h
@@ -15,7 +15,7 @@
/**
* @defgroup pubkey_v1_authenticator pubkey_v1_authenticator
- * @{ @ingroup authenticators
+ * @{ @ingroup authenticators_v1
*/
#ifndef PUBKEY_V1_AUTHENTICATOR_H_
diff --git a/src/libcharon/sa/ikev1/keymat_v1.h b/src/libcharon/sa/ikev1/keymat_v1.h
index bb1022b5e..e003ed708 100644
--- a/src/libcharon/sa/ikev1/keymat_v1.h
+++ b/src/libcharon/sa/ikev1/keymat_v1.h
@@ -15,7 +15,7 @@
/**
* @defgroup keymat_v1 keymat_v1
- * @{ @ingroup sa
+ * @{ @ingroup ikev1
*/
#ifndef KEYMAT_V1_H_
diff --git a/src/libcharon/sa/ikev1/task_manager_v1.h b/src/libcharon/sa/ikev1/task_manager_v1.h
index 99cd35e32..61e409bbe 100755
--- a/src/libcharon/sa/ikev1/task_manager_v1.h
+++ b/src/libcharon/sa/ikev1/task_manager_v1.h
@@ -15,7 +15,7 @@
/**
* @defgroup task_manager_v1 task_manager_v1
- * @{ @ingroup sa
+ * @{ @ingroup ikev1
*/
#ifndef TASK_MANAGER_V1_H_
diff --git a/src/libcharon/sa/ikev1/tasks/aggressive_mode.h b/src/libcharon/sa/ikev1/tasks/aggressive_mode.h
index b532addad..d0666f41c 100644
--- a/src/libcharon/sa/ikev1/tasks/aggressive_mode.h
+++ b/src/libcharon/sa/ikev1/tasks/aggressive_mode.h
@@ -15,7 +15,7 @@
/**
* @defgroup aggressive_mode aggressive_mode
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v1
*/
#ifndef AGGRESSIVE_MODE_H_
diff --git a/src/libcharon/sa/ikev1/tasks/informational.h b/src/libcharon/sa/ikev1/tasks/informational.h
index 26d8d5167..52938ffbc 100755
--- a/src/libcharon/sa/ikev1/tasks/informational.h
+++ b/src/libcharon/sa/ikev1/tasks/informational.h
@@ -15,7 +15,7 @@
/**
* @defgroup informational informational
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v1
*/
#ifndef INFORMATIONAL_H_
diff --git a/src/libcharon/sa/ikev1/tasks/isakmp_cert_post.h b/src/libcharon/sa/ikev1/tasks/isakmp_cert_post.h
index 2e38df89f..3a155cb68 100644
--- a/src/libcharon/sa/ikev1/tasks/isakmp_cert_post.h
+++ b/src/libcharon/sa/ikev1/tasks/isakmp_cert_post.h
@@ -15,7 +15,7 @@
/**
* @defgroup isakmp_cert_post isakmp_cert_post
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v1
*/
#ifndef ISAKMP_CERT_POST_H_
diff --git a/src/libcharon/sa/ikev1/tasks/isakmp_cert_pre.h b/src/libcharon/sa/ikev1/tasks/isakmp_cert_pre.h
index 908cff020..8e1a94b97 100644
--- a/src/libcharon/sa/ikev1/tasks/isakmp_cert_pre.h
+++ b/src/libcharon/sa/ikev1/tasks/isakmp_cert_pre.h
@@ -15,7 +15,7 @@
/**
* @defgroup isakmp_cert_pre isakmp_cert_pre
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v1
*/
#ifndef ISAKMP_CERT_PRE_H_
diff --git a/src/libcharon/sa/ikev1/tasks/isakmp_delete.h b/src/libcharon/sa/ikev1/tasks/isakmp_delete.h
index 3b7b40c11..1a7a62207 100644
--- a/src/libcharon/sa/ikev1/tasks/isakmp_delete.h
+++ b/src/libcharon/sa/ikev1/tasks/isakmp_delete.h
@@ -15,7 +15,7 @@
/**
* @defgroup isakmp_delete isakmp_delete
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v1
*/
#ifndef ISAKMP_DELETE_H_
diff --git a/src/libcharon/sa/ikev1/tasks/isakmp_dpd.h b/src/libcharon/sa/ikev1/tasks/isakmp_dpd.h
index 13bd34e44..06a0175eb 100755
--- a/src/libcharon/sa/ikev1/tasks/isakmp_dpd.h
+++ b/src/libcharon/sa/ikev1/tasks/isakmp_dpd.h
@@ -15,7 +15,7 @@
/**
* @defgroup isakmp_dpd isakmp_dpd
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v1
*/
#ifndef ISAKMP_DPD_H_
diff --git a/src/libcharon/sa/ikev1/tasks/isakmp_natd.h b/src/libcharon/sa/ikev1/tasks/isakmp_natd.h
index b83b07805..63947fc73 100644
--- a/src/libcharon/sa/ikev1/tasks/isakmp_natd.h
+++ b/src/libcharon/sa/ikev1/tasks/isakmp_natd.h
@@ -15,7 +15,7 @@
/**
* @defgroup isakmp_natd isakmp_natd
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v1
*/
#ifndef ISAKMP_NATD_H_
diff --git a/src/libcharon/sa/ikev1/tasks/isakmp_vendor.h b/src/libcharon/sa/ikev1/tasks/isakmp_vendor.h
index b81d79034..91891085b 100644
--- a/src/libcharon/sa/ikev1/tasks/isakmp_vendor.h
+++ b/src/libcharon/sa/ikev1/tasks/isakmp_vendor.h
@@ -15,7 +15,7 @@
/**
* @defgroup isakmp_vendor isakmp_vendor
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v1
*/
#ifndef ISAKMP_VENDOR_H_
diff --git a/src/libcharon/sa/ikev1/tasks/main_mode.h b/src/libcharon/sa/ikev1/tasks/main_mode.h
index d266b6e63..141701f75 100644
--- a/src/libcharon/sa/ikev1/tasks/main_mode.h
+++ b/src/libcharon/sa/ikev1/tasks/main_mode.h
@@ -15,7 +15,7 @@
/**
* @defgroup main_mode main_mode
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v1
*/
#ifndef MAIN_MODE_H_
diff --git a/src/libcharon/sa/ikev1/tasks/mode_config.h b/src/libcharon/sa/ikev1/tasks/mode_config.h
index 026545eba..462bee374 100644
--- a/src/libcharon/sa/ikev1/tasks/mode_config.h
+++ b/src/libcharon/sa/ikev1/tasks/mode_config.h
@@ -15,7 +15,7 @@
/**
* @defgroup mode_config mode_config
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v1
*/
#ifndef MODE_CONFIG_H_
diff --git a/src/libcharon/sa/ikev1/tasks/quick_delete.h b/src/libcharon/sa/ikev1/tasks/quick_delete.h
index 864262392..4df30c8fe 100644
--- a/src/libcharon/sa/ikev1/tasks/quick_delete.h
+++ b/src/libcharon/sa/ikev1/tasks/quick_delete.h
@@ -15,7 +15,7 @@
/**
* @defgroup quick_delete quick_delete
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v1
*/
#ifndef QUICK_DELETE_H_
diff --git a/src/libcharon/sa/ikev1/tasks/quick_mode.h b/src/libcharon/sa/ikev1/tasks/quick_mode.h
index 295fb1926..0b80cb836 100644
--- a/src/libcharon/sa/ikev1/tasks/quick_mode.h
+++ b/src/libcharon/sa/ikev1/tasks/quick_mode.h
@@ -15,7 +15,7 @@
/**
* @defgroup quick_mode quick_mode
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v1
*/
#ifndef QUICK_MODE_H_
diff --git a/src/libcharon/sa/ikev1/tasks/xauth.h b/src/libcharon/sa/ikev1/tasks/xauth.h
index c1528ccbe..303eb31ce 100644
--- a/src/libcharon/sa/ikev1/tasks/xauth.h
+++ b/src/libcharon/sa/ikev1/tasks/xauth.h
@@ -14,8 +14,8 @@
*/
/**
- * @defgroup xauth xauth
- * @{ @ingroup tasks
+ * @defgroup xauth_t xauth
+ * @{ @ingroup tasks_v1
*/
#ifndef XAUTH_H_
diff --git a/src/libcharon/sa/ikev2/authenticators/eap_authenticator.h b/src/libcharon/sa/ikev2/authenticators/eap_authenticator.h
index 15d7cb88d..d81ebd562 100644
--- a/src/libcharon/sa/ikev2/authenticators/eap_authenticator.h
+++ b/src/libcharon/sa/ikev2/authenticators/eap_authenticator.h
@@ -15,7 +15,7 @@
/**
* @defgroup eap_authenticator eap_authenticator
- * @{ @ingroup authenticators
+ * @{ @ingroup authenticators_v2
*/
#ifndef EAP_AUTHENTICATOR_H_
diff --git a/src/libcharon/sa/ikev2/authenticators/psk_authenticator.h b/src/libcharon/sa/ikev2/authenticators/psk_authenticator.h
index ffd06f1bc..91c534145 100644
--- a/src/libcharon/sa/ikev2/authenticators/psk_authenticator.h
+++ b/src/libcharon/sa/ikev2/authenticators/psk_authenticator.h
@@ -15,7 +15,7 @@
/**
* @defgroup psk_authenticator psk_authenticator
- * @{ @ingroup authenticators
+ * @{ @ingroup authenticators_v2
*/
#ifndef PSK_AUTHENTICATOR_H_
diff --git a/src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.h b/src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.h
index bf95d6efd..82bfea23b 100644
--- a/src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.h
+++ b/src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.h
@@ -16,7 +16,7 @@
/**
* @defgroup pubkey_authenticator pubkey_authenticator
- * @{ @ingroup authenticators
+ * @{ @ingroup authenticators_v2
*/
#ifndef PUBKEY_AUTHENTICATOR_H_
diff --git a/src/libcharon/sa/ikev2/connect_manager.h b/src/libcharon/sa/ikev2/connect_manager.h
index 8fa8ff697..e667e1f70 100644
--- a/src/libcharon/sa/ikev2/connect_manager.h
+++ b/src/libcharon/sa/ikev2/connect_manager.h
@@ -15,7 +15,7 @@
/**
* @defgroup connect_manager connect_manager
- * @{ @ingroup sa
+ * @{ @ingroup ikev2
*/
#ifndef CONNECT_MANAGER_H_
diff --git a/src/libcharon/sa/ikev2/keymat_v2.h b/src/libcharon/sa/ikev2/keymat_v2.h
index b33e71344..89c65bb30 100644
--- a/src/libcharon/sa/ikev2/keymat_v2.h
+++ b/src/libcharon/sa/ikev2/keymat_v2.h
@@ -15,7 +15,7 @@
/**
* @defgroup keymat_v2 keymat_v2
- * @{ @ingroup sa
+ * @{ @ingroup ikev2
*/
#ifndef KEYMAT_V2_H_
diff --git a/src/libcharon/sa/ikev2/mediation_manager.h b/src/libcharon/sa/ikev2/mediation_manager.h
index 31a16f69c..5212bdb86 100644
--- a/src/libcharon/sa/ikev2/mediation_manager.h
+++ b/src/libcharon/sa/ikev2/mediation_manager.h
@@ -15,7 +15,7 @@
/**
* @defgroup mediation_manager mediation_manager
- * @{ @ingroup sa
+ * @{ @ingroup ikev2
*/
#ifndef MEDIATION_MANAGER_H_
diff --git a/src/libcharon/sa/ikev2/task_manager_v2.h b/src/libcharon/sa/ikev2/task_manager_v2.h
index 3e55c983b..70444ae27 100644
--- a/src/libcharon/sa/ikev2/task_manager_v2.h
+++ b/src/libcharon/sa/ikev2/task_manager_v2.h
@@ -15,7 +15,7 @@
/**
* @defgroup task_manager_v2 task_manager_v2
- * @{ @ingroup sa
+ * @{ @ingroup ikev2
*/
#ifndef TASK_MANAGER_V2_H_
diff --git a/src/libcharon/sa/ikev2/tasks/child_create.h b/src/libcharon/sa/ikev2/tasks/child_create.h
index 938b84398..20f5294d7 100644
--- a/src/libcharon/sa/ikev2/tasks/child_create.h
+++ b/src/libcharon/sa/ikev2/tasks/child_create.h
@@ -15,7 +15,7 @@
/**
* @defgroup child_create child_create
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v2
*/
#ifndef CHILD_CREATE_H_
diff --git a/src/libcharon/sa/ikev2/tasks/child_delete.h b/src/libcharon/sa/ikev2/tasks/child_delete.h
index 4c8b3498a..1ada0699e 100644
--- a/src/libcharon/sa/ikev2/tasks/child_delete.h
+++ b/src/libcharon/sa/ikev2/tasks/child_delete.h
@@ -15,7 +15,7 @@
/**
* @defgroup child_delete child_delete
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v2
*/
#ifndef CHILD_DELETE_H_
diff --git a/src/libcharon/sa/ikev2/tasks/child_rekey.h b/src/libcharon/sa/ikev2/tasks/child_rekey.h
index 78314b0f9..23384653d 100644
--- a/src/libcharon/sa/ikev2/tasks/child_rekey.h
+++ b/src/libcharon/sa/ikev2/tasks/child_rekey.h
@@ -15,7 +15,7 @@
/**
* @defgroup child_rekey child_rekey
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v2
*/
#ifndef CHILD_REKEY_H_
diff --git a/src/libcharon/sa/ikev2/tasks/ike_auth.h b/src/libcharon/sa/ikev2/tasks/ike_auth.h
index cf507f8e6..ca864a710 100644
--- a/src/libcharon/sa/ikev2/tasks/ike_auth.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_auth.h
@@ -15,7 +15,7 @@
/**
* @defgroup ike_auth ike_auth
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v2
*/
#ifndef IKE_AUTH_H_
diff --git a/src/libcharon/sa/ikev2/tasks/ike_auth_lifetime.h b/src/libcharon/sa/ikev2/tasks/ike_auth_lifetime.h
index 5259beb2a..4d5087ff5 100644
--- a/src/libcharon/sa/ikev2/tasks/ike_auth_lifetime.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_auth_lifetime.h
@@ -15,7 +15,7 @@
/**
* @defgroup ike_auth_lifetime ike_auth_lifetime
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v2
*/
#ifndef IKE_AUTH_LIFETIME_H_
diff --git a/src/libcharon/sa/ikev2/tasks/ike_cert_post.h b/src/libcharon/sa/ikev2/tasks/ike_cert_post.h
index 61d4c2d82..34606b1e8 100644
--- a/src/libcharon/sa/ikev2/tasks/ike_cert_post.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_cert_post.h
@@ -15,7 +15,7 @@
/**
* @defgroup ike_cert_post ike_cert_post
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v2
*/
#ifndef IKE_CERT_POST_H_
diff --git a/src/libcharon/sa/ikev2/tasks/ike_cert_pre.h b/src/libcharon/sa/ikev2/tasks/ike_cert_pre.h
index 7de1f3271..ac1a85c29 100644
--- a/src/libcharon/sa/ikev2/tasks/ike_cert_pre.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_cert_pre.h
@@ -15,7 +15,7 @@
/**
* @defgroup ike_cert_pre ike_cert_pre
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v2
*/
#ifndef IKE_CERT_PRE_H_
diff --git a/src/libcharon/sa/ikev2/tasks/ike_config.h b/src/libcharon/sa/ikev2/tasks/ike_config.h
index 239e35c43..e35457645 100644
--- a/src/libcharon/sa/ikev2/tasks/ike_config.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_config.h
@@ -15,7 +15,7 @@
/**
* @defgroup ike_config ike_config
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v2
*/
#ifndef IKE_CONFIG_H_
diff --git a/src/libcharon/sa/ikev2/tasks/ike_delete.h b/src/libcharon/sa/ikev2/tasks/ike_delete.h
index 039e068e6..2d5d7cb3a 100644
--- a/src/libcharon/sa/ikev2/tasks/ike_delete.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_delete.h
@@ -15,7 +15,7 @@
/**
* @defgroup ike_delete ike_delete
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v2
*/
#ifndef IKE_DELETE_H_
diff --git a/src/libcharon/sa/ikev2/tasks/ike_dpd.h b/src/libcharon/sa/ikev2/tasks/ike_dpd.h
index 586557232..026871610 100644
--- a/src/libcharon/sa/ikev2/tasks/ike_dpd.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_dpd.h
@@ -15,7 +15,7 @@
/**
* @defgroup ike_dpd ike_dpd
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v2
*/
#ifndef IKE_DPD_H_
diff --git a/src/libcharon/sa/ikev2/tasks/ike_init.h b/src/libcharon/sa/ikev2/tasks/ike_init.h
index aa3cfa8a9..ab169954d 100644
--- a/src/libcharon/sa/ikev2/tasks/ike_init.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_init.h
@@ -15,7 +15,7 @@
/**
* @defgroup ike_init ike_init
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v2
*/
#ifndef IKE_INIT_H_
diff --git a/src/libcharon/sa/ikev2/tasks/ike_me.h b/src/libcharon/sa/ikev2/tasks/ike_me.h
index a7fe0c588..44a4ce69c 100644
--- a/src/libcharon/sa/ikev2/tasks/ike_me.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_me.h
@@ -15,7 +15,7 @@
/**
* @defgroup ike_me ike_me
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v2
*/
#ifndef IKE_ME_H_
diff --git a/src/libcharon/sa/ikev2/tasks/ike_mobike.h b/src/libcharon/sa/ikev2/tasks/ike_mobike.h
index 04cd33f51..a7e3fe7e3 100644
--- a/src/libcharon/sa/ikev2/tasks/ike_mobike.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_mobike.h
@@ -15,7 +15,7 @@
/**
* @defgroup ike_mobike ike_mobike
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v2
*/
#ifndef IKE_MOBIKE_H_
diff --git a/src/libcharon/sa/ikev2/tasks/ike_natd.h b/src/libcharon/sa/ikev2/tasks/ike_natd.h
index 33ebfcae7..9c571b8e6 100644
--- a/src/libcharon/sa/ikev2/tasks/ike_natd.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_natd.h
@@ -15,7 +15,7 @@
/**
* @defgroup ike_natd ike_natd
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v2
*/
#ifndef IKE_NATD_H_
@@ -42,7 +42,7 @@ struct ike_natd_t {
*
* MOBIKE uses NAT payloads in DPD to detect changes in the NAT mappings.
*
- * @return TRUE if mappings have changed
+ * @return TRUE if mappings have changed
*/
bool (*has_mapping_changed)(ike_natd_t *this);
};
diff --git a/src/libcharon/sa/ikev2/tasks/ike_reauth.h b/src/libcharon/sa/ikev2/tasks/ike_reauth.h
index 52c507ede..781b463a7 100644
--- a/src/libcharon/sa/ikev2/tasks/ike_reauth.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_reauth.h
@@ -15,7 +15,7 @@
/**
* @defgroup ike_reauth ike_reauth
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v2
*/
#ifndef IKE_REAUTH_H_
diff --git a/src/libcharon/sa/ikev2/tasks/ike_rekey.h b/src/libcharon/sa/ikev2/tasks/ike_rekey.h
index 20fcd80ed..6a12e9034 100644
--- a/src/libcharon/sa/ikev2/tasks/ike_rekey.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_rekey.h
@@ -15,7 +15,7 @@
/**
* @defgroup ike_rekey ike_rekey
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v2
*/
#ifndef IKE_REKEY_H_
diff --git a/src/libcharon/sa/ikev2/tasks/ike_vendor.h b/src/libcharon/sa/ikev2/tasks/ike_vendor.h
index 54aad9541..86c711636 100644
--- a/src/libcharon/sa/ikev2/tasks/ike_vendor.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_vendor.h
@@ -15,7 +15,7 @@
/**
* @defgroup ike_vendor ike_vendor
- * @{ @ingroup tasks
+ * @{ @ingroup tasks_v2
*/
#ifndef IKE_VENDOR_H_
diff --git a/src/libcharon/sa/task.h b/src/libcharon/sa/task.h
index 255b9a393..8bf9217be 100755
--- a/src/libcharon/sa/task.h
+++ b/src/libcharon/sa/task.h
@@ -16,7 +16,7 @@
/**
* @defgroup task task
- * @{ @ingroup tasks
+ * @{ @ingroup sa
*/
#ifndef TASK_H_
diff --git a/src/libstrongswan/eap/eap.h b/src/libstrongswan/eap/eap.h
index 945e4bc59..143232e4b 100644
--- a/src/libstrongswan/eap/eap.h
+++ b/src/libstrongswan/eap/eap.h
@@ -14,7 +14,7 @@
*/
/**
- * @defgroup eap eap
+ * @defgroup leap eap
* @{ @ingroup libstrongswan
*/
@@ -62,7 +62,7 @@ enum eap_type_t {
EAP_AKA = 23,
EAP_PEAP = 25,
EAP_MSCHAPV2 = 26,
- EAP_MSTLV = 33,
+ EAP_MSTLV = 33,
EAP_TNC = 38,
/** select EAP method dynamically based on i.e. EAP-Identity */
EAP_DYNAMIC = 252,