Fixed Doxygen comments after scanning complete src directory
authorTobias Brunner <tobias@strongswan.org>
Sat, 2 Mar 2013 14:26:45 +0000 (15:26 +0100)
committerTobias Brunner <tobias@strongswan.org>
Sat, 2 Mar 2013 17:31:53 +0000 (18:31 +0100)
96 files changed:
src/conftest/config.h
src/conftest/hooks/hook.h
src/frontends/android/jni/libandroidbridge/backend/android_creds.h
src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.h
src/frontends/android/jni/libandroidbridge/kernel/android_net.h
src/frontends/android/jni/libandroidbridge/kernel/network_manager.h
src/libcharon/plugins/ipseckey/ipseckey.h
src/libcharon/plugins/medsrv/medsrv_config.h
src/libcharon/plugins/medsrv/medsrv_creds.h
src/libcharon/plugins/medsrv/medsrv_plugin.h
src/libfast/controller.h
src/libimcv/ietf/ietf_attr.h
src/libimcv/ietf/ietf_attr_assess_result.h
src/libimcv/ietf/ietf_attr_attr_request.h
src/libimcv/ietf/ietf_attr_default_pwd_enabled.h
src/libimcv/ietf/ietf_attr_fwd_enabled.h
src/libimcv/ietf/ietf_attr_installed_packages.h
src/libimcv/ietf/ietf_attr_numeric_version.h
src/libimcv/ietf/ietf_attr_op_status.h
src/libimcv/ietf/ietf_attr_pa_tnc_error.h
src/libimcv/ietf/ietf_attr_port_filter.h
src/libimcv/ietf/ietf_attr_product_info.h
src/libimcv/ietf/ietf_attr_remediation_instr.h
src/libimcv/ietf/ietf_attr_string_version.h
src/libimcv/imc/imc_agent.h
src/libimcv/imc/imc_msg.h
src/libimcv/imc/imc_state.h
src/libimcv/imcv.h
src/libimcv/imv/imv_agent.h
src/libimcv/imv/imv_lang_string.h
src/libimcv/imv/imv_msg.h
src/libimcv/imv/imv_reason_string.h
src/libimcv/imv/imv_remediation_string.h
src/libimcv/imv/imv_state.h
src/libimcv/ita/ita_attr.h
src/libimcv/ita/ita_attr_angel.h
src/libimcv/ita/ita_attr_command.h
src/libimcv/ita/ita_attr_dummy.h
src/libimcv/ita/ita_attr_get_settings.h
src/libimcv/ita/ita_attr_settings.h
src/libimcv/pa_tnc/pa_tnc_attr.h
src/libimcv/pa_tnc/pa_tnc_attr_manager.h
src/libimcv/pa_tnc/pa_tnc_msg.h
src/libimcv/plugins/imc_os/imc_os_state.h
src/libimcv/plugins/imc_scanner/imc_scanner_state.h
src/libimcv/plugins/imc_test/imc_test_state.h
src/libimcv/plugins/imv_os/imv_os_database.h
src/libimcv/plugins/imv_os/imv_os_state.h
src/libimcv/plugins/imv_scanner/imv_scanner_state.h
src/libimcv/plugins/imv_test/imv_test_state.h
src/libpts/libpts.h
src/libpts/plugins/imc_attestation/imc_attestation_process.h
src/libpts/plugins/imc_attestation/imc_attestation_state.h
src/libpts/plugins/imv_attestation/attest_db.h
src/libpts/plugins/imv_attestation/imv_attestation_build.h
src/libpts/plugins/imv_attestation/imv_attestation_process.h
src/libpts/plugins/imv_attestation/imv_attestation_state.h
src/libpts/pts/components/pts_comp_func_name.h
src/libpts/pts/pts.h
src/libpts/pts/pts_dh_group.h
src/libpts/pts/pts_file_meas.h
src/libpts/tcg/tcg_attr.h
src/libpts/tcg/tcg_pts_attr_aik.h
src/libpts/tcg/tcg_pts_attr_dh_nonce_finish.h
src/libpts/tcg/tcg_pts_attr_dh_nonce_params_req.h
src/libpts/tcg/tcg_pts_attr_dh_nonce_params_resp.h
src/libpts/tcg/tcg_pts_attr_file_meas.h
src/libpts/tcg/tcg_pts_attr_gen_attest_evid.h
src/libpts/tcg/tcg_pts_attr_get_aik.h
src/libpts/tcg/tcg_pts_attr_get_tpm_version_info.h
src/libpts/tcg/tcg_pts_attr_meas_algo.h
src/libpts/tcg/tcg_pts_attr_proto_caps.h
src/libpts/tcg/tcg_pts_attr_req_file_meas.h
src/libpts/tcg/tcg_pts_attr_req_file_meta.h
src/libpts/tcg/tcg_pts_attr_req_func_comp_evid.h
src/libpts/tcg/tcg_pts_attr_simple_comp_evid.h
src/libpts/tcg/tcg_pts_attr_simple_evid_final.h
src/libpts/tcg/tcg_pts_attr_tpm_version_info.h
src/libpts/tcg/tcg_pts_attr_unix_file_meta.h
src/libpttls/pt_tls.h
src/libradius/radius_message.h
src/libsimaka/simaka_manager.h
src/libstrongswan/plugins/dnskey/dnskey_encoder.h
src/libstrongswan/plugins/unbound/unbound_response.h
src/manager/controller/auth_controller.h
src/manager/controller/config_controller.h
src/manager/controller/control_controller.h
src/manager/controller/gateway_controller.h
src/manager/controller/ikesa_controller.h
src/manager/manager.h
src/medsrv/controller/peer_controller.h
src/medsrv/controller/user_controller.h
src/medsrv/filter/auth_filter.h
src/medsrv/user.h
src/pki/command.h
src/pki/pki.h

index 2a62b9c..ce9e245 100644 (file)
@@ -14,7 +14,7 @@
  */
 
 /**
- * @defgroup config config
+ * @defgroup config_t config
  * @{ @ingroup conftest
  */
 
index 39a15f2..b937117 100644 (file)
@@ -14,8 +14,8 @@
  */
 
 /**
- * @defgroup hook hook
- * @{ @ingroup hooks
+ * @defgroup hook_t hook
+ * @{ @ingroup conftest
  */
 
 #ifndef HOOK_H_
index a3ecddd..918708f 100644 (file)
@@ -49,7 +49,7 @@ struct android_creds_t {
        /**
         * Load the user certificate and private key
         *
-        * @preturn                                     loaded client certificate, NULL on failure
+        * @return                                      loaded client certificate, NULL on failure
         */
        certificate_t *(*load_user_certificate)(android_creds_t *this);
 
index 3a2e834..b68c8b2 100644 (file)
@@ -16,7 +16,7 @@
 
 /**
  * @defgroup kernel_android_ipsec kernel_android_ipsec
- * @{ @ingroup kernel_android
+ * @{ @ingroup android_kernel
  */
 
 #ifndef KERNEL_ANDROID_IPSEC_H_
index 470029f..f060539 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup kernel_android_net kernel_android_net
- * @{ @ingroup kernel_android
+ * @{ @ingroup android_kernel
  */
 
 #ifndef KERNEL_ANDROID_NET_H_
index 2638b5a..da01068 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup network_manager network_manager
- * @{ @ingroup kernel_android
+ * @{ @ingroup android_kernel
  */
 
 #ifndef NETWORK_MANAGER_H_
index 0afc067..5885dae 100644 (file)
@@ -14,7 +14,7 @@
  */
 
 /**
- * @defgroup ipseckey_cred_i ipseckey
+ * @defgroup ipseckey_i ipseckey
  * @{ @ingroup ipseckey
  */
 
index fc8b0e9..03a41a7 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup medsrv_config_i medsrv_config
- * @{ @ingroup medsrv
+ * @{ @ingroup medsrv_p
  */
 
 #ifndef MEDSRV_CONFIG_H_
index d08adf3..2079601 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup medsrv_creds_i medsrv_creds
- * @{ @ingroup medsrv
+ * @{ @ingroup medsrv_p
  */
 
 #ifndef MEDSRV_CREDS_H_
index 8736822..179fa3b 100644 (file)
  */
 
 /**
- * @defgroup medsrv medsrv
+ * @defgroup medsrv_p medsrv
  * @ingroup cplugins
  *
  * @defgroup medsrv_plugin medsrv_plugin
- * @{ @ingroup medsrv
+ * @{ @ingroup medsrv_p
  */
 
 #ifndef MEDSRV_PLUGIN_H_
index 1edf72e..7a7efc7 100644 (file)
@@ -14,7 +14,7 @@
  */
 
 /**
- * @defgroup controller_i controller
+ * @defgroup controller controller
  * @{ @ingroup libfast
  */
 
index a1ba425..d22175d 100644 (file)
@@ -14,8 +14,8 @@
  */
 
 /**
- * @defgroup ietf_attrt ietf_attr
- * @{ @ingroup ietf_attr
+ * @defgroup ietf_attr ietf_attr
+ * @{ @ingroup libimcv
  */
 
 #ifndef IETF_ATTR_H_
index fab8bc3..e94b57b 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup ietf_attr_assess_resultt ietf_attr_assess_result
- * @{ @ingroup ietf
+ * @{ @ingroup ietf_attr
  */
 
 #ifndef IETF_ATTR_ASSESS_RESULT_H_
index 387ba34..fc9e086 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup ietf_attr_attr_requestt ietf_attr_attr_request
- * @{ @ingroup ietf
+ * @{ @ingroup ietf_attr
  */
 
 #ifndef IETF_ATTR_ATTR_REQUEST_H_
index f6026b0..6fe1a02 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup ietf_attr_default_pwd_enabled ietf_attr_default_pwd_enabled
- * @{ @ingroup ietf
+ * @{ @ingroup ietf_attr
  */
 
 #ifndef IETF_ATTR_PWD_ENABLED_H_
index bfde1a7..4171438 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup ietf_attr_fwd_enabled ietf_attr_fwd_enabled
- * @{ @ingroup ietf
+ * @{ @ingroup ietf_attr
  */
 
 #ifndef IETF_ATTR_FWD_ENABLED_H_
index a9f6768..b79c404 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup ietf_attr_installed_packagest ietf_attr_installed_packages
- * @{ @ingroup ietf_attr_installed_packages
+ * @{ @ingroup ietf_attr
  */
 
 #ifndef IETF_ATTR_INSTALLED_PACKAGES_H_
index f7d6c90..bbda6b8 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup ietf_attr_numeric_versiont ietf_attr_numeric_version
- * @{ @ingroup ietf
+ * @{ @ingroup ietf_attr
  */
 
 #ifndef IETF_ATTR_NUMERIC_VERSION_H_
index 2e14148..b70fab6 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup ietf_attr_op_statust ietf_attr_op_status
- * @{ @ingroup ietf
+ * @{ @ingroup ietf_attr
  */
 
 #ifndef IETF_ATTR_OP_STATUS_H_
@@ -40,7 +40,7 @@ enum op_status_t {
 };
 
 extern enum_name_t *op_status_names;
+
 /**
  * Operational Result type
  */
@@ -92,7 +92,7 @@ struct ietf_attr_op_status_t {
  *
  * @param status                       Operational Status
  * @param result                       Operational Result
- * @param last_use                     Time of last use 
+ * @param last_use                     Time of last use
  */
 pa_tnc_attr_t* ietf_attr_op_status_create(u_int8_t status, u_int8_t result,
                                                                                  time_t last_use);
index a5a10d4..faa38f8 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup ietf_attr_pa_tnc_errort ietf_attr_pa_tnc_error
- * @{ @ingroup ietf_attr_pa_tnc_error
+ * @{ @ingroup ietf_attr
  */
 
 #ifndef IETF_ATTR_PA_TNC_ERROR_H_
@@ -96,7 +96,7 @@ struct ietf_attr_pa_tnc_error_t {
  *
  * @param error_code           Vendor-specific PA-TNC error code
  * @param header                       PA-TNC message header (first 8 bytes)
- * 
+ *
  */
 pa_tnc_attr_t* ietf_attr_pa_tnc_error_create(pen_type_t error_code,
                                                                                         chunk_t header);
@@ -107,7 +107,7 @@ pa_tnc_attr_t* ietf_attr_pa_tnc_error_create(pen_type_t error_code,
  * @param error_code           Vendor-specifica PA-TNC error code
  * @param header                       PA-TNC message header (first 8 bytes)
  * @param error_offset         PA-TNC error offset in bytes
- * 
+ *
  */
 pa_tnc_attr_t* ietf_attr_pa_tnc_error_create_with_offset(pen_type_t error_code,
                                                                                                                 chunk_t header,
index ad55534..93b696e 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup ietf_attr_port_filtert ietf_attr_port_filter
- * @{ @ingroup ietf_attr_port_filter
+ * @{ @ingroup ietf_attr
  */
 
 #ifndef IETF_ATTR_PORT_FILTER_H_
index dfaa67d..d0b2d2a 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup ietf_attr_product_infot ietf_attr_product_info
- * @{ @ingroup ietf
+ * @{ @ingroup ietf_attr
  */
 
 #ifndef IETF_ATTR_PRODUCT_INFO_H_
index 473280c..5c7c889 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup ietf_attr_remediation_instrt ietf_attr_remediation_instr
- * @{ @ingroup ietf
+ * @{ @ingroup ietf_attr
  */
 
 #ifndef IETF_ATTR_REMEDIATION_INSTR_H_
index 5ffbea8..9ccc1f0 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup ietf_attr_string_versiont ietf_attr_string_version
- * @{ @ingroup ietf
+ * @{ @ingroup ietf_attr
  */
 
 #ifndef IETF_ATTR_STRING_VERSION_H_
index aef10c0..0a1638f 100644 (file)
@@ -16,7 +16,7 @@
 /**
  *
  * @defgroup imc_agent_t imc_agent
- * @{ @ingroup imc_agent
+ * @{ @ingroup libimcv_imc
  */
 
 #ifndef IMC_AGENT_H_
index 9a4623a..588225d 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup imc_msg imc_msg
- * @{ @ingroup libimcv
+ * @{ @ingroup libimcv_imc
  */
 
 #ifndef IMC_MSG_H_
@@ -141,7 +141,6 @@ imc_msg_t* imc_msg_create_from_data(imc_agent_t *agent, imc_state_t *state,
  * @param connection_id                        connection ID
  * @param src_id                               source IMV ID
  * @param dst_id                               destination IMC ID
- * @param msg_flags                            PA-TNC message flags
  * @param msg_vid                              PA-TNC message vendor ID
  * @param msg_subtype                  PA-TNC subtype
  * @param msg                                  received PA-TNC message blob
index c34441f..7e763fb 100644 (file)
@@ -16,7 +16,7 @@
 /**
  *
  * @defgroup imc_state_t imc_state
- * @{ @ingroup imc_state
+ * @{ @ingroup libimcv_imc
  */
 
 #ifndef IMC_STATE_H_
@@ -68,7 +68,7 @@ struct imc_state_t {
        /**
         * Set the maximum size of a PA-TNC message for this TNCCS connection
         *
-        * @max_msg_len                 maximum size of a PA-TNC message
+        * @param max_msg_len   maximum size of a PA-TNC message
         */
        void (*set_max_msg_len)(imc_state_t *this, u_int32_t max_msg_len);
 
index a1a5a5f..3a37e3d 100644 (file)
 /**
  * @defgroup libimcv libimcv
  *
- * @defgroup iplugins plugins
+ * @defgroup libimcv_imc imc
+ * @ingroup libimcv
+ *
+ * @defgroup libimcv_imv imv
+ * @ingroup libimcv
+ *
+ * @defgroup pa_tnc pa_tnc
+ * @ingroup libimcv
+ *
+ * @defgroup libimcv_plugins plugins
  * @ingroup libimcv
  *
  * @addtogroup libimcv
index 5b2cffe..4d0716f 100644 (file)
@@ -16,7 +16,7 @@
 /**
  *
  * @defgroup imv_agent_t imv_agent
- * @{ @ingroup imv_agent
+ * @{ @ingroup libimcv_imv
  */
 
 #ifndef IMV_AGENT_H_
index 90a66db..56b4572 100644 (file)
@@ -16,7 +16,7 @@
 /**
  *
  * @defgroup imv_lang_string_t imv_lang_string
- * @{ @ingroup imv_lang_string
+ * @{ @ingroup libimcv_imv
  */
 
 #ifndef IMV_LANG_STRING_H_
index 2a28101..9e56d9f 100644 (file)
@@ -14,8 +14,8 @@
  */
 
 /**
- * @defgroup imv_msg imv_msg
- * @{ @ingroup libimcv
+ * @defgroup imv_msg_t imv_msg
+ * @{ @ingroup libimcv_imv
  */
 
 #ifndef IMV_MSG_H_
@@ -155,7 +155,6 @@ imv_msg_t* imv_msg_create_from_data(imv_agent_t *agent, imv_state_t *state,
  * @param connection_id                        connection ID
  * @param src_id                               source IMC ID
  * @param dst_id                               destination IMV ID
- * @param msg_flags                            PA-TNC message flags
  * @param msg_vid                              PA-TNC message vendor ID
  * @param msg_subtype                  PA-TNC subtype
  * @param msg                                  received PA-TNC message blob
index 320b247..cb4c27f 100644 (file)
@@ -16,7 +16,7 @@
 /**
  *
  * @defgroup imv_reason_string_t imv_reason_string
- * @{ @ingroup imv_reason_string
+ * @{ @ingroup libimcv_imv
  */
 
 #ifndef IMV_REASON_STRING_H_
index 9249c2a..605013a 100644 (file)
@@ -16,7 +16,7 @@
 /**
  *
  * @defgroup imv_remediation_string_t imv_remediation_string
- * @{ @ingroup imv_remediation_string
+ * @{ @ingroup libimcv_imv
  */
 
 #ifndef IMV_REMEDIATION_STRING_H_
index f40402e..0684690 100644 (file)
@@ -16,7 +16,7 @@
 /**
  *
  * @defgroup imv_state_t imv_state
- * @{ @ingroup imv_state
+ * @{ @ingroup libimcv_imv
  */
 
 #ifndef IMV_STATE_H_
@@ -66,7 +66,7 @@ struct imv_state_t {
        /**
         * Set the maximum size of a PA-TNC message for this TNCCS connection
         *
-        * @max_msg_len                 maximum size of a PA-TNC message
+        * @param max_msg_len   maximum size of a PA-TNC message
         */
        void (*set_max_msg_len)(imv_state_t *this, u_int32_t max_msg_len);
 
index d7b0614..38469f0 100644 (file)
@@ -14,8 +14,8 @@
  */
 
 /**
- * @defgroup ita_attrt ita_attr
- * @{ @ingroup ita_attr
+ * @defgroup ita_attr ita_attr
+ * @{ @ingroup libimcv
  */
 
 #ifndef ITA_ATTR_H_
index c392f79..d42e711 100644 (file)
@@ -14,8 +14,8 @@
  */
 
 /**
- * @defgroup ita_attr_angelt ita_attr_angel
- * @{ @ingroup ita_attr_angel
+ * @defgroup ita_attr_angel ita_attr_angel
+ * @{ @ingroup ita_attr
  */
 
 #ifndef ITA_ATTR_ANGEL_H_
index 3723551..3926c38 100644 (file)
@@ -14,8 +14,8 @@
  */
 
 /**
- * @defgroup ita_attr_commandt ita_attr_command
- * @{ @ingroup ita_attr_command
+ * @defgroup ita_attr_command ita_attr_command
+ * @{ @ingroup ita_attr
  */
 
 #ifndef ITA_ATTR_COMMAND_H_
@@ -54,7 +54,7 @@ pa_tnc_attr_t* ita_attr_command_create(char *command);
 /**
  * Creates an ita_attr_command_t object from received data
  *
- * @param command                      ITA command string
+ * @param value                                binary value blob
  */
 pa_tnc_attr_t* ita_attr_command_create_from_data(chunk_t value);
 
index afd543b..1f85ece 100644 (file)
@@ -14,8 +14,8 @@
  */
 
 /**
- * @defgroup ita_attr_dummyt ita_attr_dummy
- * @{ @ingroup ita_attr_dummy
+ * @defgroup ita_attr_dummy ita_attr_dummy
+ * @{ @ingroup ita_attr
  */
 
 #ifndef ITA_ATTR_DUMMY_H_
@@ -47,14 +47,14 @@ struct ita_attr_dummy_t {
 /**
  * Creates an ita_attr_dummy_t object with a given size
  *
- * @param size                         size of dummy attribute value 
+ * @param size                         size of dummy attribute value
  */
 pa_tnc_attr_t* ita_attr_dummy_create(int size);
 
 /**
  * Creates an ita_attr_dummy_t object from received data
  *
- * @param command                      ITA command string
+ * @param value                                binary value blob
  */
 pa_tnc_attr_t* ita_attr_dummy_create_from_data(chunk_t value);
 
index cc5c181..55306ec 100644 (file)
@@ -14,8 +14,8 @@
  */
 
 /**
- * @defgroup ita_attr_get_settingst ita_attr_get_settings
- * @{ @ingroup ita_attr_get_settings
+ * @defgroup ita_attr_get_settings ita_attr_get_settings
+ * @{ @ingroup ita_attr
  */
 
 #ifndef ITA_ATTR_GET_SETTINGS_H_
index f3d1fd4..eb7eeda 100644 (file)
@@ -14,8 +14,8 @@
  */
 
 /**
- * @defgroup ita_attr_settingst ita_attr_settings
- * @{ @ingroup ita_attr_settings
+ * @defgroup ita_attr_settings ita_attr_settings
+ * @{ @ingroup ita_attr
  */
 
 #ifndef ITA_ATTR_SETTINGS_H_
index 9abdba7..e2ce06e 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup pa_tnc_attr pa_tnc_attr
- * @{ @ingroup libimcv
+ * @{ @ingroup pa_tnc
  */
 
 #ifndef PA_TNC_ATTR_H_
index 40c3ab3..121be7f 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup pa_tnc_attr_manager pa_tnc_attr_manager
- * @{ @ingroup libimcv
+ * @{ @ingroup pa_tnc
  */
 
 #ifndef PA_TNC_ATTR_MANAGER_H_
@@ -56,7 +56,7 @@ struct pa_tnc_attr_manager_t {
         * Return the PA-TNC attribute names for a given vendor ID
         *
         * @param vendor_id             Private Enterprise Number (PEN)
-        * @return                              PA-TNC attribute names if found, NULL else
+        * @return                              PA-TNC attribute names if found, NULL else
         */
        enum_name_t* (*get_names)(pa_tnc_attr_manager_t *this, pen_t vendor_id);
 
@@ -66,7 +66,7 @@ struct pa_tnc_attr_manager_t {
         * @param vendor_id             Private Enterprise Number (PEN)
         * @param type                  PA-TNC attribute type
         * @param value                 PA-TNC attribute value as encoded data
-        * @return                              PA-TNC attribute object if supported, NULL else
+        * @return                              PA-TNC attribute object if supported, NULL else
         */
        pa_tnc_attr_t* (*create)(pa_tnc_attr_manager_t *this, pen_t vendor_id,
                                                         u_int32_t type, chunk_t value);
index 332f250..218d3d6 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup pa_tnc_msg pa_tnc_msg
- * @{ @ingroup libimcv
+ * @{ @ingroup pa_tnc
  */
 
 #ifndef PA_TNC_MSG_H_
index 1fe2317..366e2b6 100644 (file)
  */
 
 /**
+ * @defgroup imc_os imc_os
+ * @ingroup libimcv_plugins
  *
  * @defgroup imc_os_state_t imc_os_state
- * @{ @ingroup imc_os_state
+ * @{ @ingroup imc_os
  */
 
 #ifndef IMC_OS_STATE_H_
index 76aa416..3b40575 100644 (file)
  */
 
 /**
+ * @defgroup imc_scanner imc_scanner
+ * @ingroup libimcv_plugins
  *
  * @defgroup imc_scanner_state_t imc_scanner_state
- * @{ @ingroup imc_scanner_state
+ * @{ @ingroup imc_scanner
  */
 
 #ifndef IMC_SCANNER_STATE_H_
index 402fd14..5f9ee25 100644 (file)
  */
 
 /**
+ * @defgroup imc_test imc_test
+ * @ingroup libimcv_plugins
  *
  * @defgroup imc_test_state_t imc_test_state
- * @{ @ingroup imc_test_state
+ * @{ @ingroup imc_test
  */
 
 #ifndef IMC_TEST_STATE_H_
index 9ce748f..b5e1b65 100644 (file)
@@ -14,9 +14,8 @@
  */
 
 /**
- *
  * @defgroup imv_os_database_t imv_os_database
- * @{ @ingroup imv_os_database
+ * @{ @ingroup imv_os
  */
 
 #ifndef IMV_OS_DATABASE_H_
index d3e3191..1c2adea 100644 (file)
  */
 
 /**
+ * @defgroup imv_os imv_os
+ * @ingroup libimcv_plugins
  *
  * @defgroup imv_os_state_t imv_os_state
- * @{ @ingroup imv_os_state
+ * @{ @ingroup imv_os
  */
 
 #ifndef IMV_OS_STATE_H_
@@ -61,7 +63,7 @@ struct imv_os_state_t {
         * @param type                  OS type (enumerated)
         * @param name                  OS name (string)
         * @param version               OS version
-        * @return                              OS name & version as a concatenated string 
+        * @return                              OS name & version as a concatenated string
         */
        char* (*get_info)(imv_os_state_t *this, os_type_t *os_type,
                                          chunk_t *name, chunk_t *version);
index 9a09303..a15eb07 100644 (file)
  */
 
 /**
+ * @defgroup imv_scanner imv_scanner
+ * @ingroup libimcv_plugins
  *
  * @defgroup imv_scanner_state_t imv_scanner_state
- * @{ @ingroup imv_scanner_state
+ * @{ @ingroup imv_scanner
  */
 
 #ifndef IMV_SCANNER_STATE_H_
index af78d14..2de5b6f 100644 (file)
  */
 
 /**
+ * @defgroup imv_test imv_test
+ * @ingroup libimcv_plugins
  *
  * @defgroup imv_test_state_t imv_test_state
- * @{ @ingroup imv_test_state
+ * @{ @ingroup imv_test
  */
 
 #ifndef IMV_TEST_STATE_H_
index 7b29597..0846aae 100644 (file)
@@ -15,7 +15,7 @@
 /**
  * @defgroup libpts libpts
  *
- * @defgroup iplugins plugins
+ * @defgroup libpts_plugins plugins
  * @ingroup libpts
  *
  * @addtogroup libpts
index 5ada104..a2f1b4e 100644 (file)
@@ -14,9 +14,8 @@
  */
 
 /**
- *
  * @defgroup imc_attestation_process_t imc_attestation_process
- * @{ @ingroup imc_attestation_process
+ * @{ @ingroup imc_attestation
  */
 
 #ifndef IMC_ATTESTATION_PROCESS_H_
index e4fca71..4b93931 100644 (file)
  */
 
 /**
+ * @defgroup imc_attestation imc_attestation
+ * @ingroup libpts_plugins
  *
  * @defgroup imc_attestation_state_t imc_attestation_state
- * @{ @ingroup imc_attestation_state
+ * @{ @ingroup imc_attestation
  */
 
 #ifndef IMC_ATTESTATION_STATE_H_
index e2297d0..a20023f 100644 (file)
@@ -14,9 +14,8 @@
  */
 
 /**
- *
  * @defgroup attest_db_t attest_db
- * @{ @ingroup attest_db
+ * @{ @ingroup libpts
  */
 
 #ifndef ATTEST_DB_H_
index 0fc10f0..108f6f9 100644 (file)
@@ -14,9 +14,8 @@
  */
 
 /**
- *
  * @defgroup imv_attestation_build_t imv_attestation_build
- * @{ @ingroup imv_attestation_build
+ * @{ @ingroup imv_attestation
  */
 
 #ifndef IMV_ATTESTATION_BUILD_H_
index 73b4251..74e4644 100644 (file)
@@ -14,9 +14,8 @@
  */
 
 /**
- *
  * @defgroup imv_attestation_process_t imv_attestation_process
- * @{ @ingroup imv_attestation_process
+ * @{ @ingroup imv_attestation
  */
 
 #ifndef IMV_ATTESTATION_PROCESS_H_
index f64314e..ab77d30 100644 (file)
  */
 
 /**
+ * @defgroup imv_attestation imv_attestation
+ * @ingroup libpts_plugins
  *
  * @defgroup imv_attestation_state_t imv_attestation_state
- * @{ @ingroup imv_attestation_state
+ * @{ @ingroup imv_attestation
  */
 
 #ifndef IMV_ATTESTATION_STATE_H_
@@ -73,7 +75,7 @@ struct imv_attestation_state_t {
         */
        imv_attestation_handshake_state_t (*get_handshake_state)(
                imv_attestation_state_t *this);
-       
+
        /**
         * Set state of the handshake
         *
@@ -133,7 +135,7 @@ struct imv_attestation_state_t {
        /**
         * Get a Functional Component with a given name
         *
-        * @param name                          Name of the requested Functional Component
+        * @param name                          Name of the requested Functional Component
         * @return                                      Functional Component if found, NULL otherwise
         */
        pts_component_t* (*get_component)(imv_attestation_state_t *this,
index a3ffa1b..90ad708 100644 (file)
@@ -95,7 +95,7 @@ struct pts_comp_func_name_t {
  *
  * @param vid                          PTS Component Functional Name Vendor ID
  * @param name                         PTS Component Functional Name
- * @param                                      PTS Component Functional Name Qualifier
+ * @param qualifier                    PTS Component Functional Name Qualifier
  */
 pts_comp_func_name_t* pts_comp_func_name_create(u_int32_t vid, u_int32_t name,
                                                                                                u_int8_t qualifier);
index 423a4c8..11154aa 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup pts pts
- * @{ @ingroup pts
+ * @{ @ingroup libpts
  */
 
 #ifndef PTS_H_
index 8664a4b..2aab902 100644 (file)
@@ -48,12 +48,12 @@ enum pts_dh_group_t {
  * Diffie-Hellman Group Values
  * see section 3.8.6 of PTS Protocol: Binding to TNC IF-M Specification
  *
- *                                        1
- *   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 
+ *                       1
+ *   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  *  |1|2|3|4|5|R|R|R|R|R|R|R|R|R|R|R|
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  
+ *
  */
 
 /**
@@ -90,8 +90,8 @@ bool pts_dh_group_update(char *dh_group, pts_dh_group_t *dh_groups);
  * @param offered_groups       set of offered DH groups
  * @return                                     selected DH group
  */
-pts_dh_group_t pts_dh_group_select(pts_dh_group_t supported_dh_groups,
-                                                                  pts_dh_group_t offered_dh_groups);
+pts_dh_group_t pts_dh_group_select(pts_dh_group_t supported_groups,
+                                                                  pts_dh_group_t offered_groups);
 
 /**
  * Convert pts_dh_group_t to diffie_hellman_group_t
index 71efd50..a13bb29 100644 (file)
@@ -57,7 +57,7 @@ struct pts_file_meas_t {
        /**
          * Create a PTS File Measurement enumerator
          *
-         * @return                             Enumerator returning filename and measurement 
+         * @return                             Enumerator returning filename and measurement
          */
        enumerator_t* (*create_enumerator)(pts_file_meas_t *this);
 
@@ -76,7 +76,7 @@ struct pts_file_meas_t {
         * Verify stored hashes against PTS File Measurements
         *
         * @param e_hash                Hash enumerator
-        * @paraem is_dir               TRUE for directory contents hashes
+        * @param is_dir                TRUE for directory contents hashes
         * @return                              TRUE if all hashes match a measurement
         */
        bool (*verify)(pts_file_meas_t *this, enumerator_t *e_hash, bool is_dir);
index 3c2d20b..ed6c976 100644 (file)
@@ -14,8 +14,8 @@
  */
 
 /**
- * @defgroup tcg_attrt tcg_attr
- * @{ @ingroup tcg_attr
+ * @defgroup tcg_attr tcg_attr
+ * @{ @ingroup libpts
  */
 
 #ifndef TCG_ATTR_H_
index 96e9058..758fd58 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup tcg_pts_attr_aik tcg_pts_attr_aik
- * @{ @ingroup tcg_pts_attr_aik
+ * @{ @ingroup tcg_attr
  */
 
 #ifndef TCG_PTS_ATTR_AIK_H_
@@ -38,7 +38,7 @@ struct tcg_pts_attr_aik_t {
         * Public PA-TNC attribute interface
         */
        pa_tnc_attr_t pa_tnc_attribute;
-       
+
        /**
         * Get AIK
         *
@@ -50,7 +50,7 @@ struct tcg_pts_attr_aik_t {
 
 /**
  * Creates an tcg_pts_attr_aik_t object
- * 
+ *
  * @param aik                          Attestation Identity Key
  */
 pa_tnc_attr_t* tcg_pts_attr_aik_create(certificate_t *aik);
index 7148065..57cb5a9 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup tcg_pts_attr_dh_nonce_finish tcg_pts_attr_dh_nonce_finish
- * @{ @ingroup tcg_pts_attr_dh_nonce_finish
+ * @{ @ingroup tcg_attr
  */
 
 #ifndef TCG_PTS_ATTR_DH_NONCE_FINISH_H_
@@ -64,7 +64,7 @@ struct tcg_pts_attr_dh_nonce_finish_t {
         * @return                              DH Initiator Nonce
         */
        chunk_t (*get_initiator_nonce)(tcg_pts_attr_dh_nonce_finish_t *this);
-       
+
 };
 
 /**
@@ -76,7 +76,7 @@ struct tcg_pts_attr_dh_nonce_finish_t {
  */
 pa_tnc_attr_t* tcg_pts_attr_dh_nonce_finish_create(
                                                                                pts_meas_algorithms_t hash_algo,
-                                                                               chunk_t initiator_value,
+                                                                               chunk_t initiator_value,
                                                                                chunk_t initiator_nonce);
 
 /**
index 1700771..22e1bd1 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup tcg_pts_attr_dh_nonce_params_req tcg_pts_attr_dh_nonce_params_req
- * @{ @ingroup tcg_pts_attr_dh_nonce_params_req
+ * @{ @ingroup tcg_attr
  */
 
 #ifndef TCG_PTS_ATTR_DH_NONCE_PARAMS_REQ_H_
index d2141f8..aaf85ef 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup tcg_pts_attr_dh_nonce_params_resp tcg_pts_attr_dh_nonce_params_resp
- * @{ @ingroup tcg_pts_attr_dh_nonce_params_resp
+ * @{ @ingroup tcg_attr
  */
 
 #ifndef TCG_PTS_ATTR_DH_NONCE_PARAMS_RESP_H_
@@ -67,7 +67,7 @@ struct tcg_pts_attr_dh_nonce_params_resp_t {
         * @return                              DH Responder Public Value
         */
        chunk_t (*get_responder_value)(tcg_pts_attr_dh_nonce_params_resp_t *this);
-       
+
 };
 
 /**
@@ -76,11 +76,11 @@ struct tcg_pts_attr_dh_nonce_params_resp_t {
  * @param dh_group                                     Selected DH group
  * @param hash_algo_set                                Set of supported hash algorithms
  * @param responder_nonce                      DH Responder Nonce
- * @param responder_pub_val                    DH Responder Public value
+ * @param responder_value                      DH Responder Public value
  */
 pa_tnc_attr_t* tcg_pts_attr_dh_nonce_params_resp_create(pts_dh_group_t dh_group,
                                                                                        pts_meas_algorithms_t hash_algo_set,
-                                                                                       chunk_t responder_nonce,
+                                                                                       chunk_t responder_nonce,
                                                                                        chunk_t responder_value);
 
 /**
index c432ba9..8d50cd9 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup tcg_pts_attr_file_meas tcg_pts_attr_file_meas
- * @{ @ingroup tcg_pts_attr_file_meas
+ * @{ @ingroup tcg_attr
  */
 
 #ifndef TCG_PTS_ATTR_FILE_MEAS_H_
@@ -38,19 +38,19 @@ struct tcg_pts_attr_file_meas_t {
         * Public PA-TNC attribute interface
         */
        pa_tnc_attr_t pa_tnc_attribute;
-       
+
        /**
         * Get PTS File Measurements
         *
         * @return                                      PTS File Measurements
         */
        pts_file_meas_t* (*get_measurements)(tcg_pts_attr_file_meas_t *this);
-       
+
 };
 
 /**
  * Creates an tcg_pts_attr_file_meas_t object
- * 
+ *
  * @param measurements                 PTS File Measurements
  */
 pa_tnc_attr_t* tcg_pts_attr_file_meas_create(pts_file_meas_t *measurements);
index 0a65f21..88f0704 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup tcg_pts_attr_gen_attest_evid tcg_pts_attr_gen_attest_evid
- * @{ @ingroup tcg_pts_attr_gen_attest_evid
+ * @{ @ingroup tcg_attr
  */
 
 #ifndef TCG_PTS_ATTR_GEN_ATTEST_EVID_H_
index e5c74b4..aca890a 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup tcg_pts_attr_get_aik tcg_pts_attr_get_aik
- * @{ @ingroup tcg_pts_attr_get_aik
+ * @{ @ingroup tcg_attr
  */
 
 #ifndef TCG_PTS_ATTR_GET_AIK_H_
index 1b69340..3600496 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup tcg_pts_attr_get_tpm_version_info tcg_pts_attr_get_tpm_version_info
- * @{ @ingroup tcg_pts_attr_get_tpm_version_info
+ * @{ @ingroup tcg_attr
  */
 
 #ifndef TCG_PTS_ATTR_GET_TPM_VERSION_INFO_H_
index 885e2c1..758100b 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup tcg_pts_attr_meas_algo tcg_pts_attr_meas_algo
- * @{ @ingroup tcg_pts_attr_meas_algo
+ * @{ @ingroup tcg_attr
  */
 
 #ifndef TCG_PTS_ATTR_MEAS_ALGO_H_
index 15cfbc7..cc59f4e 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup tcg_pts_attr_proto_caps tcg_pts_attr_proto_caps
- * @{ @ingroup tcg_pts_attr_proto_caps
+ * @{ @ingroup tcg_attr
  */
 
 #ifndef TCG_PTS_ATTR_PROTO_CAPS_H_
index 19d189e..85a6b9a 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup tcg_pts_attr_req_file_meas tcg_pts_attr_req_file_meas
- * @{ @ingroup tcg_pts_attr_req_file_meas
+ * @{ @ingroup tcg_attr
  */
 
 #ifndef TCG_PTS_ATTR_REQ_FILE_MEAS_H_
@@ -36,7 +36,7 @@ struct tcg_pts_attr_req_file_meas_t {
         * Public PA-TNC attribute interface
         */
        pa_tnc_attr_t pa_tnc_attribute;
-       
+
        /**
         * Get flag for PTS Request File Measurement
         *
@@ -50,7 +50,6 @@ struct tcg_pts_attr_req_file_meas_t {
         * @return                              Request ID
         */
        u_int16_t (*get_request_id)(tcg_pts_attr_req_file_meas_t *this);
-       
 
        /**
         * Get Delimiter
@@ -58,19 +57,19 @@ struct tcg_pts_attr_req_file_meas_t {
         * @return                              UTF-8 encoding of a Delimiter Character
         */
        u_int32_t (*get_delimiter)(tcg_pts_attr_req_file_meas_t *this);
-       
+
        /**
         * Get Fully Qualified File Pathname
         *
         * @return                              Pathname
         */
        char* (*get_pathname)(tcg_pts_attr_req_file_meas_t *this);
-       
+
 };
 
 /**
  * Creates an tcg_pts_attr_req_file_meas_t object
- * 
+ *
  * @param directory_flag       Directory Contents Flag
  * @param request_id           Request ID
  * @param delimiter                    Delimiter Character
index 7620c50..311418b 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup tcg_pts_attr_req_file_meta tcg_pts_attr_req_file_meta
- * @{ @ingroup tcg_pts_attr_req_file_meta
+ * @{ @ingroup tcg_attr
  */
 
 #ifndef TCG_PTS_ATTR_REQ_FILE_META_H_
@@ -36,7 +36,7 @@ struct tcg_pts_attr_req_file_meta_t {
         * Public PA-TNC attribute interface
         */
        pa_tnc_attr_t pa_tnc_attribute;
-       
+
        /**
         * Get directory flag for PTS Request File Metadata
         *
@@ -50,19 +50,19 @@ struct tcg_pts_attr_req_file_meta_t {
         * @return                              UTF-8 encoding of a Delimiter Character
         */
        u_int8_t (*get_delimiter)(tcg_pts_attr_req_file_meta_t *this);
-       
+
        /**
         * Get Fully Qualified File Pathname
         *
         * @return                              Pathname
         */
        char* (*get_pathname)(tcg_pts_attr_req_file_meta_t *this);
-       
+
 };
 
 /**
  * Creates an tcg_pts_attr_req_file_meta_t object
- * 
+ *
  * @param directory_flag       Directory Contents Flag
  * @param delimiter                    Delimiter Character
  * @param pathname                     File Pathname
index 031955a..749413c 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup tcg_pts_attr_req_func_comp_evid tcg_pts_attr_req_func_comp_evid
- * @{ @ingroup tcg_pts_attr_req_func_comp_evid
+ * @{ @ingroup tcg_attr
  */
 
 #ifndef TCG_PTS_ATTR_REQ_FUNC_COMP_EVID_H_
@@ -37,7 +37,7 @@ struct tcg_pts_attr_req_func_comp_evid_t {
         * Public PA-TNC attribute interface
         */
        pa_tnc_attr_t pa_tnc_attribute;
-       
+
        /**
         * Add a component to the Functional Component Evidence Request
         *
@@ -62,7 +62,7 @@ struct tcg_pts_attr_req_func_comp_evid_t {
         * @return                                      Entry enumerator
         */
        enumerator_t* (*create_enumerator)(tcg_pts_attr_req_func_comp_evid_t *this);
-       
+
 };
 
 /**
index 3a80904..4944182 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup tcg_pts_attr_simple_comp_evid tcg_pts_attr_simple_comp_evid
- * @{ @ingroup tcg_pts_attr_simple_comp_evid
+ * @{ @ingroup tcg_attr
  */
 
 #ifndef TCG_PTS_ATTR_SIMPLE_COMP_EVID_H_
@@ -24,7 +24,7 @@
 typedef struct tcg_pts_attr_simple_comp_evid_t tcg_pts_attr_simple_comp_evid_t;
 
 #include "tcg_attr.h"
-#include "pts/components/pts_comp_evidence.h" 
+#include "pts/components/pts_comp_evidence.h"
 #include "pa_tnc/pa_tnc_attr.h"
 
 /**
@@ -44,12 +44,12 @@ struct tcg_pts_attr_simple_comp_evid_t {
         * @return                                      Component Evidence
         */
        pts_comp_evidence_t* (*get_comp_evidence)(tcg_pts_attr_simple_comp_evid_t *this);
-       
+
 };
 
 /**
  * Creates an tcg_pts_attr_simple_comp_evid_t object
- * 
+ *
  * @param evid                                 Component Evidence
  */
 pa_tnc_attr_t* tcg_pts_attr_simple_comp_evid_create(pts_comp_evidence_t *evid);
index 3d98bfc..6778afb 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup tcg_pts_attr_simple_evid_final tcg_pts_attr_simple_evid_final
- * @{ @ingroup tcg_pts_attr_simple_evid_final
+ * @{ @ingroup tcg_attr
  */
 
 #ifndef TCG_PTS_ATTR_SIMPLE_EVID_FINAL_H_
@@ -44,27 +44,29 @@ struct tcg_pts_attr_simple_evid_final_t {
         * @param comp_hash_algo        Optional Composite Hash Algorithm
         * @param pcr_comp                      Optional PCR Composite
         * @param tpm_quote sig         Optional TPM Quote Signature
-        * @return                                      PTS_SIMPLE_EVID_FINAL flags             
+        * @return                                      PTS_SIMPLE_EVID_FINAL flags
         */
        u_int8_t (*get_quote_info)(tcg_pts_attr_simple_evid_final_t *this,
                                                           pts_meas_algorithms_t *comp_hash_algo,
                                                           chunk_t *pcr_comp, chunk_t *tpm_quote_sig);
-       
+
        /**
         * Get Optional Evidence Signature
         *
-        * @evid_sig                            Optional Evidence Signature
+        * @param evid_sig                      Optional Evidence Signature
         * @return                                      TRUE if Evidence Signature is available
         */
-       bool (*get_evid_sig)(tcg_pts_attr_simple_evid_final_t *this, chunk_t *evid_sig);
+       bool (*get_evid_sig)(tcg_pts_attr_simple_evid_final_t *this,
+                                                chunk_t *evid_sig);
 
        /**
         * Set Optional Evidence Signature
         *
-        * @evid_sig                            Optional Evidence Signature
+        * @param vid_sig                       Optional Evidence Signature
         */
-       void (*set_evid_sig)(tcg_pts_attr_simple_evid_final_t *this, chunk_t evid_sig);
-       
+       void (*set_evid_sig)(tcg_pts_attr_simple_evid_final_t *this,
+                                                chunk_t evid_sig);
+
 };
 
 /**
index 2c12bb0..4ac18fb 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup tcg_pts_attr_tpm_version_info tcg_pts_attr_tpm_version_info
- * @{ @ingroup tcg_pts_attr_tpm_version_info
+ * @{ @ingroup tcg_attr
  */
 
 #ifndef TCG_PTS_ATTR_TPM_VERSION_INFO_H_
@@ -36,7 +36,7 @@ struct tcg_pts_attr_tpm_version_info_t {
         * Public PA-TNC attribute interface
         */
        pa_tnc_attr_t pa_tnc_attribute;
-       
+
        /**
         * Get TPM Version Info
         *
@@ -55,7 +55,7 @@ struct tcg_pts_attr_tpm_version_info_t {
 
 /**
  * Creates an tcg_pts_attr_tpm_version_info_t object
- * 
+ *
  * @param tpm_version_info             TPM version info
  */
 pa_tnc_attr_t* tcg_pts_attr_tpm_version_info_create(chunk_t tpm_version_info);
index 8a594ea..ad9794b 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup tcg_pts_attr_unix_file_meta tcg_pts_attr_unix_file_meta
- * @{ @ingroup tcg_pts_attr_unix_file_meta
+ * @{ @ingroup tcg_attr
  */
 
 #ifndef TCG_PTS_ATTR_UNIX_FILE_META_H_
@@ -38,19 +38,19 @@ struct tcg_pts_attr_file_meta_t {
         * Public PA-TNC attribute interface
         */
        pa_tnc_attr_t pa_tnc_attribute;
-       
+
        /**
         * Get PTS File Metadata
         *
         * @return                                      PTS File Metadata
         */
        pts_file_meta_t* (*get_metadata)(tcg_pts_attr_file_meta_t *this);
-       
+
 };
 
 /**
  * Creates an tcg_pts_attr_file_meta_t object
- * 
+ *
  * @param metadata                     PTS File Metadata
  */
 pa_tnc_attr_t* tcg_pts_attr_unix_file_meta_create(pts_file_meta_t *metadata);
index 8b24225..e9e8cfb 100644 (file)
@@ -15,7 +15,9 @@
 
 /**
  * @defgroup pt_tls pt_tls
- * @{ @ingroup pt_tls
+ *
+ * @addtogroup pt_tls
+ * @{
  */
 
 #ifndef PT_TLS_H_
index f9c57c5..18ec581 100644 (file)
@@ -280,11 +280,6 @@ struct radius_message_t {
 };
 
 /**
- * Dummy libradius initialization function needed for integrity test
- */
-void libradius_init(void);
-
-/**
  * Create an empty RADIUS message.
  *
  * @param code                 request type
@@ -300,4 +295,13 @@ radius_message_t *radius_message_create(radius_message_code_t code);
  */
 radius_message_t *radius_message_parse(chunk_t data);
 
+/**
+ * @}
+ * @addtogroup libradius
+ * @{
+ *
+ * Dummy libradius initialization function needed for integrity test
+ */
+void libradius_init(void);
+
 #endif /** RADIUS_MESSAGE_H_ @}*/
index 810cb06..bdd5029 100644 (file)
@@ -279,11 +279,6 @@ struct simaka_manager_t {
 };
 
 /**
- * Dummy libsimaka initialization function needed for integrity test
- */
-void libsimaka_init(void);
-
-/**
  * Create an SIM/AKA manager to handle multiple (U)SIM cards/providers.
  *
  * @return                     simaka_t object
@@ -312,4 +307,13 @@ typedef void* (*simaka_manager_register_cb_t)(plugin_t *plugin);
 bool simaka_manager_register(plugin_t *plugin, plugin_feature_t *feature,
                                                         bool reg, void *data);
 
+/**
+ * @}
+ * @addtogroup libsimaka
+ * @{
+ *
+ * Dummy libsimaka initialization function needed for integrity test
+ */
+void libsimaka_init(void);
+
 #endif /** SIMAKA_MANAGER_H_ @}*/
index 698d293..1272603 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup dnskey_encoder dnskey_encoder
- * @{ @ingroup dnskey
+ * @{ @ingroup dnskey_p
  */
 
 #ifndef DNSKEY_ENCODER_H_
index d63ead0..c82f39d 100644 (file)
@@ -41,11 +41,11 @@ struct unbound_response_t {
 /**
  * Create an unbound_response instance from a response of the unbound library.
  *
- * @param              a response of the unbound library
- * @return             an unbound_response conforming to the resolver_response
- *                             interface, or NULL on failure
+ * @param      response        a response of the unbound library
+ * @return                             an unbound_response conforming to the resolver_response
+ *                                             interface, or NULL on failure
  */
 unbound_response_t *unbound_response_create_frm_libub_response(
-                                                                                       struct ub_result *libub_response);
+                                                                                                       struct ub_result *response);
 
 #endif /** UNBOUND_RESPONSE_H_ @}*/
index 41e669f..8489d9d 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup auth_controller auth_controller
- * @{ @ingroup controller
+ * @{ @ingroup manager_controller
  */
 
 #ifndef AUTH_CONTROLLER_H_
index 07cafd4..a84678c 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup config_controller config_controller
- * @{ @ingroup controller
+ * @{ @ingroup manager_controller
  */
 
 #ifndef CONFIG_CONTROLLER_H_
index c9bc1e4..22e3a70 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup control_controller control_controller
- * @{ @ingroup controller
+ * @{ @ingroup manager_controller
  */
 
 #ifndef CONTROL_CONTROLLER_H_
index 7d77bdc..a099929 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup gateway_controller gateway_controller
- * @{ @ingroup controller
+ * @{ @ingroup manager_controller
  */
 
 #ifndef GATEWAY_CONTROLLER_H_
index 3f67796..72f8242 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup ikesa_controller ikesa_controller
- * @{ @ingroup controller
+ * @{ @ingroup manager_controller
  */
 
 #ifndef IKESA_CONTROLLER_H_
index f762083..a72801f 100644 (file)
@@ -16,7 +16,7 @@
 /**
  * @defgroup manager manager
  *
- * @defgroup controller controller
+ * @defgroup manager_controller controller
  * @ingroup manager
  *
  * @defgroup manager_i manager
index f25c302..b5a5e0b 100644 (file)
@@ -16,7 +16,7 @@
 
 /**
  * @defgroup peer_controller_server peer_controller
- * @{ @ingroup controller_server
+ * @{ @ingroup medsrv
  */
 
 #ifndef PEER_CONTROLLER_H_
@@ -45,4 +45,4 @@ struct peer_controller_t {
  */
 controller_t *peer_controller_create(user_t *user, database_t *db);
 
-#endif /* PEER_CONTROLLER_H_ @} */
+#endif /** PEER_CONTROLLER_H_ @}*/
index 9d23795..540dc74 100644 (file)
@@ -16,7 +16,7 @@
 
 /**
  * @defgroup user_controller_server user_controller
- * @{ @ingroup controller_server
+ * @{ @ingroup medsrv
  */
 
 #ifndef USER_CONTROLLER_H_
@@ -45,4 +45,4 @@ struct user_controller_t {
  */
 controller_t *user_controller_create(user_t *user, database_t *db);
 
-#endif /* USER_CONTROLLER_H_ @} */
+#endif /** USER_CONTROLLER_H_ @}*/
index c46de40..beae279 100644 (file)
@@ -16,7 +16,7 @@
 
 /**
  * @defgroup auth_filter_server auth_filter
- * @{ @ingroup filter_server
+ * @{ @ingroup medsrv
  */
 
 #ifndef AUTH_FILTER_H_
@@ -45,4 +45,4 @@ struct auth_filter_t {
  */
 filter_t *auth_filter_create(user_t *user, database_t *db);
 
-#endif /* AUTH_FILTER_H_  @}*/
+#endif /** AUTH_FILTER_H_  @}*/
index f14650f..beeed6e 100644 (file)
  * for more details.
  */
 
+/**
+ * @defgroup medsrv medsrv
+ *
+ * @defgroup user user
+ * @{ @ingroup medsrv
+ */
+
 #ifndef USER_H_
 #define USER_H_
 
@@ -47,4 +54,4 @@ struct user_t {
  */
 user_t *user_create(void *param);
 
-#endif /* USER_H_ @} */
+#endif /** USER_H_ @} */
index a6f8bc7..1a884fb 100644 (file)
@@ -92,4 +92,4 @@ int command_dispatch(int argc, char *argv[]);
  */
 int command_usage(char *error);
 
-#endif /* COMMAND_H_ @}*/
+#endif /** COMMAND_H_ @}*/
index f72b180..09c50c6 100644 (file)
@@ -15,7 +15,9 @@
 
 /**
  * @defgroup pki pki
- * @{ @ingroup pki
+ *
+ * @addtogroup pki
+ * @{
  */
 
 #ifndef PKI_H_