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
* Core handler for p2p hostlist advertisements
*/
static int advertisement_handler (void *cls,
- const struct GNUNET_PeerIdentity * peer,
- const struct GNUNET_MessageHeader * message,
- struct GNUNET_TIME_Relative latency,
- uint32_t distance)
+ const struct GNUNET_PeerIdentity * peer,
+ const struct GNUNET_MessageHeader * message,
+ const struct GNUNET_TRANSPORT_ATS_Information *atsi)
{
GNUNET_assert (NULL != client_adv_handler);
- return (*client_adv_handler) (cls, peer, message, latency, distance);
+ return (*client_adv_handler) (cls, peer, message, atsi);
}
*
* @param cls closure
* @param peer peer identity this notification is about
- * @param latency reported latency of the connection with 'other'
- * @param distance reported distance (DV) to 'other'
+ * @param atsi performance data
*/
static void
connect_handler (void *cls,
const struct
GNUNET_PeerIdentity * peer,
- struct GNUNET_TIME_Relative latency,
- uint32_t distance)
+ const struct GNUNET_TRANSPORT_ATS_Information *atsi)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"A new peer connected, notifying client and server\n");
if ( NULL != client_ch)
- (*client_ch) (cls, peer, latency, distance);
+ (*client_ch) (cls, peer, atsi);
#if HAVE_MHD
if ( NULL != server_ch)
- (*server_ch) (cls, peer, latency, distance);
+ (*server_ch) (cls, peer, atsi);
#endif
}
}
}
-/**
- * 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.
*
* @param cls closure
- * @param sched the scheduler to use
* @param args remaining command-line arguments
* @param cfgfile name of the configuration file used (for saving, can be NULL!)
* @param cfg configuration
*/
static void
run (void *cls,
- struct GNUNET_SCHEDULER_Handle * sched,
char *const *args,
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
- stats = GNUNET_STATISTICS_create (sched, "hostlist", cfg);
+ stats = GNUNET_STATISTICS_create ("hostlist", cfg);
- core = GNUNET_CORE_connect (sched, cfg,
- GNUNET_TIME_UNIT_FOREVER_REL,
+ core = GNUNET_CORE_connect (cfg,
+ 1,
NULL,
&core_init,
- &connect_handler, &disconnect_handler,
+ &connect_handler, &disconnect_handler, NULL,
NULL, GNUNET_NO,
NULL, GNUNET_NO,
learning? learn_handlers : no_learn_handlers);
if (bootstrapping)
{
- GNUNET_HOSTLIST_client_start (cfg, sched, stats,
+ GNUNET_HOSTLIST_client_start (cfg, stats,
&client_ch, &client_dh, &client_adv_handler, learning);
}
#if HAVE_MHD
if (provide_hostlist)
{
- GNUNET_HOSTLIST_server_start (cfg, sched, stats, core, &server_ch, &server_dh, advertising );
+ GNUNET_HOSTLIST_server_start (cfg, stats, core, &server_ch, &server_dh, advertising );
}
#endif
- GNUNET_SCHEDULER_add_delayed (sched,
- GNUNET_TIME_UNIT_FOREVER_REL,
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
&cleaning_task, NULL);
+
if (NULL == core)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Failed to connect to `%s' service.\n"),
"core");
- GNUNET_SCHEDULER_shutdown (sched);
+ GNUNET_SCHEDULER_shutdown ();
return;
}
}
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,
projects / oweals / gnunet.git / blobdiff