Committer: Miika Komu <miika@xxxxxx> Date: Thu Feb 11 19:21:17 2010 +0200 Revision: 3611 Revision-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: trunk Log: Unified all doxygen comment tokens. One star instead of two. Modified: M agent/agent.c M agent/connhipd.c M agent/gui_interface.c M agent/hitdb.c M agent/language.c M agent/str_var.c M agent/tools.c M doc/doxygen.h M firewall/cache.c M firewall/conntrack.c M firewall/datapkt.c M firewall/dlist.c M firewall/esp_prot_config.c M firewall/firewall.c M firewall/firewall_control.c M firewall/firewalldb.c M firewall/helpers.c M firewall/proxyconndb.c M firewall/user_ipsec_api.c M firewall/user_ipsec_api.h M firewall/user_ipsec_esp.c M firewall/user_ipsec_esp.h M firewall/user_ipsec_fw_msg.c M firewall/user_ipsec_fw_msg.h M firewall/user_ipsec_sadb.c M hipd/cert.c M hipd/cert.h M hipd/dht.c M hipd/esp_prot_hipd_msg.c M hipd/esp_prot_light_update.c M hipd/hipd.c M hipd/hit_to_ip.c M hipd/hit_to_ip.h M hipd/init.c M hipd/nsupdate.c M hipd/nsupdate.h M hipd/user_ipsec_hipd_msg.c M hipd/user_ipsec_hipd_msg.h M hipd/user_ipsec_sadb_api.c M hipd/user_ipsec_sadb_api.h M lib/core/builder.c M lib/core/certtools.c M lib/core/certtools.h M lib/core/state.h M lib/dht/libhipdht.c M lib/gui/create.c M lib/gui/dragndrop.c M lib/gui/events.c M lib/gui/hipgui.c M lib/gui/tools.c M lib/gui/widgets.c M test/certteststub.c === modified file 'agent/agent.c' --- agent/agent.c 2010-02-10 20:46:32 +0000 +++ agent/agent.c 2010-02-11 17:21:17 +0000 @@ -12,7 +12,7 @@ * @author: Samu Varjonen <samu.varjonen@xxxxxxx> * * @note: HIPU: use --disable-agent to get rid of the gtk and gthread dependencies - **/ + */ #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ @@ -57,7 +57,7 @@ * * @param signum signal number * @return void - **/ + */ static void sig_catch_int(int signum) { static int force_exit = 0; @@ -95,7 +95,7 @@ * * @param signum signal number * @return void - **/ + */ static void sig_catch_chld(int signum) { union wait status; @@ -115,7 +115,7 @@ * * @param signum signal number * @return void - **/ + */ static void sig_catch_term(int signum) { signal(signum, sig_catch_tstp); @@ -144,7 +144,7 @@ * @param argc number of commandline parameters * @param argv[] table containing the commandline parameters * @return negative on error - **/ + */ int main(int argc, char *argv[]) { extern char *optarg; === modified file 'agent/connhipd.c' --- agent/connhipd.c 2010-02-10 20:46:32 +0000 +++ agent/connhipd.c 2010-02-11 17:21:17 +0000 @@ -11,7 +11,7 @@ * @brief Everything needed for the agent to communicate with the hipd * * @author Antti Partanen <aehparta@xxxxxxxxx> - **/ + */ #include <sys/un.h> #include <pthread.h> @@ -50,7 +50,7 @@ * function binds and also connects to the IPv6 datagram socket using HIP_AGENT_PORT. * * @return 0 on success, -1 on errors - **/ + */ int connhipd_init_sock(void) { int err = 0; @@ -114,7 +114,7 @@ * @param msg pointer containing the msg * @param addr * @return - **/ + */ static int connhipd_handle_msg(struct hip_common *msg, struct sockaddr_un *addr) { @@ -257,7 +257,7 @@ * * @param data is the msg that will be sent to the hipd as the keep alive check msg * @return void - **/ + */ static void *connhipd_thread(void *data) { int err = 0, n, len, max_fd; @@ -365,7 +365,7 @@ * ping keep alives * * @return 0 on success, -1 on errro - **/ + */ int connhipd_run_thread(void) { int err = 0; @@ -398,7 +398,7 @@ * @return void * * @note Function agent_exit() should be called before calling this. - **/ + */ void connhipd_quit(void) { if (!hip_agent_thread_started) { === modified file 'agent/gui_interface.c' --- agent/gui_interface.c 2010-02-10 20:46:32 +0000 +++ agent/gui_interface.c 2010-02-11 17:21:17 +0000 @@ -11,7 +11,7 @@ * @brief Functionality that checks the HIT and prompts the user if the HIT is unknown. * * @author Antti Partanen <aehparta@xxxxxxxxx> - **/ + */ #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -30,7 +30,7 @@ * @param hit Pointer to hit that should be accepted * @param inout Decides if this is input or output @see gui_hit_remote_ask * @return 0 if accept, -1 on other cases - **/ + */ int check_hit(HIT_Remote *hit, int inout) { HIT_Remote *fhit; === modified file 'agent/hitdb.c' --- agent/hitdb.c 2010-02-10 20:46:32 +0000 +++ agent/hitdb.c 2010-02-11 17:21:17 +0000 @@ -11,7 +11,7 @@ * * @author Antti Partanen <aehparta@xxxxxxxxx> * @author Samu Varjonen <samu.varjonen@xxxxxxx> - **/ + */ #include <stdlib.h> #include <errno.h> #include <string.h> @@ -215,7 +215,7 @@ * @return 0 on success, -1 on errors * * @note This function must be called before using database at all. - **/ + */ int hit_db_init(char *file) { int err = 0; @@ -239,7 +239,7 @@ * @return void * * @note This function must be called when closing application and stopping using database. - **/ + */ void hit_db_quit(void) { int err = 0; @@ -255,7 +255,7 @@ * hit_db_clear - Frees memory used by the agents db in memory * * @return void - **/ + */ static void hit_db_clear(void) { HIT_Remote *r1, *r2; @@ -306,7 +306,7 @@ * @return pointer to HIT_Remote * * @note This is a wrapper for hit_db_add for using HIT_Remote struct @see hit_db_add - **/ + */ HIT_Remote *hit_db_add_hit(HIT_Remote *hit, int nolock) { return hit_db_add(hit->name, &hit->hit, hit->url, hit->port, hit->g, nolock); @@ -404,7 +404,7 @@ * @param n Name of remote HIT to be removed. * * @return 0 if HIT removed, -1 on errors. - **/ + */ int hit_db_del(char *n) { HIT_Remote *r1 = NULL, *r2 = NULL; @@ -481,7 +481,7 @@ * @param hit HIT to be searched. * * @return Pointer to HIT found, or NULL if none found. - **/ + */ HIT_Remote *hit_db_find(char *name, struct in6_addr *hit) { HIT_Remote *r; @@ -516,7 +516,7 @@ * @param file Filename for saving database. * * @return 0 on success, -1 on errors. - **/ + */ static int hit_db_load_from_file(char *file) { FILE *db_file = NULL; @@ -562,7 +562,7 @@ * @param buf String containing HIT information. * * @return 0 on success, -1 on errors. - **/ + */ static int hit_db_parse_hit(char *buf) { HIT_Remote item; @@ -590,7 +590,7 @@ * * @param buf String containing remote group information. * @return 0 on success, -1 on errors. - **/ + */ static int hit_db_parse_rgroup(char *buf) { HIT_Local *l; @@ -622,7 +622,7 @@ * @param buf String containing local HIT information. * * @return 0 on success, -1 on errors. - **/ + */ static int hit_db_parse_local(char *buf) { int err = 0, n; @@ -651,7 +651,7 @@ * to old one. Returns NULL on errors. * @note The lightweight parameter is a place marker for Lightweight HIP not * used at the moment, for now use zero. - **/ + */ HIT_Group *hit_db_add_rgroup(char *name, HIT_Local *lhit, int accept, int lightweight) { @@ -714,7 +714,7 @@ * @param name of the group to be removed * * @return @return 0 on success, -1 on errors. - **/ + */ int hit_db_del_rgroup(char *name) { HIT_Group *g, *g2; @@ -770,7 +770,7 @@ * @param name Name of remote group to be searched. * * @return Pointer to group found, or NULL if none found. - **/ + */ HIT_Group *hit_db_find_rgroup(const char *name) { HIT_Group *g; @@ -796,7 +796,7 @@ * to old one. Returns NULL on errors. * * @note Notice that this function doesn't lock the database! - **/ + */ HIT_Local *hit_db_add_local(char *name, struct in6_addr *hit) { HIT_Local *h, *err = NULL; @@ -859,7 +859,7 @@ * @param hit HIT to be searched. * * @return Pointer to HIT found, or NULL if none found. - **/ + */ HIT_Local *hit_db_find_local(char *name, struct in6_addr *hit) { HIT_Local *h; @@ -896,7 +896,7 @@ * enumeration should be stopped. * * @return Number of HITs enumerated. - **/ + */ int hit_db_enum_locals(int (*f)(HIT_Local *)) { /* Variables. */ === modified file 'agent/language.c' --- agent/language.c 2010-02-10 20:46:32 +0000 +++ agent/language.c 2010-02-11 17:21:17 +0000 @@ -9,7 +9,7 @@ * @brief Functionality to change language of the GUI * * @author Antti Partanen <aehparta@xxxxxxxxx> - **/ + */ #include "language.h" /* Languages. */ #include "lang_english.h" @@ -25,7 +25,7 @@ * @param *lang_file From what file the language is loaded from * * @return 0 on success, -1 on error - **/ + */ int lang_init(const char *lang, const char *lang_file) { int err = 0, i; @@ -60,7 +60,7 @@ * @param name Name of the string to be fetched. * * @return Pointer to the string in the initialized language - **/ + */ char *lang_get(const char *name) { return str_var_get(name); === modified file 'agent/str_var.c' --- agent/str_var.c 2010-02-10 20:46:32 +0000 +++ agent/str_var.c 2010-02-11 17:21:17 +0000 @@ -9,7 +9,7 @@ * @brief Functions to load the language files to memory * * @author Antti Partanen <aehparta@xxxxxxxxx> - **/ + */ #include "str_var.h" #include <stdlib.h> @@ -62,7 +62,7 @@ * str_var_init - Initialize data strings linked list. * * @return always zero - **/ + */ int str_var_init(void) { int err = 0; @@ -78,7 +78,7 @@ * str_var_quit - Deinitalize (frees) data strings linked list. * * @return void - **/ + */ void str_var_quit(void) { StringData *st = str_data; @@ -101,7 +101,7 @@ * @param string String in the language initialized * @param ... * @return void - **/ + */ void str_var_set(const char *name, const char *string, ...) { StringData *st; @@ -141,7 +141,7 @@ * * @return Pointer to data string, or pointer to "" (empty string), if * no such data exists. - **/ + */ char *str_var_get(const char *name) { StringData *st; @@ -160,7 +160,7 @@ * @param name Name of data string to get. * * @return Pointer to data string struct, or NULL. - **/ + */ StringData *str_var_find(const char *name) { StringData *st = str_data; @@ -182,7 +182,7 @@ * @param value Value to be compared against. * *@return 1 if value is same, 0 if not. - **/ + */ int str_var_is(const char *name, const char *value) { StringData *st; @@ -203,7 +203,7 @@ * @param name Name of data string to get. * * @return 0 if variable is non-empty string, 1 if it is empty. - **/ + */ int str_var_empty(const char *name) { StringData *st; === modified file 'agent/tools.c' --- agent/tools.c 2010-02-10 20:46:32 +0000 +++ agent/tools.c 2010-02-11 17:21:17 +0000 @@ -9,7 +9,7 @@ * @brief Tools functions for reading configure files and parsing them * * @author Antti Partanen <aehparta@xxxxxxxxx> - **/ + */ #include "tools.h" #include <stdlib.h> @@ -29,7 +29,7 @@ * agent_exit - Stop and exit agent. * * @return void - **/ + */ void agent_exit(void) { agent_exec_state = 0; @@ -42,7 +42,7 @@ * @param hit HIT that will be printed * * @return void - **/ + */ void print_hit_to_buffer(char *buffer, struct in6_addr *hit) { int n, b; @@ -68,7 +68,7 @@ * @param buffer Buffer to read from * * @return 0 on success, -1 on invalid HIT in input buffer. - **/ + */ int read_hit_from_buffer(struct in6_addr *hit, char *buffer) { int n, i, err = 0; @@ -105,7 +105,7 @@ * @param file Config file to read * * @return 0 on success, -1 on errors. - **/ + */ int config_read(const char *file) { FILE *f; === modified file 'doc/doxygen.h' --- doc/doxygen.h 2010-02-09 18:17:43 +0000 +++ doc/doxygen.h 2010-02-11 17:21:17 +0000 @@ -301,14 +301,14 @@ * </pre> * * @defgroup ife Error handling macros - **/ + */ /** @defgroup debug HIP debug macros * * Unfortunately Doxygen gets confused when dealing with the extensive '\' and * '#' characters that these macros contain. This documentation is therefore * messed up. You can find the implementation of these macros from libinet/debug.h. - **/ + */ /** @defgroup params TODOs for parameters */ === modified file 'firewall/cache.c' --- firewall/cache.c 2010-02-11 09:57:04 +0000 +++ firewall/cache.c 2010-02-11 17:21:17 +0000 @@ -9,7 +9,7 @@ * @brief Cache implementation for local and peer HITs, LSIs and locators * * @author Miika Komu <miika@xxxxxx> - **/ + */ /* required for s6_addr32 */ #define _BSD_SOURCE === modified file 'firewall/conntrack.c' --- firewall/conntrack.c 2010-02-11 09:57:04 +0000 +++ firewall/conntrack.c 2010-02-11 17:21:17 +0000 @@ -13,7 +13,7 @@ * * @author Essi Vehmersalo * @author Rene Hummen <rene.hummen@xxxxxxxxxxxxxx> - **/ + */ /* required for s6_addr32 */ #define _BSD_SOURCE @@ -184,7 +184,7 @@ * * @param common a HIP control packet * @return struct hip_data corresponding to the HITs of the packet - **/ + */ static struct hip_data *get_hip_data(const struct hip_common *common) { struct hip_data *data = NULL; === modified file 'firewall/datapkt.c' --- firewall/datapkt.c 2010-02-11 09:57:04 +0000 +++ firewall/datapkt.c 2010-02-11 17:21:17 +0000 @@ -22,7 +22,7 @@ * @brief Implementation of HICCUPS extensions (data packets) * * @author Prabhu Patil - **/ + */ /* required for s6_addr32 */ #define _BSD_SOURCE @@ -291,7 +291,7 @@ * * @param ctx packet context * @return zero on success or non-zero on failure - **/ + */ int hip_fw_userspace_datapacket_input(const hip_fw_context_t *ctx) { int err = 0; @@ -333,7 +333,7 @@ * * @param ctx packet context * @return zero on success or non-zero on failure - **/ + */ int hip_fw_userspace_datapacket_output(const hip_fw_context_t *ctx) { uint16_t data_packet_len = 0; === modified file 'firewall/dlist.c' --- firewall/dlist.c 2010-02-10 23:02:52 +0000 +++ firewall/dlist.c 2010-02-11 17:21:17 +0000 @@ -10,7 +10,7 @@ * * @brief Simple linked list implementation * - **/ + */ #include "dlist.h" @@ -34,7 +34,7 @@ * * @param the link to be removed * @return a pointer to the original list - **/ + */ DList *free_list_chain(DList *list) { DList *tmp = NULL; @@ -65,7 +65,7 @@ * * @param list the list to be deallocated * @return a pointer to the original list - **/ + */ void free_list(DList *list) { DList *head = list_first(list); @@ -88,7 +88,7 @@ * * @param list a pointer to the list * @return a pointer to the previous list item - **/ + */ DList *list_first(DList *list) { if (list) { @@ -105,7 +105,7 @@ * * @param list a pointer to the list * @return a pointer to the next list item - **/ + */ DList *list_last(DList *list) { if (list) { @@ -122,7 +122,7 @@ * * @param list the linked list * @return the number of items on the linked list - **/ + */ unsigned int list_length(DList *list) { unsigned int length = 0; @@ -142,7 +142,7 @@ * @param list the linked list * @param data the new item to be appended * @return a pointer to the new item in the linked list - **/ + */ DList *append_to_list(DList *list, void *data) { @@ -173,7 +173,7 @@ * @param list the linked list * @param data the element to be removed * @return a pointer to the linked list - **/ + */ DList *remove_from_list(DList *list, const void *data) { @@ -208,7 +208,7 @@ * * @param the linked list * @return link the link to be removed - **/ + */ DList *remove_link_dlist(DList *list, DList *link) { @@ -235,7 +235,7 @@ * @param list the linked list * @param data the element to find * @return the element in the linked list - **/ + */ DList *find_in_dlist(DList *list, void *data) { === modified file 'firewall/esp_prot_config.c' --- firewall/esp_prot_config.c 2010-02-11 09:57:04 +0000 +++ firewall/esp_prot_config.c 2010-02-11 17:21:17 +0000 @@ -82,7 +82,7 @@ * parses the config-file and stores the parameters in memory * * @return configuration parameters - **/ + */ config_t *esp_prot_read_config(void) { config_t *cfg = NULL; @@ -117,7 +117,7 @@ * * @param cfg parsed configuration parameters * @return always 0 - **/ + */ int esp_prot_release_config(config_t *cfg) { int err = 0; @@ -137,7 +137,7 @@ * * @param cfg parsed configuration parameters * @return 0 on success, -1 otherwise - **/ + */ int esp_prot_token_config(const config_t *cfg) { int err = 0; @@ -274,7 +274,7 @@ * * @param cfg parsed configuration parameters * @return 0 on success, -1 otherwise - **/ + */ int esp_prot_sender_config(const config_t *cfg) { int err = 0; @@ -340,7 +340,7 @@ * * @param cfg parsed configuration parameters * @return 0 on success, -1 otherwise - **/ + */ int esp_prot_verifier_config(const config_t *cfg) { int err = 0; === modified file 'firewall/firewall.c' --- firewall/firewall.c 2010-02-11 09:57:04 +0000 +++ firewall/firewall.c 2010-02-11 17:21:17 +0000 @@ -125,18 +125,18 @@ * too much of the firewall. * * @todo make accessible through send function, no-one should read on that - **/ + */ int hip_fw_sock = 0; /** * Use this socket *only* for receiving async messages from hipd * @todo make static, no-one should read on that - **/ + */ int hip_fw_async_sock = 0; /** * display usage of firewall to stdout * - **/ + */ static void print_usage(void) { printf("HIP Firewall\n"); @@ -174,7 +174,7 @@ * * @return zero on success, non-zero on error * - **/ + */ int hip_fw_init_esp_relay(void) { int err = 0; @@ -188,7 +188,7 @@ /** * uninitialize ESP relay extensions * - **/ + */ void hip_fw_uninit_esp_relay(void) { esp_relay = 0; @@ -198,7 +198,7 @@ * Initialize sava client packet capture rules * * @return zero on success, non-zero on error - **/ + */ int hip_fw_init_sava_client() { int err = 0; @@ -222,7 +222,7 @@ * Initialize packet capture rules for sava router * * @return zero on success, non-zero on error - **/ + */ int hip_fw_init_sava_router() { int err = 0; @@ -274,7 +274,7 @@ /** * Ununitialize packet capture rules for sava client * - **/ + */ void hip_fw_uninit_sava_client(void) { if (hip_sava_client) { @@ -291,7 +291,7 @@ /** * Uninitialize packet capture rules for sava router * - **/ + */ void hip_fw_uninit_sava_router(void) { if (!hip_sava_client && !hip_sava_router) { @@ -332,7 +332,7 @@ * update sava state * * @param msg message containing the sava state - **/ + */ void hip_fw_update_sava(struct hip_common *msg) { if (hip_sava_router || hip_sava_client) { @@ -346,7 +346,7 @@ * @return zero on success or non-zero on error * * @todo this should be allowed to be static - **/ + */ int hip_fw_init_opptcp(void) { int err = 0; @@ -370,7 +370,7 @@ * @return zero on success or non-zero on error * * @todo this should be allowed to be static - **/ + */ int hip_fw_uninit_opptcp(void) { int err = 0; @@ -393,7 +393,7 @@ * @return zero on success and non-zero on failure * * @todo this should be allowed to be static - **/ + */ int hip_fw_init_proxy(void) { int err = 0; @@ -421,7 +421,7 @@ * @return zero on success and non-zero on failure * * @todo this should be allowed to be static - **/ + */ int hip_fw_uninit_proxy(void) { int err = 0; @@ -455,7 +455,7 @@ * Initialize packet capture rules for userspace IPsec * * @return zero on success and non-zero on failure - **/ + */ static int hip_fw_init_userspace_ipsec(void) { int err = 0; @@ -507,7 +507,7 @@ * Uninitialize packet capture rules for userspace IPsec * * @return zero on success and non-zero on failure - **/ + */ static int hip_fw_uninit_userspace_ipsec(void) { int err = 0; @@ -539,7 +539,7 @@ * * @return zero on success and non-zero on failure * - **/ + */ static int hip_fw_init_esp_prot(void) { int err = 0; @@ -584,7 +584,7 @@ * Unitialize packet capture rules for ESP connection tracking * * @return zero on success and non-zero on failure - **/ + */ static int hip_fw_init_esp_prot_conntrack(void) { int err = 0; @@ -602,7 +602,7 @@ * Uninitialize rules for connection tracking for ESP-protection extensions * * @return zero on success and non-zero on failure - **/ + */ static int hip_fw_uninit_esp_prot_conntrack(void) { int err = 0; @@ -620,7 +620,7 @@ * Initialize packet capture rules for LSI support * * @return zero on success and non-zero on failure - **/ + */ static int hip_fw_init_lsi_support(void) { int err = 0; @@ -641,7 +641,7 @@ * Uninitialize packet capture rules for LSI support * * @return zero on success and non-zero on failure - **/ + */ static int hip_fw_uninit_lsi_support(void) { int err = 0; @@ -707,7 +707,7 @@ * * @return zero on success and non-zero on failure * - **/ + */ static int hip_fw_uninit_datapacket_mode(void) { int err = 0; @@ -724,7 +724,7 @@ * * @return zero on success and non-zero on failure * - **/ + */ static int firewall_init_extensions(void) { int err = 0; @@ -851,7 +851,7 @@ * Ask default HIT and LSI from hipd * * @return zero on success and non-zero on failure - **/ + */ static int hip_query_default_local_hit_from_hipd(void) { int err = 0; @@ -886,7 +886,7 @@ /** * Uninitialize all basic and extended packet capture rules * - **/ + */ static void hip_fw_flush_iptables(void) { HIP_DEBUG("Firewall flush; may cause warnings on hipfw init\n"); @@ -924,7 +924,7 @@ * Firewall signal handler (SIGINT, SIGTERM). Exit firewall gracefully * and clean up all packet capture rules. * - **/ + */ static void firewall_exit(void) { struct hip_common *msg = NULL; @@ -962,7 +962,7 @@ * Firewall signal handler wrapper (SIGINT, SIGTERM). Exit firewall gracefully * and clean up all packet capture rules. * - **/ + */ static void firewall_close(const int signal) { #ifdef CONFIG_HIP_PERFORMANCE @@ -1057,7 +1057,7 @@ * * @return 1 if HITs match and 0 otherwise when boolean is 1. The return value is reversed when the boolean * value is 0. - **/ + */ static int match_hit(const struct in6_addr match_hit, const struct in6_addr packet_hit, const int boolean) @@ -1083,7 +1083,7 @@ * * @return 1 if integers match and 0 otherwise when the boolean is 1. The return * value is reversed when the boolean value is 0. - **/ + */ static int match_int(const int match, const int packet, const int boolean) { if (boolean) { @@ -1102,7 +1102,7 @@ * * @return 1 if strings match and 0 otherwise when the boolean is 1. The return * value is reversed when the boolean value is 0. - **/ + */ static int match_string(const char *match, const char *packet, const int boolean) { if (boolean) { @@ -1151,7 +1151,7 @@ * @param ctx packet context * * @return the verdict (1 for pass and 0 for drop) - **/ + */ static int filter_hip(const struct in6_addr *ip6_src, const struct in6_addr *ip6_dst, struct hip_common *buf, @@ -1470,7 +1470,7 @@ * @param ctx the packet context * * @return the verdict (1 for pass and 0 for drop) - **/ + */ static int hip_fw_handle_esp_output(hip_fw_context_t *ctx) { int verdict = accept_hip_esp_traffic_by_default; @@ -1492,7 +1492,7 @@ * @param ctx the packet context * * @return the verdict (1 for pass and 0 for drop) - **/ + */ static int hip_fw_handle_other_output(hip_fw_context_t *ctx) { struct ip *iphdr = NULL; @@ -1566,7 +1566,7 @@ * @param ctx the packet context * * @return the verdict (1 for pass and 0 for drop) - **/ + */ static int hip_fw_handle_tcp_output(hip_fw_context_t *ctx) { HIP_DEBUG("\n"); @@ -1580,7 +1580,7 @@ * @param ctx the packet context * * @return the verdict (1 for pass and 0 for drop) - **/ + */ static int hip_fw_handle_hip_forward(hip_fw_context_t *ctx) { HIP_DEBUG("\n"); @@ -1602,7 +1602,7 @@ * @param ctx the packet context * * @return the verdict (1 for pass and 0 for drop) - **/ + */ static int hip_fw_handle_esp_forward(hip_fw_context_t *ctx) { int verdict = accept_hip_esp_traffic_by_default; @@ -1625,7 +1625,7 @@ * @param ctx the packet context * * @return the verdict (1 for pass and 0 for drop) - **/ + */ static int hip_fw_handle_other_forward(hip_fw_context_t *ctx) { int verdict = accept_normal_traffic_by_default; @@ -1654,7 +1654,7 @@ * @param ctx the packet context * * @return the verdict (1 for pass and 0 for drop) - **/ + */ static int hip_fw_handle_tcp_forward(hip_fw_context_t *ctx) { HIP_DEBUG("\n"); @@ -1669,7 +1669,7 @@ * @param ctx the packet context * * @return the verdict (1 for pass and 0 for drop) - **/ + */ static int hip_fw_handle_other_input(hip_fw_context_t *ctx) { int verdict = accept_normal_traffic_by_default; @@ -1702,7 +1702,7 @@ * @param ctx the packet context * * @return the verdict (1 for pass and 0 for drop) - **/ + */ static int hip_fw_handle_hip_input(hip_fw_context_t *ctx) { int verdict = accept_hip_esp_traffic_by_default; @@ -1724,7 +1724,7 @@ * @param ctx the packet context * * @return the verdict (1 for pass and 0 for drop) - **/ + */ static int hip_fw_handle_esp_input(hip_fw_context_t *ctx) { int verdict = accept_hip_esp_traffic_by_default; @@ -1753,7 +1753,7 @@ * @param ctx the packet context * * @return the verdict (1 for pass and 0 for drop) - **/ + */ static int hip_fw_handle_tcp_input(hip_fw_context_t *ctx) { int verdict = accept_normal_traffic_by_default; @@ -1783,7 +1783,7 @@ * Initialize the firewall datastructures and ipqueue rules * * @return zero on success or non-zero on failure - **/ + */ static int firewall_init(void) { int err = 0; @@ -2126,7 +2126,7 @@ * @param len length of buf * @param buf the packet to be accepted * - **/ + */ static void allow_modified_packet(struct ipq_handle *handle, unsigned long packetId, size_t len, unsigned char *buf) { @@ -2250,7 +2250,7 @@ * only when hipd is started first. To solve this * chicken-and-egg problem, we are blocking all hipd * messages until hipd is running and firewall is set up. - **/ + */ static void hip_fw_wait_for_hipd(void) { hip_fw_flush_iptables(); @@ -2295,7 +2295,7 @@ * * @return zero on success and non-zero on failure * - **/ + */ int main(int argc, char **argv) { int err = 0, highest_descriptor, i; @@ -2740,7 +2740,7 @@ * do any deallocation for the HIT. * * @return a global pointer to the default HIT - **/ + */ hip_hit_t *hip_fw_get_default_hit(void) { // only query for default hit if global variable is not set @@ -2760,7 +2760,7 @@ * do any deallocation for the LSI. * * @return a global pointer to the default LSI - **/ + */ hip_lsi_t *hip_fw_get_default_lsi(void) { // only query for default lsi if global variable is not set === modified file 'firewall/firewall_control.c' --- firewall/firewall_control.c 2010-02-11 09:57:04 +0000 +++ firewall/firewall_control.c 2010-02-11 17:21:17 +0000 @@ -10,7 +10,7 @@ * @brief Firewall communication interface with hipd * * @author Miika Komu <miika@xxxxxx> - **/ + */ /* required for s6_addr32 */ #define _BSD_SOURCE === modified file 'firewall/firewalldb.c' --- firewall/firewalldb.c 2010-02-11 09:57:04 +0000 +++ firewall/firewalldb.c 2010-02-11 17:21:17 +0000 @@ -10,7 +10,7 @@ * * @author <Put all existing author information here> * @author another Author another@xxxxxxxxxx - **/ + */ /* required for s6_addr32 */ #define _BSD_SOURCE @@ -48,7 +48,7 @@ #ifndef DISABLE_hip_firewall_hldb_dump /** * display the contents of the database - **/ + */ static void hip_firewall_hldb_dump(void) { int i; @@ -75,7 +75,7 @@ * * @param ip_peer: entrance that we are searching in the db * @return NULL if not found and otherwise the firewall_hl_t structure - **/ + */ firewall_hl_t *hip_firewall_ip_db_match(const struct in6_addr *ip_peer) { #ifndef DISABLE_hip_firewall_hldb_dump @@ -90,7 +90,7 @@ * allocate memory for a new database entry * * @return the allocated database entry (caller responsible of freeing) - **/ + */ static firewall_hl_t *hip_create_hl_entry(void) { firewall_hl_t *entry = NULL; @@ -240,7 +240,7 @@ * @param the raw socket is written into this pointer * * @return zero on success, non-zero on error - **/ + */ static int hip_firewall_init_raw_sock_icmp_outbound(int *firewall_raw_sock_v6) { int on = 1, off = 0, err = 0; @@ -269,7 +269,7 @@ * @param firewall_raw_sock_v4 the result will be written here * * @return zero on success, non-zero on error - **/ + */ static int hip_firewall_init_raw_sock_tcp_v4(int *firewall_raw_sock_v4) { int on = 1, err = 0; @@ -455,7 +455,7 @@ * @param sock the created raw socket will be written here * * @return zero on success, non-zero on error - **/ + */ static int hip_firewall_init_raw_sock_esp_v4(int *sock) { int on = 1, off = 0, err = 0; @@ -479,7 +479,7 @@ * @param sock the created raw socket will be written here * * @return zero on success, non-zero on error - **/ + */ static int hip_firewall_init_raw_sock_esp_v6(int *sock) { int on = 1, off = 0, err = 0; @@ -501,7 +501,7 @@ /** * Initialize all raw sockets * - **/ + */ static void hip_firewall_init_raw_sockets(void) { hip_firewall_init_raw_sock_tcp_v4(&firewall_raw_sock_tcp_v4); @@ -519,7 +519,7 @@ /** * Initialize the database - **/ + */ void hip_firewall_init_hldb(void) { firewall_hit_lsi_ip_db = hip_ht_init(hip_firewall_hash_ip_peer, @@ -535,7 +535,7 @@ * @param state the new state of the HADB entry * * @return zero on success and non-zero on error - **/ + */ int hip_firewall_set_bex_state(struct in6_addr *hit_s, struct in6_addr *hit_r, int state) @@ -557,7 +557,7 @@ /** * remove and deallocate the hadb cache * - **/ + */ void hip_firewall_delete_hldb(void) { int i; @@ -594,7 +594,7 @@ * @todo this function could also be used by the proxy? * * @return zero on success and non-zero on error - **/ + */ int hip_firewall_send_incoming_pkt(const struct in6_addr *src_hit, const struct in6_addr *dst_hit, u8 *msg, u16 len, @@ -769,7 +769,7 @@ * @return zero on success and non-zero on error * * @todo unify common code with hip_firewall_send_outgoing_pkt() - **/ + */ int hip_firewall_send_outgoing_pkt(const struct in6_addr *src_hit, const struct in6_addr *dst_hit, u8 *msg, u16 len, === modified file 'firewall/helpers.c' --- firewall/helpers.c 2010-02-11 17:12:30 +0000 +++ firewall/helpers.c 2010-02-11 17:21:17 +0000 @@ -8,7 +8,7 @@ * @author Essi Vehmersalo * * @todo the actual utility of this file seems questionable (should be removed) - **/ + */ #include <linux/types.h> #include <limits.h> @@ -63,7 +63,7 @@ * this function must take care that * command does not contain malicious * code. - **/ + */ void system_print(char *command) { if (system(command) == -1) { === modified file 'firewall/proxyconndb.c' --- firewall/proxyconndb.c 2010-02-11 09:57:04 +0000 +++ firewall/proxyconndb.c 2010-02-11 17:21:17 +0000 @@ -45,7 +45,7 @@ * * @param p the connection entry * @return a hash calculated based on the given entry - **/ + */ unsigned long hip_proxy_conn_db_hash(const hip_proxy_conn_t *p) { uint8_t hash[HIP_AH_SHA_LEN]; @@ -68,7 +68,7 @@ * @param ha1 first hash key * @param ha2 second hash key * @return zero if keys match or one otherwise - **/ + */ int hip_proxy_conn_db_cmp(const hip_proxy_conn_t *ha1, const hip_proxy_conn_t *ha2) { @@ -91,7 +91,7 @@ /** * Initialize the proxy database - **/ + */ void hip_proxy_init_conn_db(void) { /** @todo Check for errors. */ @@ -102,7 +102,7 @@ /** * Unitialize the proxy database - **/ + */ void hip_proxy_uninit_conn_db(void) { int i = 0; @@ -130,7 +130,7 @@ * @param port_peer TCP or UDP port of the server (responder) * @param state HIP association state * @return zero on success or non-zero on failure - **/ + */ int hip_proxy_conn_add_entry(const struct in6_addr *addr_client, const struct in6_addr *addr_peer, const struct in6_addr *hit_proxy, @@ -180,7 +180,7 @@ * @param port_client transport protocol port of the legacy client * @param port_peer transport protocol port of the server (responder) * @return the database entry if found or otherwise NULL - **/ + */ hip_proxy_conn_t *hip_proxy_conn_find_by_portinfo( const struct in6_addr *hit_proxy, const struct in6_addr *hit_peer, === modified file 'firewall/user_ipsec_api.c' --- firewall/user_ipsec_api.c 2010-02-11 09:57:04 +0000 +++ firewall/user_ipsec_api.c 2010-02-11 17:21:17 +0000 @@ -9,7 +9,7 @@ * * @author Rene Hummen <rene.hummen@xxxxxxxxxxxxxx> * - **/ + */ /* required for s6_addr32 */ #define _BSD_SOURCE === modified file 'firewall/user_ipsec_api.h' --- firewall/user_ipsec_api.h 2010-02-10 23:02:52 +0000 +++ firewall/user_ipsec_api.h 2010-02-11 17:21:17 +0000 @@ -9,7 +9,7 @@ * * @author Rene Hummen <rene.hummen@xxxxxxxxxxxxxx> * - **/ + */ #ifndef USER_IPSEC_API_H_ #define USER_IPSEC_API_H_ === modified file 'firewall/user_ipsec_esp.c' --- firewall/user_ipsec_esp.c 2010-02-11 09:57:04 +0000 +++ firewall/user_ipsec_esp.c 2010-02-11 17:21:17 +0000 @@ -19,7 +19,7 @@ * * @brief user-mode HIP BEET mode implementation * - **/ + */ /* required for s6_addr32 */ #define _BSD_SOURCE === modified file 'firewall/user_ipsec_esp.h' --- firewall/user_ipsec_esp.h 2010-02-10 23:02:52 +0000 +++ firewall/user_ipsec_esp.h 2010-02-11 17:21:17 +0000 @@ -19,7 +19,7 @@ * * @brief user-mode HIP BEET mode implementation * - **/ + */ #ifndef USER_IPSEC_ESP_H_ #define USER_IPSEC_ESP_H_ === modified file 'firewall/user_ipsec_fw_msg.c' --- firewall/user_ipsec_fw_msg.c 2010-02-11 09:57:04 +0000 +++ firewall/user_ipsec_fw_msg.c 2010-02-11 17:21:17 +0000 @@ -8,7 +8,7 @@ * @brief Inter-process communication with the hipd for userspace IPsec * * @author Rene Hummen <rene.hummen@xxxxxxxxxxxxxx> - **/ + */ /* required for s6_addr32 */ #define _BSD_SOURCE === modified file 'firewall/user_ipsec_fw_msg.h' --- firewall/user_ipsec_fw_msg.h 2010-02-10 23:02:52 +0000 +++ firewall/user_ipsec_fw_msg.h 2010-02-11 17:21:17 +0000 @@ -8,7 +8,7 @@ * @brief Inter-process communication with the hipd for userspace IPsec * * @author Rene Hummen <rene.hummen@xxxxxxxxxxxxxx> - **/ + */ #ifndef USER_IPSEC_FW_MSG_H_ #define USER_IPSEC_FW_MSG_H_ === modified file 'firewall/user_ipsec_sadb.c' --- firewall/user_ipsec_sadb.c 2010-02-11 09:57:04 +0000 +++ firewall/user_ipsec_sadb.c 2010-02-11 17:21:17 +0000 @@ -10,7 +10,7 @@ * * @author Rene Hummen <rene.hummen@xxxxxxxxxxxxxx> * - **/ + */ /* required for s6_addr32 */ #define _BSD_SOURCE === modified file 'hipd/cert.c' --- hipd/cert.c 2010-02-11 09:57:04 +0000 +++ hipd/cert.c 2010-02-11 17:21:17 +0000 @@ -353,14 +353,14 @@ struct hip_cert_spki_info *cert = NULL; unsigned char *signature = NULL; - /** RSA **/ + /** RSA */ RSA *rsa = NULL; unsigned long e_code; char *e_hex = NULL; unsigned char *modulus_b64 = NULL; unsigned char *modulus = NULL; - /** DSA **/ + /** DSA */ DSA *dsa = NULL; unsigned char *p_bin = NULL, *q_bin = NULL, *g_bin = NULL, *y_bin = NULL; unsigned char *p_b64 = NULL, *q_b64 = NULL, *g_b64 = NULL, *y_b64 = NULL; @@ -737,7 +737,7 @@ X509_NAME_ENTRY *ent; EVP_PKEY *pkey; /** XX TODO THIS should come from a configuration file - * monotonically increasing counter **/ + * monotonically increasing counter */ long serial = 0; const EVP_MD *digest = NULL; X509 *cert; @@ -876,7 +876,7 @@ /* DEBUG PART END for the certificate request*/ #endif - /** NOW WE ARE READY TO CREATE A CERTIFICATE FROM THE REQUEST **/ + /** NOW WE ARE READY TO CREATE A CERTIFICATE FROM THE REQUEST */ HIP_DEBUG("Starting the certificate creation\n"); HIP_IFEL(!(cert = X509_new()), -1, @@ -884,7 +884,7 @@ HIP_IFEL((X509_set_version(cert, 2L) != 1), -1, "Failed to set certificate version\n"); - /** XX TODO serial should be stored after increasing it **/ + /** XX TODO serial should be stored after increasing it */ ASN1_INTEGER_set(X509_get_serialNumber(cert), serial++); HIP_IFEL((X509_set_subject_name(cert, subj) != 1), -1, @@ -1017,12 +1017,12 @@ /* DEBUG PART END for the certificate */ #endif - /** DER **/ + /** DER */ HIP_IFEL(((der_cert_len = i2d_X509(cert, &der_cert)) < 0), -1, "Failed to convert cert to DER\n"); _HIP_HEXDUMP("DER:\n", der_cert, der_cert_len); _HIP_DEBUG("DER length %d\n", der_cert_len); - /** end DER **/ + /** end DER */ hip_msg_init(msg); === modified file 'hipd/cert.h' --- hipd/cert.h 2010-02-11 11:44:40 +0000 +++ hipd/cert.h 2010-02-11 17:21:17 +0000 @@ -33,15 +33,15 @@ #include "hidb.h" #include "lib/core/hashtable.h" -/** SPKI **/ +/** SPKI */ int hip_cert_spki_sign(struct hip_common *, HIP_HASHTABLE *); int hip_cert_spki_verify(struct hip_common *); -/** x509v3 **/ +/** x509v3 */ int hip_cert_x509v3_handle_request_to_sign(struct hip_common *, HIP_HASHTABLE *); int hip_cert_x509v3_handle_request_to_verify(struct hip_common *); -/** utilitary functions **/ +/** utilitary functions */ int hip_cert_hostid2rsa(struct hip_host_id_priv *, RSA *); int hip_cert_hostid2dsa(struct hip_host_id_priv *, DSA *); === modified file 'hipd/dht.c' --- hipd/dht.c 2010-02-11 09:57:04 +0000 +++ hipd/dht.c 2010-02-11 17:21:17 +0000 @@ -8,7 +8,7 @@ * @brief All the necessary functionality for DHT (OpenDHT/OpenLookup) usage. * * @author: Samu Varjonen <samu.varjonen@xxxxxxx> - **/ + */ /* required for s6_addr32 */ #define _BSD_SOURCE @@ -36,7 +36,7 @@ * @param *socket_status updates the status of the socket after every socket operation * * @return void - **/ + */ void hip_init_dht_sockets(int *socket, int *socket_status) { if (hip_opendht_inuse == SO_HIP_DHT_ON) { @@ -65,7 +65,7 @@ * the queue. * * @return void - **/ + */ void hip_register_to_dht(void) { int pub_addr_ret = 0, err = 0; @@ -95,7 +95,7 @@ * @param *hit_str HIT that will be published * * @return void - **/ + */ static void hip_publish_hit(char *hostname, char *tmp_hit_str) { int err = 0; @@ -136,7 +136,7 @@ * @return 0 on success and -1 on errors * * @note Keep in mind that id opendht is not enabled this function returns zero - **/ + */ static int hip_publish_addr(char *tmp_hit_str) { char out_packet[HIP_MAX_PACKET]; @@ -177,7 +177,7 @@ * @param[out] *put_packet Buffer for the packet * * @return int 0 on succes, -1 on error - **/ + */ static int hip_dht_put_hdrr(unsigned char *key, unsigned char *host, int opendht_port, @@ -262,7 +262,7 @@ * @param *socket_status Updates the status of the socket after every socket oepration * * @return int 0 on success, -1 on errors - **/ + */ static int hip_send_queue_data(int *socket, int *socket_status) { int err = 0; @@ -338,7 +338,7 @@ * @param valuelen length of the value content to be sent to the opendht * * @return 0 on success, negative value on error - **/ + */ static int hip_prepare_send_cert_put(unsigned char *key, unsigned char *value, int key_len, @@ -378,7 +378,7 @@ * @param **azColName Column name * * @return 0 on success, -1 on errors - **/ + */ static int hip_sqlite_callback(void *NotUsed, int argc, char **argv, @@ -431,7 +431,7 @@ * after regular interval defined in hipd.h * * @return error value 0 on success and negative on error - **/ + */ int hip_publish_certificates(void) { #ifdef CONFIG_HIP_AGENT @@ -447,7 +447,7 @@ * after regular interval defined in hipd.h * * @return void - **/ + */ void hip_dht_remove_current_hdrr(void) { int err = 0; @@ -492,7 +492,7 @@ * * @return 0 on successful verification * (OR of signature and host_id verification) - **/ + */ int hip_verify_hdrr(struct hip_common *msg, struct in6_addr *addrkey) { struct hip_host_id *hostid; @@ -581,7 +581,7 @@ * data from the queue to the dht * * @return void - **/ + */ void hip_send_packet_to_lookup_from_queue(void) { int err = 0; === modified file 'hipd/esp_prot_hipd_msg.c' --- hipd/esp_prot_hipd_msg.c 2010-02-11 09:57:04 +0000 +++ hipd/esp_prot_hipd_msg.c 2010-02-11 17:21:17 +0000 @@ -31,7 +31,7 @@ * @param dst_ip dst ip address * @param spi spi of IPsec association * @return 0 on success, < 0 in case of an error - **/ + */ static int esp_prot_send_update_response(const hip_common_t *recv_update, hip_ha_t *entry, const in6_addr_t *src_ip, @@ -504,7 +504,7 @@ * * @param msg the hip message to be sent * @return 0 on success, -1 in case of an error - **/ + */ int esp_prot_r1_add_transforms(hip_common_t *msg) { int err = 0; @@ -537,7 +537,7 @@ * @param entry hip association for the received R1 message * @param ctx packet context for the received R1 message * @return always 0 - **/ + */ int esp_prot_r1_handle_transforms(hip_ha_t *entry, struct hip_context *ctx) { struct hip_param *param = NULL; @@ -590,7 +590,7 @@ * @param entry hip association for the connection * @param ctx packet context for the I2 message * @return 0 on success, -1 in case of an error - **/ + */ int esp_prot_i2_add_anchor(hip_common_t *i2, hip_ha_t *entry, const struct hip_context *ctx) { @@ -667,7 +667,7 @@ * @param entry hip association for the connection * @param ctx packet context for the I2 message * @return 0 on success, -1 in case of an error - **/ + */ int esp_prot_i2_handle_anchor(hip_ha_t *entry, const struct hip_context *ctx) { struct hip_tlv_common *param = NULL; @@ -745,7 +745,7 @@ * @param r2 the hip message to be sent * @param entry hip association for the connection * @return 0 on success, -1 in case of an error - **/ + */ int esp_prot_r2_add_anchor(hip_common_t *r2, hip_ha_t *entry) { unsigned char *anchor = NULL; @@ -809,7 +809,7 @@ * @param entry hip association for the connection * @param ctx packet context for the R2 message * @return 0 on success, -1 in case of an error - **/ + */ int esp_prot_r2_handle_anchor(hip_ha_t *entry, const struct hip_context *ctx) { struct hip_tlv_common *param = NULL; @@ -886,7 +886,7 @@ * @param src_ip src ip address * @param dst_ip dst ip address * @return 0 on success, -1 in case of an error - **/ + */ int esp_prot_handle_update(const hip_common_t *recv_update, hip_ha_t *entry, const in6_addr_t *src_ip, const in6_addr_t *dst_ip) { @@ -953,7 +953,7 @@ * @param update the received hip update * @param entry hip association for the connection * @return 0 on success, -1 in case of an error - **/ + */ int esp_prot_update_add_anchor(hip_common_t *update, hip_ha_t *entry) { struct hip_seq *seq = NULL; @@ -1021,7 +1021,7 @@ * @param dst_ip dst ip address * @param spi the ipsec spi number * @return 0 on success, -1 in case of an error - **/ + */ int esp_prot_update_handle_anchor(const hip_common_t *recv_update, hip_ha_t *entry, const in6_addr_t *src_ip, === modified file 'hipd/esp_prot_light_update.c' --- hipd/esp_prot_light_update.c 2010-02-11 09:57:04 +0000 +++ hipd/esp_prot_light_update.c 2010-02-11 17:21:17 +0000 @@ -27,7 +27,7 @@ * @param dst_addr dst ip address * @param spi IPsec spi of the direction * @return 0 in case of succcess, -1 otherwise - **/ + */ static int esp_prot_send_light_ack(hip_ha_t *entry, const in6_addr_t *src_addr, const in6_addr_t *dst_addr, const uint32_t spi) { @@ -75,7 +75,7 @@ * @param branch_nodes branch nodes for anchor elements to be sent * @param branch_length length of each branch * @return 0 in case of succcess, -1 otherwise - **/ + */ int esp_prot_send_light_update(hip_ha_t *entry, const int anchor_offset[], unsigned char *secret[MAX_NUM_PARALLEL_HCHAINS], @@ -172,7 +172,7 @@ * @param dst_addr dst ip address * @param entry host association for this connection * @return 0 in case of succcess, -1 otherwise - **/ + */ int esp_prot_receive_light_update(hip_common_t *msg, const in6_addr_t *src_addr, const in6_addr_t *dst_addr, === modified file 'hipd/hipd.c' --- hipd/hipd.c 2010-02-11 09:57:04 +0000 +++ hipd/hipd.c 2010-02-11 17:21:17 +0000 @@ -61,7 +61,7 @@ * machine is behind a NAT. */ hip_transform_suite_t hip_nat_status = 0; -/** ICMPv6 socket and the interval 0 for interval means off **/ +/** ICMPv6 socket and the interval 0 for interval means off */ int hip_icmp_sock = 0; int hip_icmp_interval = HIP_NAT_KEEP_ALIVE_INTERVAL; === modified file 'hipd/hit_to_ip.c' --- hipd/hit_to_ip.c 2010-02-11 09:57:04 +0000 +++ hipd/hit_to_ip.c 2010-02-11 17:21:17 +0000 @@ -9,7 +9,7 @@ * @brief i.e. 5.7.d.1.c.c.8.d.0.6.3.b.a.4.6.2.5.0.5.2.e.4.7.5.e.1.0.0.1.0.0.2.hit-to-ip.infrahip.net for 2001:1e:574e:2505:264a:b360:d8cc:1d75 * * @author Oleg Ponomarev <oleg.ponomarev@xxxxxxx> - **/ + */ /* required for s6_addr32 */ #define _BSD_SOURCE @@ -43,7 +43,7 @@ * This function is an interface to turn on/off locators lookup in hit-to-ip domain * * @param status 0 unless locator lookups in hit-to-ip domain wanted, 1 otherwise - **/ + */ void hip_set_hit_to_ip_status(const int status) { hip_hit_to_ip_status = status; @@ -55,7 +55,7 @@ * This function is an interface to check if locators lookup in hit-to-ip domain if wanted * * @return 0 unless locator lookups in hit-to-ip domain wanted, 1 otherwise - **/ + */ int hip_get_hit_to_ip_status(void) { @@ -73,7 +73,7 @@ * Set the zone for hit-to-ip domain lookups * * @param zone domain as a string, e.g. "hit-to-ip.infrahip.net" - **/ + */ void hip_hit_to_ip_set(const char *zone) { char *tmp = hip_hit_to_ip_zone; @@ -99,7 +99,7 @@ * @param hostname[out] buffer for the result * @param hostname_len length of the buffer * @return 0 - **/ + */ static int hip_get_hit_to_ip_hostname(const hip_hit_t *hit, const char *hostname, const int hostname_len) { if ((hit == NULL) || (hostname == NULL)) { @@ -133,7 +133,7 @@ * @param hit HIT to look locators for * @param retval[out] buffer for the result * @return 0 on success, -1 otherwise - **/ + */ int hip_hit_to_ip(hip_hit_t *hit, struct in6_addr *retval) { === modified file 'hipd/hit_to_ip.h' --- hipd/hit_to_ip.h 2010-02-10 22:32:46 +0000 +++ hipd/hit_to_ip.h 2010-02-11 17:21:17 +0000 @@ -7,7 +7,7 @@ * @brief usually invoked by hip_map_id_to_addr * * @author Oleg Ponomarev <oleg.ponomarev@xxxxxxx> - **/ + */ #ifndef HIT_TO_IP_H #define HIT_TO_IP_H === modified file 'hipd/init.c' --- hipd/init.c 2010-02-11 09:57:04 +0000 +++ hipd/init.c 2010-02-11 17:21:17 +0000 @@ -44,7 +44,7 @@ #ifndef ANDROID_CHANGES -/** ICMPV6_FILTER related stuff **/ +/** ICMPV6_FILTER related stuff */ #define BIT_CLEAR(nr, addr) do { ((__u32 *) (addr))[(nr) >> 5] &= ~(1U << ((nr) & 31)); } while (0) #define BIT_SET(nr, addr) do { ((__u32 *) (addr))[(nr) >> 5] |= (1U << ((nr) & 31)); } while (0) #define BIT_TEST(nr, addr) do { (__u32 *) (addr))[(nr) >> 5] & (1U << ((nr) & 31)); } while (0) @@ -68,7 +68,7 @@ #define ICMP6_FILTER_SETBLOCKALL(filterp) \ memset(filterp, 0xFF, sizeof(struct icmp6_filter)); #endif -/** end ICMPV6_FILTER related stuff **/ +/** end ICMPV6_FILTER related stuff */ #endif /* ANDROID_CHANGES */ === modified file 'hipd/nsupdate.c' --- hipd/nsupdate.c 2010-02-11 09:57:04 +0000 +++ hipd/nsupdate.c 2010-02-11 17:21:17 +0000 @@ -11,7 +11,7 @@ * @brief and nsupdate by hip_send_locators_to_all_peers and hipd_init * * @author Oleg Ponomarev <oleg.ponomarev@xxxxxxx> - **/ + */ /* required for s6_addr32 */ #define _BSD_SOURCE @@ -52,7 +52,7 @@ * This function is an interface to turn on/off DNS updates * * @param status 0 unless DNS updates wanted, 1 otherwise - **/ + */ void hip_set_nsupdate_status(int status) { @@ -65,7 +65,7 @@ * This function is an interface to check if DNS updates are wanted * * @return 0 unless DNS updates wanted, 1 otherwise - **/ + */ int hip_get_nsupdate_status(void) { @@ -81,7 +81,7 @@ * @param name string to put before '=' * @param value string to put after '=' * @return newly allocated string with the result or NULL in case of error - **/ + */ static char *make_env(char *name, char *value) { @@ -110,7 +110,7 @@ * Handle child exits to avoid zombies * * @param signo number of the signal triggered the function - **/ + */ static void sig_chld(int signo) { pid_t child_pid; @@ -158,7 +158,7 @@ * @param dst[out] buffer to store the address as string * @param cnt length of the buffer dst * @return On success, a non-null pointer to dst. NULL is returned if there was an error, with errno set to indicate the error. - **/ + */ static const char *netdev_address_to_str(struct netdev_address *src, char *dst, socklen_t cnt) { @@ -201,7 +201,7 @@ * @param hit HIT as a string * @param start pass 1 if executed on start, then the update script will check first if update is needed * @return 0 on success, -1 otherwise - **/ + */ static int run_nsupdate(char *ips, char *hit, int start) { @@ -280,7 +280,7 @@ * @param entry iterator from the cycle * @param opaq value of start to pass to run_nsupdate * @return 0 - **/ + */ static int run_nsupdate_for_hit(struct hip_host_id_entry *entry, void *opaq) { @@ -327,7 +327,7 @@ * @param start - pass 1 if executed on start, then the update script will * check first if update is needed * @return 0 - **/ + */ int nsupdate(const int start) { HIP_DEBUG("Updating dns records...\n"); === modified file 'hipd/nsupdate.h' --- hipd/nsupdate.h 2010-02-10 22:32:46 +0000 +++ hipd/nsupdate.h 2010-02-11 17:21:17 +0000 @@ -11,7 +11,7 @@ * @brief and nsupdate by hip_send_locators_to_all_peers and hipd_init * * @author Oleg Ponomarev <oleg.ponomarev@xxxxxxx> - **/ + */ #ifndef HIP_NSUPDATE_H #define HIP_NSUPDATE_H === modified file 'hipd/user_ipsec_hipd_msg.c' --- hipd/user_ipsec_hipd_msg.c 2010-02-11 09:57:04 +0000 +++ hipd/user_ipsec_hipd_msg.c 2010-02-11 17:21:17 +0000 @@ -8,7 +8,7 @@ * @brief userspace IPsec hipd <-> hipfw communication * * @author Rene Hummen <rene.hummen@xxxxxxxxxxxxxx> - **/ + */ /* required for s6_addr32 */ #define _BSD_SOURCE === modified file 'hipd/user_ipsec_hipd_msg.h' --- hipd/user_ipsec_hipd_msg.h 2010-02-10 22:32:46 +0000 +++ hipd/user_ipsec_hipd_msg.h 2010-02-11 17:21:17 +0000 @@ -8,7 +8,7 @@ * @brief userspace IPsec hipd <-> hipfw communication * * @author Rene Hummen <rene.hummen@xxxxxxxxxxxxxx> - **/ + */ #ifndef USER_IPSEC_HIPD_MSG_H_ #define USER_IPSEC_HIPD_MSG_H_ === modified file 'hipd/user_ipsec_sadb_api.c' --- hipd/user_ipsec_sadb_api.c 2010-02-11 09:57:04 +0000 +++ hipd/user_ipsec_sadb_api.c 2010-02-11 17:21:17 +0000 @@ -10,7 +10,7 @@ * * @author Rene Hummen <rene.hummen@xxxxxxxxxxxxxx> * - **/ + */ /* required for s6_addr32 */ #define _BSD_SOURCE @@ -185,7 +185,7 @@ * * @note security policies are not used by userspace ipsec, as we have static * rules in iptables capturing all matching packets - **/ + */ int hip_userspace_ipsec_setup_hit_sp_pair(const hip_hit_t *src_hit, const hip_hit_t *dst_hit, const struct in6_addr *src_addr, @@ -204,7 +204,7 @@ * * @note security policies are not used by userspace ipsec, as we have static * rules in iptables capturing all matching packets - **/ + */ void hip_userspace_ipsec_delete_hit_sp_pair(const hip_hit_t *src_hit, const hip_hit_t *dst_hit, const uint8_t proto, @@ -218,7 +218,7 @@ * * @note: security policies are not used by userspace ipsec, as we have static * rules in iptables capturing all matching packets - **/ + */ int hip_userspace_ipsec_flush_all_policy(void) { /* if called anywhere in hipd code, we pretend to have had a successful @@ -233,7 +233,7 @@ * rules in iptables capturing all packets matching HITs. * * @note we could delete the iptables rules here instead of at firewall exit - **/ + */ void hip_userspace_ipsec_delete_default_prefix_sp_pair(void) { // nothing to do here @@ -246,7 +246,7 @@ * rules in iptables capturing all packets matching HITs. * * @note we could set up the iptables rules here instead of at firewall init - **/ + */ int hip_userspace_ipsec_setup_default_sp_prefix_pair(void) { /* if called anywhere in hipd code, we pretend to have had a successful === modified file 'hipd/user_ipsec_sadb_api.h' --- hipd/user_ipsec_sadb_api.h 2010-02-10 22:32:46 +0000 +++ hipd/user_ipsec_sadb_api.h 2010-02-11 17:21:17 +0000 @@ -10,7 +10,7 @@ * * @author Rene Hummen <rene.hummen@xxxxxxxxxxxxxx> * - **/ + */ #ifndef USER_IPSEC_SADB_API_H_ #define USER_IPSEC_SADB_API_H_ === modified file 'lib/core/builder.c' --- lib/core/builder.c 2010-02-11 09:57:04 +0000 +++ lib/core/builder.c 2010-02-11 17:21:17 +0000 @@ -1158,7 +1158,7 @@ * switch(msg_type) block in this function. * @param msg_type message type number * @return name of the message type - **/ + */ char *hip_message_type_name(const uint8_t msg_type) { switch (msg_type) { @@ -1278,7 +1278,7 @@ * * @param param_type parameter type number * @return name of the message type - **/ + */ char *hip_param_type_name(const hip_tlv_type_t param_type) { switch (param_type) { === modified file 'lib/core/certtools.c' --- lib/core/certtools.c 2010-02-11 09:57:04 +0000 +++ lib/core/certtools.c 2010-02-11 17:21:17 +0000 @@ -36,14 +36,14 @@ unsigned char *signature = NULL; - /** RSA **/ + /** RSA */ RSA *rsa = NULL; unsigned long e_code; char *e_hex = NULL; unsigned char *modulus_b64 = NULL; unsigned char *modulus = NULL; - /** DSA **/ + /** DSA */ DSA *dsa = NULL; unsigned char *p_bin = NULL, *q_bin = NULL, *g_bin = NULL, *y_bin = NULL; unsigned char *p_b64 = NULL, *q_b64 = NULL, *g_b64 = NULL, *y_b64 = NULL; === modified file 'lib/core/certtools.h' --- lib/core/certtools.h 2010-02-10 23:55:24 +0000 +++ lib/core/certtools.h 2010-02-11 17:21:17 +0000 @@ -31,7 +31,7 @@ #include "misc.h" #include "hashtable.h" -/** Defines **/ +/** Defines */ #define HIP_CERT_CONF_PATH HIPL_SYSCONFDIR "hip_cert.cnf" /* Needed if the configuration file for certs did not exist */ @@ -39,7 +39,7 @@ #define HIP_CERT_DAY 86400 -/** Struct used to deliver the minimal needed information to build SPKI cert **/ +/** Struct used to deliver the minimal needed information to build SPKI cert */ struct hip_cert_spki_info { hip_tlv_type_t type; hip_tlv_len_t length; @@ -51,7 +51,7 @@ uint32_t success; }; -/** SPKI cert related functions **/ +/** SPKI cert related functions */ int hip_cert_spki_lib_verify(struct hip_cert_spki_info *); int hip_cert_spki_create_cert(struct hip_cert_spki_info *, char *, struct in6_addr *, @@ -63,11 +63,11 @@ int hip_cert_spki_char2certinfo(char *, struct hip_cert_spki_info *); int hip_cert_spki_send_to_verification(struct hip_cert_spki_info *); -/** x509v3 cert related functions **/ +/** x509v3 cert related functions */ int hip_cert_x509v3_request_certificate(struct in6_addr *, unsigned char *); int hip_cert_x509v3_request_verification(unsigned char *, int); -/** Utilitary functions **/ +/** Utilitary functions */ X509 *hip_cert_der_to_x509(const unsigned char *, int); X509 *hip_cert_pem_to_x509(char *); STACK_OF(CONF_VALUE) * hip_cert_read_conf_section(char *, CONF *); === modified file 'lib/core/state.h' --- lib/core/state.h 2010-02-10 23:55:24 +0000 +++ lib/core/state.h 2010-02-11 17:21:17 +0000 @@ -485,7 +485,7 @@ #ifdef CONFIG_HIP_HIPPROXY int hipproxy; #endif - /** Counters of heartbeats (ICMPv6s) **/ + /** Counters of heartbeats (ICMPv6s) */ int heartbeats_sent; statistics_data_t heartbeats_statistics; int update_trigger_on_heartbeat_counter; === modified file 'lib/dht/libhipdht.c' --- lib/dht/libhipdht.c 2010-02-11 09:57:04 +0000 +++ lib/dht/libhipdht.c 2010-02-11 17:21:17 +0000 @@ -9,7 +9,7 @@ * @brief All the necessary functionality for DHT (OpenDHT/OpenLookup) usage. * * @author: Samu Varjonen <samu.varjonen@xxxxxxx> - **/ + */ /* required for s6_addr32 */ #define _BSD_SOURCE === modified file 'lib/gui/create.c' --- lib/gui/create.c 2010-02-11 00:05:35 +0000 +++ lib/gui/create.c 2010-02-11 17:21:17 +0000 @@ -10,7 +10,7 @@ * * @author: Antti Partanen <aehparta@xxxxxxxxx> * @author: Samu Varjonen <samu.varjonen@xxxxxxx> - **/ + */ #include "create.h" #include "widgets.h" #include "events.h" @@ -24,7 +24,7 @@ * _create_edit_remote - Create contents for remote HIT information. * * @return 0 on success, -1 on errors. - **/ + */ static int _create_edit_remote(void) { GtkWidget *frame, *w, *vb, *vb2, *hb, *exp, *label; @@ -196,7 +196,7 @@ * _create_edit_group - Create contents for remote group information. * * @return 0 on success, -1 on errors. - **/ + */ static int _create_edit_group(void) { GtkWidget *frame, *w, *vb, *vb2, *hb, *exp; @@ -295,7 +295,7 @@ * @param *parent Pointer to parent widget * * @return 0 if success, -1 on errors. - **/ + */ static int _create_edit(GtkWidget *parent) { GtkWidget *w, *hb, *vb, *iconw; @@ -352,7 +352,7 @@ * _create_status_icon - Show GTK status icon. * * @return 0 if success, -1 on errors. - **/ + */ static int _create_status_icon(void) { int err = 0; @@ -421,7 +421,7 @@ * @param *parent Pointer to parent widget * * @return 0 if success, -1 on errors. - **/ + */ static int _create_remote_list(GtkWidget *parent) { GtkWidget *pane, *label, *list, *scroll, *w; @@ -511,7 +511,7 @@ * @param *parent Pointer to parent widget * * @return 0 if success, -1 on errors. - **/ + */ static int _create_menubar(GtkWidget *parent) { GtkWidget *menubar, *w, *w2, *w3, *label, *iconw; @@ -610,7 +610,7 @@ * create_content_main - Create contents of the gui in here. * * @return 0 if success, -1 on errors. - **/ + */ int create_content_main(void) { GtkWidget *window = (GtkWidget *) widget(ID_MAINWND); @@ -657,7 +657,7 @@ * create_content_local_edit - Create contents for local HIT information dialog. * * @return 0 on success, -1 on errors. - **/ + */ int create_content_local_edit(void) { GtkWidget *window = (GtkWidget *) widget(ID_LOCALDLG); @@ -716,7 +716,7 @@ * create_content_msgdlg - Create message dialog contents. * * @return 0 if success, -1 on errors. - **/ + */ int create_content_msgdlg(void) { GtkWidget *window = (GtkWidget *) widget(ID_MSGDLG); @@ -750,7 +750,7 @@ * create_content_ngdlg - Create new group dialog contents. * * @return 0 if success, -1 on errors. - **/ + */ int create_content_ngdlg(void) { GtkWidget *window = (GtkWidget *) widget(ID_NGDLG); @@ -829,7 +829,7 @@ * create_content_nhdlg - Create new hit dialog contents. * * @return 0 if success, -1 on errors. - **/ + */ int create_content_nhdlg(void) { GtkWidget *window = (GtkWidget *) widget(ID_NHDLG); @@ -998,7 +998,7 @@ * create_content_execdlg - Create execute dialog contents. * * @return 0 if success, -1 on errors. - **/ + */ int create_content_execdlg(void) { GtkWidget *window = (GtkWidget *) widget(ID_EXECDLG); === modified file 'lib/gui/dragndrop.c' --- lib/gui/dragndrop.c 2010-02-11 00:05:35 +0000 +++ lib/gui/dragndrop.c 2010-02-11 17:21:17 +0000 @@ -10,7 +10,7 @@ * @author Antti Partanen <aehparta@xxxxxxxxx> * * @note The documentation may be inaccurate please feel free to fix it -Samu - **/ + */ #include "dragndrop.h" #include "widgets.h" #include "events.h" @@ -30,7 +30,7 @@ * @param data Optional data for the handler * * @return void - **/ + */ void dnd_drag_begin(GtkWidget *tree, GdkDragContext *dc, gpointer data) { GtkTreeIter iter; @@ -75,7 +75,7 @@ * @param data Optional data for the handler * * @return Gboolean TRUE if HIT - **/ + */ gboolean dnd_drag_motion(GtkWidget *widget, GdkDragContext *dc, gint x, gint y, guint t, gpointer data) { @@ -96,7 +96,7 @@ * @param data Optional data for the handler * * @return void - **/ + */ void dnd_drag_data_get(GtkWidget *widget, GdkDragContext *dc, GtkSelectionData *selection_data, guint info, guint t, gpointer data) @@ -112,7 +112,7 @@ * @param data Optional data for the handler * * @return void - **/ + */ void dnd_drag_data_delete(GtkWidget *widget, GdkDragContext *dc, gpointer data) { _HIP_DEBUG("Not implemented yet.\n"); @@ -129,7 +129,7 @@ * @param data Optional data for the handler * * @return Always FALSE - **/ + */ gboolean dnd_drag_drop(GtkWidget *widget, GdkDragContext *dc, gint x, gint y, guint t, gpointer data) { @@ -144,7 +144,7 @@ * @param data Optional data for the handler * * @return void - **/ + */ void dnd_drag_end(GtkWidget *widget, GdkDragContext *dc, gpointer data) { _HIP_DEBUG("Not implemented yet.\n"); @@ -163,7 +163,7 @@ * @param data Optional data for the handler * * @return void - **/ + */ void dnd_drag_data_received(GtkWidget *tree, GdkDragContext *dc, gint x, gint y, GtkSelectionData *selection_data, guint info, guint t, gpointer data) === modified file 'lib/gui/events.c' --- lib/gui/events.c 2010-02-11 00:05:35 +0000 +++ lib/gui/events.c 2010-02-11 17:21:17 +0000 @@ -11,7 +11,7 @@ * @author Antti Partanen <aehparta@xxxxxxxxx> * * @note The documentation may be inaccurate please feel free to fix it -Samu - **/ + */ #include "events.h" #include "hipgui.h" #include "widgets.h" @@ -31,7 +31,7 @@ * @param data Pointer to optional data for the delete handler not used * * @return TRUE if don't close or FALSE if close. - **/ + */ gboolean e_delete(GtkWidget *w, GdkEvent *event, gpointer data) { gtk_widget_hide(GTK_WIDGET(w)); @@ -46,7 +46,7 @@ * @param data Pointer to optional data for the delete handler not used * * @return TRUE if don't close or FALSE if close. - **/ + */ gboolean e_delete_main(GtkWidget *w, GdkEvent *event, gpointer data) { #if (GTK_MAJOR_VERSION >= 2) && (GTK_MINOR_VERSION >= 10) @@ -64,7 +64,7 @@ * @param data Pointer to optional data for the delete handler not used * * @return void - **/ + */ void e_destroy_main(GtkWidget *w, gpointer data) { connhipd_quit(); @@ -78,7 +78,7 @@ * @param data Pointer to optional data for the delete handler not used * * @return void - **/ + */ void e_button(GtkWidget *warg, gpointer data) { GtkWidget *w = NULL; @@ -178,7 +178,7 @@ * @param data Optional data for the handler * * @return void - **/ + */ void e_cell_data_func(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, GtkTreeModel *model, GtkTreeIter *iter, gpointer data) { @@ -212,7 +212,7 @@ * @param data Optional data for the handler * * @return gboolean TRUE always - **/ + */ gboolean e_cursor_changed(GtkTreeView *tree, gpointer data) { GtkTreeIter iter; @@ -258,7 +258,7 @@ * @param data Optional data for the handler * * @return gboolean FALSE always - **/ + */ gboolean e_button_press(GtkTreeView *tree, GdkEventButton *button, gpointer data) { return FALSE; @@ -273,7 +273,7 @@ * @param data Optional data for the handler * * @return gboolean FALSE always - **/ + */ gboolean e_row_activated(GtkTreeSelection *selection, GtkTreePath *path, GtkTreeViewColumn *column, gpointer data) { @@ -291,7 +291,7 @@ * @param data Additional data for the handler * * @return void - **/ + */ void e_menu_status_icon(void *warg, guint bid, guint atime, gpointer data) { gtk_menu_popup(GTK_MENU(widget(ID_SYSTRAYMENU)), NULL, NULL, NULL, NULL, 0, atime); @@ -304,7 +304,7 @@ * @param hit_name Name of remote HIT. * * @return void - **/ + */ void e_local_edit(GtkWidget *warg, char *hit_name) { GtkWidget *dialog = widget(ID_LOCALDLG); === modified file 'lib/gui/hipgui.c' --- lib/gui/hipgui.c 2010-02-11 00:05:35 +0000 +++ lib/gui/hipgui.c 2010-02-11 17:21:17 +0000 @@ -11,7 +11,7 @@ * @author Antti Partanen <aehparta@xxxxxxxxx> * * @note The documentation may be inaccurate please feel free to fix it -Samu - **/ + */ #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif /* _GNU_SOURCE */ @@ -40,7 +40,7 @@ * @param *name Name of the HIT we are adding * * @return 0 on success, -1 on errors - **/ + */ static int _hit_remote_add(const char *group, const char *name) { GtkWidget *w; @@ -93,7 +93,7 @@ * @param *data The HIT to be added * * @return void - **/ + */ static void *_hit_remote_add_thread(void *data) { HIT_Remote *hit = (HIT_Remote *) data; @@ -105,7 +105,7 @@ * gui_init - Initialize GUI for usage. * * @return 0 if success, -1 on errors. - **/ + */ int gui_init(void) { GtkWidget *w; @@ -207,7 +207,7 @@ * as long as GUI is running. * * @return void - **/ + */ void gui_main(void) { gtk_combo_box_append_text(GTK_COMBO_BOX(widget(ID_TWR_RGROUP)), @@ -240,7 +240,7 @@ * gui_quit - De-initialize GUI stuff. * * @return void - **/ + */ void gui_quit(void) { widget_quit(); @@ -254,7 +254,7 @@ * 0 in, 1 out, 2 manual. * * @return Returns 0 on add, -1 on drop. - **/ + */ int gui_hit_remote_ask(HIT_Remote *hit, int inout) { static int in_use = 0; @@ -394,7 +394,7 @@ * @return void * * @note Don't call this function inside gtk main loop! - **/ + */ void gui_hit_remote_add(const char *group, const char *name) { int err = 0; @@ -414,7 +414,7 @@ * @return void * * @note Don't call this function inside gtk main loop! - **/ + */ void gui_hit_remote_del(const char *name, const char *group) { HIT_Group *g = hit_db_find_rgroup(group); @@ -445,7 +445,7 @@ * @return void * * @note Don't call this function inside gtk main loop! - **/ + */ void gui_group_remote_add(const char *name) { GtkWidget *w; @@ -479,7 +479,7 @@ * @return void * * @note Don't call this function inside gtk main loop! - **/ + */ void gui_group_remote_del(const char *name) { struct tree_update_data ud; @@ -504,7 +504,7 @@ * @return void * * @note Don't call this function inside gtk main loop! - **/ + */ void gui_set_info(const char *string, ...) { char *str = NULL; @@ -533,7 +533,7 @@ * @return void * * @note Don't call this function inside gtk main loop! - **/ + */ void gui_update_nat(int status) { GtkWidget *w = widget(ID_OPT_NAT); === modified file 'lib/gui/tools.c' --- lib/gui/tools.c 2010-02-11 00:05:35 +0000 +++ lib/gui/tools.c 2010-02-11 17:21:17 +0000 @@ -9,7 +9,7 @@ * @brief Creates the GUI for agent * * @author: Antti Partanen <aehparta@xxxxxxxxx> - **/ + */ #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif /* _GNU_SOURCE */ @@ -50,7 +50,7 @@ * @param safe Set to 0 if called inside gtk_main(), 1 if not. * * @return void - **/ + */ void _info_set(const char *str, int safe) { static int last = -1; @@ -75,7 +75,7 @@ * @param *data Remote group to be added * * @return void - **/ + */ static void *_group_remote_add_thread(void *data) { HIT_Group *g = (HIT_Group *) data; @@ -93,7 +93,7 @@ * @param *data Remote group to be deleted * * @return void - **/ + */ static void *_group_remote_del_thread(void *data) { hit_db_del_rgroup(data); @@ -106,7 +106,7 @@ * @param *data HIT to be removed * * @return void - **/ + */ static void *_hit_remote_del_thread(void *data) { hit_db_del(data); @@ -121,7 +121,7 @@ * @return void * * @note Call this function ONLY inside gtk main loop! - **/ + */ void info_set(const char *string, ...) { char *str = NULL; @@ -148,7 +148,7 @@ * @param string printf(3) formatted message string presentation. * * @return 1 if user selected "ok"-button, 0 if user selected "cancel"-button. - **/ + */ static int message_dialog(const char *string, ...) { GtkDialog *dialog = (GtkDialog *) widget(ID_MSGDLG); @@ -185,7 +185,7 @@ * about - Show about dialog. * * @return void - **/ + */ void about(void) { gtk_show_about_dialog @@ -207,7 +207,7 @@ * @param data Optional data passed to the handler * * @return gboolean TRUE on success else FALSE - **/ + */ gboolean update_tree_value(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) { @@ -244,7 +244,7 @@ * @param data Optional data passed to the handler * * @return gboolean TRUE on success else FALSE - **/ + */ static gboolean update_list_value(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) { @@ -274,7 +274,7 @@ * @param *hit HIT to be added * * @return zero always - **/ + */ int local_add(HIT_Local *hit) { GtkWidget *w; @@ -299,7 +299,7 @@ * @param *new_name New name to update the old * * @return void - **/ + */ static void local_update(char *old_name, char *new_name) { GtkTreeModel *model; @@ -347,7 +347,7 @@ * @param warg Pointer to GtkWidget type combo box. * * @return Index of item, or -1 if not found. - **/ + */ int combo_box_find(const char *name, GtkWidget *warg) { GtkTreeModel *model; @@ -386,7 +386,7 @@ * @param group Group where to add new HIT. * * @return void - **/ + */ void hit_remote_add(const char *hit, const char *group) { GtkWidget *w; @@ -445,7 +445,7 @@ * @param *name Name of new remote group. * * @return 0 on success, -1 on errors - **/ + */ int group_remote_create(const char *name) { GtkWidget *dialog = (GtkWidget *) widget(ID_NGDLG); @@ -524,7 +524,7 @@ * @param *ge HIT group pointer that will be checked against the group found with name_orig (if exists) * * @return !=0 on success - **/ + */ static int check_name_group(const char *name_orig, HIT_Group *ge) { HIT_Group *g; @@ -595,7 +595,7 @@ * with name_orig (if exists) * * @return !=0 on success - **/ + */ int check_name_hit(const char *name_orig, HIT_Remote *re) { HIT_Remote *r; @@ -661,7 +661,7 @@ * found with name_orig (if exists) * * @return !=0 on success - **/ + */ static int check_name_local(const char *name_orig, HIT_Local *le) { HIT_Local *l; @@ -725,7 +725,7 @@ * @param *ge Pointer to the HIT_Group (not used currently) * * @return 0 on success, -1 on errors - **/ + */ static int check_apply_group(const char *name, HIT_Group *ge) { int err = 0; @@ -743,7 +743,7 @@ * @param *re Pointer to the HIT_Remote (not used currently) * * @return 0 on success, -1 on errors - **/ + */ int check_apply_hit(const char *name, HIT_Remote *re) { int err = 0; @@ -761,7 +761,7 @@ * @param *re Pointer to the HIT_Group (not used currently) * * @return 0 on success, -1 on errors - **/ + */ int check_apply_hit_move(const char *name, HIT_Remote *re) { int err = 0; @@ -775,7 +775,7 @@ * check_apply_local_edit - When apply is pressed in locals toolwindow. * * @return 0 on success, -1 on errors - **/ + */ int check_apply_local_edit(void) { HIT_Local *l = (HIT_Local *) pointer(ID_EDIT_LOCAL); @@ -798,7 +798,7 @@ * edit_reset - Reset clicked for HIT/group edit field. * * @return void - **/ + */ void edit_reset(void) { GtkWidget *container = widget(ID_TW_CONTAINER); @@ -1082,7 +1082,7 @@ * @param *g Remote group from where the info is taken * * @return void - **/ + */ void edit_set_remote_group(HIT_Group *g) { char *ps; @@ -1111,7 +1111,7 @@ * @param *g Remote group from where the info is taken * * @return void - **/ + */ void hit_dlg_set_remote_group(HIT_Group *g) { char *ps; @@ -1138,7 +1138,7 @@ * exec_application - Shwo execute new application dialog. * * @return void - **/ + */ void exec_application(void) { GtkWidget *dialog; === modified file 'lib/gui/widgets.c' --- lib/gui/widgets.c 2010-02-11 00:05:35 +0000 +++ lib/gui/widgets.c 2010-02-11 17:21:17 +0000 @@ -10,7 +10,7 @@ * @brief Widget functions for the GUI * * @author Antti Partanen <aehparta@xxxxxxxxx> - **/ + */ #include "widgets.h" #include <stdlib.h> #include <string.h> @@ -25,7 +25,7 @@ * widgets in use. * * @return 0 on success, -1 on errors. - **/ + */ int widget_init(void) { int err = 0; @@ -49,7 +49,7 @@ * widget_quit - Deinitalize GUI widgets system. * * @return void - **/ + */ void widget_quit(void) { if (gui_widgets) { @@ -65,7 +65,7 @@ * * @param n Widget identifier. * @param p Pointer to widget. - **/ + */ void widget_set(int n, void *p) { if (n >= 0 && n < WIDGET_IDS_N) { === modified file 'test/certteststub.c' --- test/certteststub.c 2010-02-11 09:57:04 +0000 +++ test/certteststub.c 2010-02-11 17:21:17 +0000 @@ -34,7 +34,7 @@ * * @note this is just a test function for the certteststub and not very usefull for * anything else unless modified - **/ + */ void compression_test(unsigned char *orig, int len) { unsigned char original[1024]; @@ -250,7 +250,7 @@ compression_test(der_cert, len); - /** Now send it back for the verification **/ + /** Now send it back for the verification */ HIP_IFEL(((err = hip_cert_x509v3_request_verification(der_cert, len)) < 0), -1, "Failed to verify a certificate\n");