From c4e9ba925ffd758aaa3feee2ccfc0b76f26fe207 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 5 Oct 2019 15:09:28 +0200 Subject: global reindent, now with uncrustify hook enabled --- src/hostlist/gnunet-daemon-hostlist.c | 267 +++++++++++++++++----------------- 1 file changed, 136 insertions(+), 131 deletions(-) (limited to 'src/hostlist/gnunet-daemon-hostlist.c') diff --git a/src/hostlist/gnunet-daemon-hostlist.c b/src/hostlist/gnunet-daemon-hostlist.c index 7c1863dc0..bf6542d7f 100644 --- a/src/hostlist/gnunet-daemon-hostlist.c +++ b/src/hostlist/gnunet-daemon-hostlist.c @@ -102,7 +102,8 @@ GNUNET_NETWORK_STRUCT_BEGIN * unaligned!) * 4) address (address-length bytes; possibly unaligned!) */ -struct GNUNET_HOSTLIST_ADV_Message { +struct GNUNET_HOSTLIST_ADV_Message +{ /** * Type will be GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT. */ @@ -129,8 +130,8 @@ static struct GNUNET_PeerIdentity me; * @param my_identity our peer's identity */ static void -core_init(void *cls, - const struct GNUNET_PeerIdentity *my_identity) +core_init (void *cls, + const struct GNUNET_PeerIdentity *my_identity) { me = *my_identity; } @@ -144,26 +145,26 @@ core_init(void *cls, * @return #GNUNET_OK if message is well-formed */ static int -check_advertisement(void *cls, - const struct GNUNET_MessageHeader *message) +check_advertisement (void *cls, + const struct GNUNET_MessageHeader *message) { size_t size; size_t uri_size; const char *uri; - size = ntohs(message->size); + size = ntohs (message->size); if (size <= sizeof(struct GNUNET_MessageHeader)) - { - GNUNET_break_op(0); - return GNUNET_SYSERR; - } - uri = (const char *)&message[1]; + { + GNUNET_break_op (0); + return GNUNET_SYSERR; + } + uri = (const char *) &message[1]; uri_size = size - sizeof(struct GNUNET_MessageHeader); if (uri[uri_size - 1] != '\0') - { - GNUNET_break_op(0); - return GNUNET_SYSERR; - } + { + GNUNET_break_op (0); + return GNUNET_SYSERR; + } return GNUNET_OK; } @@ -176,13 +177,13 @@ check_advertisement(void *cls, * @return #GNUNET_OK on success */ static void -handle_advertisement(void *cls, - const struct GNUNET_MessageHeader *message) +handle_advertisement (void *cls, + const struct GNUNET_MessageHeader *message) { - const char *uri = (const char *)&message[1]; + const char *uri = (const char *) &message[1]; - GNUNET_assert(NULL != client_adv_handler); - (void)(*client_adv_handler)(uri); + GNUNET_assert (NULL != client_adv_handler); + (void) (*client_adv_handler)(uri); } @@ -196,28 +197,28 @@ handle_advertisement(void *cls, * @return peer */ static void * -connect_handler(void *cls, - const struct GNUNET_PeerIdentity *peer, - struct GNUNET_MQ_Handle *mq) +connect_handler (void *cls, + const struct GNUNET_PeerIdentity *peer, + struct GNUNET_MQ_Handle *mq) { - if (0 == GNUNET_memcmp(&me, - peer)) + if (0 == GNUNET_memcmp (&me, + peer)) return NULL; - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, - "A new peer connected, notifying client and server\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "A new peer connected, notifying client and server\n"); if (NULL != client_ch) - GNUNET_assert(NULL == - (*client_ch)(cls, - peer, - mq)); + GNUNET_assert (NULL == + (*client_ch)(cls, + peer, + mq)); #if HAVE_MHD if (NULL != server_ch) - GNUNET_assert(NULL == - (*server_ch)(cls, - peer, - mq)); + GNUNET_assert (NULL == + (*server_ch)(cls, + peer, + mq)); #endif - return (void *)peer; + return (void *) peer; } @@ -229,12 +230,12 @@ connect_handler(void *cls, * @param peer peer identity this notification is about */ static void -disconnect_handler(void *cls, - const struct GNUNET_PeerIdentity *peer, - void *internal_cls) +disconnect_handler (void *cls, + const struct GNUNET_PeerIdentity *peer, + void *internal_cls) { - if (0 == GNUNET_memcmp(&me, - peer)) + if (0 == GNUNET_memcmp (&me, + peer)) return; /* call hostlist client disconnect handler */ if (NULL != client_dh) @@ -251,31 +252,31 @@ disconnect_handler(void *cls, * @param cls NULL */ static void -cleaning_task(void *cls) +cleaning_task (void *cls) { - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, - "Hostlist daemon is shutting down\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Hostlist daemon is shutting down\n"); if (NULL != core) - { - GNUNET_CORE_disconnect(core); - core = NULL; - } + { + GNUNET_CORE_disconnect (core); + core = NULL; + } if (bootstrapping) - { - GNUNET_HOSTLIST_client_stop(); - } + { + GNUNET_HOSTLIST_client_stop (); + } #if HAVE_MHD if (provide_hostlist) - { - GNUNET_HOSTLIST_server_stop(); - } + { + GNUNET_HOSTLIST_server_stop (); + } #endif if (NULL != stats) - { - GNUNET_STATISTICS_destroy(stats, - GNUNET_NO); - stats = NULL; - } + { + GNUNET_STATISTICS_destroy (stats, + GNUNET_NO); + stats = NULL; + } } @@ -288,72 +289,73 @@ cleaning_task(void *cls) * @param cfg configuration */ static void -run(void *cls, - char *const *args, - const char *cfgfile, - const struct GNUNET_CONFIGURATION_Handle *cfg) +run (void *cls, + char *const *args, + const char *cfgfile, + const struct GNUNET_CONFIGURATION_Handle *cfg) { struct GNUNET_MQ_MessageHandler learn_handlers[] = { - GNUNET_MQ_hd_var_size(advertisement, - GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT, - struct GNUNET_MessageHeader, - NULL), - GNUNET_MQ_handler_end() + GNUNET_MQ_hd_var_size (advertisement, + GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT, + struct GNUNET_MessageHeader, + NULL), + GNUNET_MQ_handler_end () }; struct GNUNET_MQ_MessageHandler no_learn_handlers[] = { - GNUNET_MQ_handler_end() + GNUNET_MQ_handler_end () }; - if ((!bootstrapping) && (!learning) + if ((! bootstrapping) && (! learning) #if HAVE_MHD - && (!provide_hostlist) + && (! provide_hostlist) #endif ) - { - GNUNET_log(GNUNET_ERROR_TYPE_WARNING, - _("None of the functions for the hostlist daemon were enabled. I have no reason to run!\n")); - return; - } - stats = GNUNET_STATISTICS_create("hostlist", cfg); + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + _ ( + "None of the functions for the hostlist daemon were enabled. I have no reason to run!\n")); + return; + } + stats = GNUNET_STATISTICS_create ("hostlist", cfg); if (NULL == stats) - { - GNUNET_break(0); - return; - } + { + GNUNET_break (0); + return; + } if (bootstrapping) - GNUNET_HOSTLIST_client_start(cfg, - stats, - &client_ch, - &client_dh, - &client_adv_handler, - learning); + GNUNET_HOSTLIST_client_start (cfg, + stats, + &client_ch, + &client_dh, + &client_adv_handler, + learning); core = - GNUNET_CORE_connect(cfg, - NULL, - &core_init, - &connect_handler, - &disconnect_handler, - learning ? learn_handlers : no_learn_handlers); + GNUNET_CORE_connect (cfg, + NULL, + &core_init, + &connect_handler, + &disconnect_handler, + learning ? learn_handlers : no_learn_handlers); #if HAVE_MHD if (provide_hostlist) - GNUNET_HOSTLIST_server_start(cfg, - stats, - core, - &server_ch, - advertising); + GNUNET_HOSTLIST_server_start (cfg, + stats, + core, + &server_ch, + advertising); #endif - GNUNET_SCHEDULER_add_shutdown(&cleaning_task, - NULL); + GNUNET_SCHEDULER_add_shutdown (&cleaning_task, + NULL); if (NULL == core) - { - GNUNET_log(GNUNET_ERROR_TYPE_ERROR, - _("Failed to connect to `%s' service.\n"), "core"); - GNUNET_SCHEDULER_shutdown(); - return; - } + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _ ("Failed to connect to `%s' service.\n"), "core"); + GNUNET_SCHEDULER_shutdown (); + return; + } } @@ -365,46 +367,49 @@ run(void *cls, * @return 0 ok, 1 on error */ int -main(int argc, char *const *argv) +main (int argc, char *const *argv) { struct GNUNET_GETOPT_CommandLineOption options[] = { #if HAVE_MHD - GNUNET_GETOPT_option_flag('a', - "advertise", - gettext_noop("advertise our hostlist to other peers"), - &advertising), + GNUNET_GETOPT_option_flag ('a', + "advertise", + gettext_noop ( + "advertise our hostlist to other peers"), + &advertising), #endif - GNUNET_GETOPT_option_flag('b', - "bootstrap", - gettext_noop("bootstrap using hostlists (it is highly recommended that you always use this option)"), - &bootstrapping), - GNUNET_GETOPT_option_flag('e', - "enable-learning", - gettext_noop("enable learning about hostlist servers from other peers"), - &learning), + GNUNET_GETOPT_option_flag ('b', + "bootstrap", + gettext_noop ( + "bootstrap using hostlists (it is highly recommended that you always use this option)"), + &bootstrapping), + GNUNET_GETOPT_option_flag ('e', + "enable-learning", + gettext_noop ( + "enable learning about hostlist servers from other peers"), + &learning), #if HAVE_MHD - GNUNET_GETOPT_option_flag('p', - "provide-hostlist", - gettext_noop("provide a hostlist server"), - &provide_hostlist), + GNUNET_GETOPT_option_flag ('p', + "provide-hostlist", + gettext_noop ("provide a hostlist server"), + &provide_hostlist), #endif GNUNET_GETOPT_OPTION_END }; int ret; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args(argc, argv, &argc, &argv)) + if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) return 2; - GNUNET_log_setup("hostlist", "WARNING", NULL); + GNUNET_log_setup ("hostlist", "WARNING", NULL); ret = (GNUNET_OK == - GNUNET_PROGRAM_run(argc, argv, - "hostlist", - _("GNUnet hostlist server and client"), - options, - &run, NULL)) ? 0 : 1; - GNUNET_free((void*)argv); + GNUNET_PROGRAM_run (argc, argv, + "hostlist", + _ ("GNUnet hostlist server and client"), + options, + &run, NULL)) ? 0 : 1; + GNUNET_free ((void*) argv); return ret; } -- cgit v1.2.3