Use separate Doxygen groups for IKEv1 and IKEv2 entities (authenticators, tasks etc.).

diff --git a/src/libcharon/daemon.h b/src/libcharon/daemon.h
index 5ea3f45bfc0f40aa4ce347f75989391761d8e59d..c679ccb1c0fb25b7c4bfa3802ef1bd93afe732cc 100644 (file)
--- 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 86b42da7acae09db579e12e161d4f6cbec674202..914f42d9d462ba45e68c3d2cb717390594eaeaf0 100644 (file)
--- 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 6a0bb1e59f9ef466ac3ea87b699461a117b8cb20..69e5969593459370f595ca325bb5d7b85a84273a 100644 (file)
--- 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 d48410074b8bcf0e37a3cf18555cd3aa6fda4f1e..cc9e18ba128a0ac89c4cc0aee68851993e081ac0 100644 (file)
--- 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 154d83c26332670c53f8d20f90e3728052d8eef1..385664cf3703c66b3610a20ea8429e9b1a4c9115 100644 (file)
--- 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 bb1022b5e45f42f383de56660fb142747eb103a4..e003ed708faf6a48e196b7ec40639dc1dd480164 100644 (file)
--- 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 99cd35e32d3edc2a9aea5d4920b45c7989afdda3..61e409bbe43de497a2405e83b53021b845453292 100755 (executable)
--- 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 b532addad101ffb665b9be04c5a2062b970e04f9..d0666f41c959f333e82de9eee555d6309a4a8ab0 100644 (file)
--- 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 26d8d51678c402dff0ac5ff59dc4f78a560b8479..52938ffbc96c94dbd23c5a9bb25ab6f508cf0b5e 100755 (executable)
--- 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 2e38df89ff090973d0b33fe4d200688c37df2df3..3a155cb68d75ac7885ab91745d8bbd8755a1fb68 100644 (file)
--- 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 908cff020bbbfedbfec4063091911c90bc64dd54..8e1a94b97cc865381b82aa39a16820982d8fa60d 100644 (file)
--- 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 3b7b40c116c081719b80aa1619deb8d85b99ab4d..1a7a62207b966650ddb6c3f6cfcb68f6f91b7044 100644 (file)
--- 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 13bd34e4485516a6f05362bb1af0d2552416fec6..06a0175eb12277dfd35fefe4ba790389595bf16b 100755 (executable)
--- 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 b83b078056e58664f58aa9c19735c19b5012c9db..63947fc73101e88b24d54987638329653bc308f5 100644 (file)
--- 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 b81d79034c1d5efe47032e8068a70054402e2629..91891085b814f4ff56c383a98803efcf6433eb0b 100644 (file)
--- 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 d266b6e636f9db11c43ef48639fd1cc55a63b390..141701f75192cf7d16aed6112eb0be9fed0d1784 100644 (file)
--- 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 026545eba17a4381e359c02a487e0e4e8811149c..462bee37430ed96a92df1cdc67cf3d5a35d9cde9 100644 (file)
--- 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 8642623925e0a5717043937aee16b49564977364..4df30c8fef32ec5d4060c1ddf3050d4ec40ce6e0 100644 (file)
--- 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 295fb1926d3cc671359615a1e576c798962c459f..0b80cb836e49e5ea5294c1ce56b9aa3aca57f132 100644 (file)
--- 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 c1528ccbe0083bc350a3199081e04527bb67f7d3..303eb31ce28d603f803f9dde44d09e1cc74a1406 100644 (file)
--- 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 15d7cb88d09e166a515c9e128225d46c52d14505..d81ebd562342aff6874820ba40550607a47cfad0 100644 (file)
--- 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 ffd06f1bc6144e80383c0d9d8992ef946f457b64..91c5341453a4b6bcccec102efbf9f581f9914642 100644 (file)
--- 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 bf95d6efd5ccb85f546a67b2a88b8b3ed02031a6..82bfea23bdfd917975b69b45d4baf970ba446b17 100644 (file)
--- 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 8fa8ff6970b80b026ad4a3709abdf749f736e8a7..e667e1f70e50fd76b3330e8abd8a69a79822513c 100644 (file)
--- 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 b33e713441281526e8c6f1a370212e2910542674..89c65bb3026752d24aeaefdd1ee433a8ff3f3df4 100644 (file)
--- 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 31a16f69c0a34f09b3aee63634b9c223adab580e..5212bdb86056875e32815443c13160f66025c2b6 100644 (file)
--- 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 3e55c983b409f719e551ad17531b1205764987ca..70444ae27d540bab7d966d689fa3b2cc7d1a7913 100644 (file)
--- 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 938b843982f8fce7f76b9df23311fda4024af5fd..20f5294d72dac1d5917b24343a40b8afeae0a2fc 100644 (file)
--- 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 4c8b3498ab793b607b889ad1c574c5964bb0c0a0..1ada0699e2c845fdaebbe58dc0a08dfb2d219ee1 100644 (file)
--- 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 78314b0f9a8330360428d8c63a9ec12c7c8030d1..23384653defc7a1d1b0393ac8bcdaa379f8f24b9 100644 (file)
--- 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 cf507f8e6f7a27564c48d2c571ed01e45e581a02..ca864a710ce776b318771d6d70706e2e7a540f19 100644 (file)
--- 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 5259beb2a5bc7e26dd31b133b88e28e9c49a517a..4d5087ff5d49879d7a57b1c34c63bc4ea9c4b7e6 100644 (file)
--- 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 61d4c2d822f59af9f11f2a518f071123bef16237..34606b1e84bf594c9c6b843f3a9c6c7c95d30da3 100644 (file)
--- 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 7de1f3271078ced8558ff028c9995b626b16f8e0..ac1a85c2943c289bfd744e2aa2895bbc4688648f 100644 (file)
--- 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 239e35c43b3191aa13832c7c005c380b8c009728..e35457645c811713c2448e963d36b38a2c424f33 100644 (file)
--- 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 039e068e6dfd1eb4728a87ae43361e8df928198a..2d5d7cb3a2c25bee1609837aa88b49ff2263355a 100644 (file)
--- 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 586557232649cf4b2564ddc57f9acfcb2e496cb2..026871610df5a1354e1fa8ebdddabfe743f20a6d 100644 (file)
--- 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 aa3cfa8a94a5edd61fef16f677856e369529d75c..ab169954d756389b9a741c3449ec864c88611fb4 100644 (file)
--- 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 a7fe0c5887b4304ca131d35cd4c110cb790ce4fd..44a4ce69c64153f4624fe6d20478cadce17ec810 100644 (file)
--- 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 04cd33f5179542911081d84075b348f0cc43c6f8..a7e3fe7e3273803dc3c80a21a9c24a6afbd6a12f 100644 (file)
--- 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 33ebfcae7f0e1fb8b43702ba9b4998e26e31f4fe..9c571b8e63d0cb05cb21759f6ec4ae86717558c6 100644 (file)
--- 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 52c507ede34a02417e54eff472e5030da36a582f..781b463a7aaa92bb1c34fc2efd77dbaba2ff53f0 100644 (file)
--- 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 20fcd80ed4197fc925f85eefafa88cb8b9e0bef4..6a12e9034649f34aaa191af843bff536b380ac8c 100644 (file)
--- 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 54aad95412782494701ff058d355b6b358fe5ab2..86c7116369c74700592ae93fd24fcd97eb09a8da 100644 (file)
--- 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 255b9a3939d9b469e2da045539ccefb0270f35cb..8bf9217be2009e71df04f6fea3449e812affb341 100755 (executable)
--- 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 945e4bc590ec7ed414c162e7f580344ef970afa2..143232e4b7a57dd84447ab95efedaca5686381c5 100644 (file)
--- 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,