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
* @file hostlist/gnunet-daemon-hostlist.c
* @brief code for bootstrapping via hostlist servers
* @author Christian Grothoff
- *
- * TODO:
- * - implement -a and -e switches (send P2P messages about our hostlist URL,
- * receive such messages and automatically update our hostlist URL config
- * value).
*/
#include <stdlib.h>
#include "platform.h"
#include "hostlist-client.h"
-#include "hostlist-server.h"
#include "gnunet_core_service.h"
#include "gnunet_getopt_lib.h"
#include "gnunet_protocols.h"
#include "gnunet_time_lib.h"
#include "gnunet_util_lib.h"
+#if HAVE_MHD
+
+#include "hostlist-server.h"
+
/**
* Set if we are allowed to advertise our hostlist to others.
*/
static int advertising;
+/**
+ * Set if the user wants us to run a hostlist server.
+ */
+static int provide_hostlist;
+
+/**
+ * Handle to hostlist server's connect handler
+ */
+static GNUNET_CORE_ConnectEventHandler server_ch;
+
+/**
+ * Handle to hostlist server's disconnect handler
+ */
+static GNUNET_CORE_DisconnectEventHandler server_dh;
+
+#endif
+
/**
* Set if we are allowed to learn about peers by accessing
* hostlist servers.
*/
static int learning;
-/**
- * Set if the user wants us to run a hostlist server.
- */
-static int provide_hostlist;
-
/**
* Statistics handle.
*/
/**
* 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;
-
-/**
- * Handle to hostlist server's connect handler
- */
-static GNUNET_CORE_ConnectEventHandler server_ch = NULL;
-
-/**
- * Handle to hostlist server's disconnect handler
- */
-static GNUNET_CORE_DisconnectEventHandler server_dh = NULL;
-
-/**
- * gnunet-daemon-hostlist command line options.
- */
-static struct GNUNET_GETOPT_CommandLineOption options[] = {
- { 'a', "advertise", NULL,
- gettext_noop ("advertise our hostlist to other peers"),
- GNUNET_NO, &GNUNET_GETOPT_set_one, &advertising },
- { '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},
- { 'p', "provide-hostlist", NULL,
- gettext_noop ("provide a hostlist server"),
- GNUNET_NO, &GNUNET_GETOPT_set_one, &provide_hostlist},
- GNUNET_GETOPT_OPTION_END
-};
+static GNUNET_CORE_DisconnectEventHandler client_dh;
/**
* A HOSTLIST_ADV message is used to exchange information about
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *
publicKey)
{
- if (advertising && (NULL != server))
- {
- /* FIXME: provide "server" to 'hostlist' module */
- }
+ /* Nothing to do here */
}
/**
struct GNUNET_TIME_Relative latency,
uint32_t distance)
{
- if (advertising && (NULL != client_adv_handler))
- {
- (*client_adv_handler) (cls, peer, message, latency, distance);
- return GNUNET_YES;
- }
- return GNUNET_NO;
+ GNUNET_assert (NULL != client_adv_handler);
+ return (*client_adv_handler) (cls, peer, message, latency, distance);
}
+
/**
* Method called whenever a given peer connects. Wrapper to call both client's and server's functions
*
"A new peer connected, notifying client and server\n");
if ( NULL != client_ch)
(*client_ch) (cls, peer, latency, distance);
+#if HAVE_MHD
if ( NULL != server_ch)
(*server_ch) (cls, peer, latency, distance);
+#endif
}
/**
*
* @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'
*/
static void
disconnect_handler (void *cls,
/* call hostlist client disconnect handler*/
if ( NULL != client_dh)
(*client_dh) (cls, peer);
-
+#if HAVE_MHD
/* call hostlist server disconnect handler*/
if ( NULL != server_dh)
(*server_dh) (cls, peer);
+#endif
}
/**
cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Hostlist daemon is shutting down\n");
+ "Hostlist daemon is shutting down\n");
+ if (core != NULL)
+ {
+ GNUNET_CORE_disconnect (core);
+ core = NULL;
+ }
if (bootstrapping)
{
GNUNET_HOSTLIST_client_stop ();
}
+#if HAVE_MHD
if (provide_hostlist)
{
GNUNET_HOSTLIST_server_stop ();
}
- if (core != NULL)
- {
- GNUNET_CORE_disconnect (core);
- core = NULL;
- }
+#endif
if (stats != NULL)
{
GNUNET_STATISTICS_destroy (stats,
}
}
-/**
- * List of handlers for the messages understood by this
- * service.
- */
-static struct GNUNET_CORE_MessageHandler handlers[] = {
- { &advertisement_handler, GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT, 0},
- { 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) &&
- (! provide_hostlist) )
+ (! learning)
+#if HAVE_MHD
+ && (! 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 (sched, "hostlist", cfg);
core = GNUNET_CORE_connect (sched, cfg,
- GNUNET_TIME_UNIT_FOREVER_REL,
- NULL,
- &core_init,
- NULL, &connect_handler, &disconnect_handler,
- NULL, GNUNET_NO,
- NULL, GNUNET_NO,
- handlers);
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ NULL,
+ &core_init,
+ &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,
- &client_ch, &client_dh, &client_adv_handler);
+ &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);
- }
- if (learning)
- {
-
+ GNUNET_HOSTLIST_server_start (cfg, sched, stats, core, &server_ch, &server_dh, advertising );
}
-
+#endif
GNUNET_SCHEDULER_add_delayed (sched,
GNUNET_TIME_UNIT_FOREVER_REL,
&cleaning_task, NULL);
+
if (NULL == core)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
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