/*
This file is part of GNUnet.
- (C) 2007, 2008, 2009 Christian Grothoff (and other contributing authors)
+ (C) 2007, 2008, 2009, 2014 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
* @brief code for bootstrapping via hostlist servers
* @author Christian Grothoff
*/
-
-#include <stdlib.h>
#include "platform.h"
-#include "hostlist-client.h"
+#include "gnunet-daemon-hostlist_client.h"
#include "gnunet_core_service.h"
-#include "gnunet_getopt_lib.h"
+#include "gnunet_util_lib.h"
#include "gnunet_protocols.h"
-#include "gnunet_program_lib.h"
#include "gnunet_statistics_service.h"
-#include "gnunet_strings_lib.h"
-#include "gnunet_time_lib.h"
-#include "gnunet_util_lib.h"
#if HAVE_MHD
-#include "hostlist-server.h"
+#include "gnunet-daemon-hostlist_server.h"
/**
* Set if we are allowed to advertise our hostlist to others.
*/
static GNUNET_CORE_DisconnectEventHandler client_dh;
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* A HOSTLIST_ADV message is used to exchange information about
* hostlist advertisements. This struct is always
*/
uint32_t reserved GNUNET_PACKED;
};
+GNUNET_NETWORK_STRUCT_END
+/**
+ * Our own peer identity.
+ */
static struct GNUNET_PeerIdentity me;
+
+/**
+ * Callback invoked once our connection to CORE service is up.
+ *
+ * @param cls NULL
+ * @param my_identity our peer's identity
+ */
static void
-core_init (void *cls, struct GNUNET_CORE_Handle *server,
+core_init (void *cls,
const struct GNUNET_PeerIdentity *my_identity)
{
me = *my_identity;
}
+
/**
* Core handler for p2p hostlist advertisements
*
- * @param atsi_count number of records in 'atsi'
+ * @param cls closure
+ * @param peer identity of the sender
+ * @param message advertisement message we got
+ * @return #GNUNET_OK on success
*/
static int
-advertisement_handler (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+advertisement_handler (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_MessageHeader *message)
{
GNUNET_assert (NULL != client_adv_handler);
- return (*client_adv_handler) (cls, peer, message, atsi, atsi_count);
+ return (*client_adv_handler) (cls, peer, message);
}
/**
- * Method called whenever a given peer connects. Wrapper to call both client's and server's functions
+ * Method called whenever a given peer connects. Wrapper to call both
+ * client's and server's functions
*
* @param cls closure
* @param peer peer identity this notification is about
- * @param atsi performance data
- * @param atsi_count number of records in 'atsi'
*/
static void
-connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer)
{
if (0 == memcmp (&me, peer, sizeof (struct GNUNET_PeerIdentity)))
return;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"A new peer connected, notifying client and server\n");
if (NULL != client_ch)
- (*client_ch) (cls, peer, atsi, atsi_count);
+ (*client_ch) (cls, peer);
#if HAVE_MHD
if (NULL != server_ch)
- (*server_ch) (cls, peer, atsi, atsi_count);
+ (*server_ch) (cls, peer);
#endif
}
+
/**
- * Method called whenever a given peer disconnects. Wrapper to call both client's and server's functions
+ * Method called whenever a given peer disconnects. Wrapper to call
+ * both client's and server's functions
*
* @param cls closure
* @param peer peer identity this notification is about
*/
static void
-disconnect_handler (void *cls, const struct GNUNET_PeerIdentity *peer)
+disconnect_handler (void *cls,
+ const struct GNUNET_PeerIdentity *peer)
{
if (0 == memcmp (&me, peer, sizeof (struct GNUNET_PeerIdentity)))
return;
#endif
}
+
/**
* Last task run during shutdown. Disconnects us from
* the other services.
+ *
+ * @param cls NULL
+ * @param tc scheduler context
*/
static void
-cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+cleaning_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Hostlist daemon is shutting down\n");
- if (core != NULL)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Hostlist daemon is shutting down\n");
+ if (NULL != core)
{
GNUNET_CORE_disconnect (core);
core = NULL;
GNUNET_HOSTLIST_server_stop ();
}
#endif
- if (stats != NULL)
+ if (NULL != stats)
{
GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
stats = NULL;
* @param cfg configuration
*/
static void
-run (void *cls, char *const *args, const char *cfgfile,
+run (void *cls,
+ char *const *args,
+ const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
static const struct GNUNET_CORE_MessageHandler learn_handlers[] = {
static const struct GNUNET_CORE_MessageHandler no_learn_handlers[] = {
{NULL, 0, 0}
};
- 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"));
+ _("None of the functions for the hostlist daemon were enabled. I have no reason to run!\n"));
return;
}
-
-
-
stats = GNUNET_STATISTICS_create ("hostlist", cfg);
-
- core =
- GNUNET_CORE_connect (cfg, 1, NULL, &core_init, &connect_handler,
- &disconnect_handler, NULL, GNUNET_NO, NULL,
- GNUNET_NO,
- learning ? learn_handlers : no_learn_handlers);
-
if (bootstrapping)
- {
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, NULL,
+ GNUNET_NO, NULL,
+ GNUNET_NO,
+ learning ? learn_handlers : no_learn_handlers);
+
#if HAVE_MHD
if (provide_hostlist)
- {
GNUNET_HOSTLIST_server_start (cfg, stats, core, &server_ch, &server_dh,
advertising);
- }
#endif
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleaning_task,
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+ &cleaning_task,
NULL);
if (NULL == core)
int ret;
+ if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
+ return 2;
+
GNUNET_log_setup ("hostlist", "WARNING", NULL);
ret =
(GNUNET_OK ==
GNUNET_PROGRAM_run (argc, argv, "hostlist",
- _("GNUnet hostlist server and client"), options,
+ _("GNUnet hostlist server and client"),
+ options,
&run, NULL)) ? 0 : 1;
-
+ GNUNET_free ((void*) argv);
return ret;
}
projects / oweals / gnunet.git / blobdiff