GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
/**
* Handle to hostlist server's connect handler
*/
-static GNUNET_CORE_ConnectEventHandler server_ch = NULL;
+static GNUNET_CORE_ConnectEventHandler server_ch;
/**
* Handle to hostlist server's disconnect handler
*/
-static GNUNET_CORE_DisconnectEventHandler server_dh = NULL;
+static GNUNET_CORE_DisconnectEventHandler server_dh;
#endif
/**
* Handle to the hostlist client's advertisement handler
*/
-static GNUNET_CORE_MessageCallback client_adv_handler = NULL;
+static GNUNET_CORE_MessageCallback client_adv_handler;
/**
* Handle to hostlist client's connect handler
*/
-static GNUNET_CORE_ConnectEventHandler client_ch = NULL;
+static GNUNET_CORE_ConnectEventHandler client_ch;
/**
* Handle to hostlist client's disconnect handler
*/
-static GNUNET_CORE_DisconnectEventHandler client_dh = NULL;
-
-/**
- * gnunet-daemon-hostlist command line options.
- */
-static struct GNUNET_GETOPT_CommandLineOption options[] = {
-#if HAVE_MHD
- { 'a', "advertise", NULL,
- gettext_noop ("advertise our hostlist to other peers"),
- GNUNET_NO, &GNUNET_GETOPT_set_one, &advertising },
-#endif
- { 'b', "bootstrap", NULL,
- gettext_noop ("bootstrap using hostlists (it is highly recommended that you always use this option)"),
- GNUNET_NO, &GNUNET_GETOPT_set_one, &bootstrapping },
- { 'e', "enable-learning", NULL,
- gettext_noop ("enable learning about hostlist servers from other peers"),
- GNUNET_NO, &GNUNET_GETOPT_set_one, &learning},
-#if HAVE_MHD
- { 'p', "provide-hostlist", NULL,
- gettext_noop ("provide a hostlist server"),
- GNUNET_NO, &GNUNET_GETOPT_set_one, &provide_hostlist},
-#endif
- GNUNET_GETOPT_OPTION_END
-};
+static GNUNET_CORE_DisconnectEventHandler client_dh;
/**
* A HOSTLIST_ADV message is used to exchange information about
}
}
-/**
- * List of handlers if we are learning.
- */
-static struct GNUNET_CORE_MessageHandler learn_handlers[] = {
- { &advertisement_handler, GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT, 0},
- { NULL, 0, 0 }
-};
-
-
-/**
- * List of handlers if we are not learning.
- */
-static struct GNUNET_CORE_MessageHandler no_learn_handlers[] = {
- { NULL, 0, 0 }
-};
-
/**
* Main function that will be run.
const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle * cfg)
{
+ static const struct GNUNET_CORE_MessageHandler learn_handlers[] = {
+ { &advertisement_handler, GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT, 0},
+ { NULL, 0, 0 }
+ };
+ static const struct GNUNET_CORE_MessageHandler no_learn_handlers[] = {
+ { NULL, 0, 0 }
+ };
if ( (! bootstrapping) &&
(! learning)
#if HAVE_MHD
GNUNET_TIME_UNIT_FOREVER_REL,
NULL,
&core_init,
- &connect_handler, &disconnect_handler,
+ &connect_handler, &disconnect_handler, NULL,
NULL, GNUNET_NO,
NULL, GNUNET_NO,
learning? learn_handlers : no_learn_handlers);
int
main (int argc, char *const *argv)
{
- int ret;
- GNUNET_log_setup ("hostlist","DEBUG",NULL);
+ static const struct GNUNET_GETOPT_CommandLineOption options[] = {
+#if HAVE_MHD
+ { 'a', "advertise", NULL,
+ gettext_noop ("advertise our hostlist to other peers"),
+ GNUNET_NO, &GNUNET_GETOPT_set_one, &advertising },
+#endif
+ { 'b', "bootstrap", NULL,
+ gettext_noop ("bootstrap using hostlists (it is highly recommended that you always use this option)"),
+ GNUNET_NO, &GNUNET_GETOPT_set_one, &bootstrapping },
+ { 'e', "enable-learning", NULL,
+ gettext_noop ("enable learning about hostlist servers from other peers"),
+ GNUNET_NO, &GNUNET_GETOPT_set_one, &learning},
+#if HAVE_MHD
+ { 'p', "provide-hostlist", NULL,
+ gettext_noop ("provide a hostlist server"),
+ GNUNET_NO, &GNUNET_GETOPT_set_one, &provide_hostlist},
+#endif
+ GNUNET_GETOPT_OPTION_END
+ };
+ int ret;
+ GNUNET_log_setup ("hostlist", "WARNING", NULL);
ret = (GNUNET_OK ==
GNUNET_PROGRAM_run (argc,
argv,