/*
This file is part of GNUnet.
- (C) 2007, 2008, 2009 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2007, 2008, 2009, 2014 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @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.
/**
* 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;
+static GNUNET_CORE_ConnecTEventHandler server_ch;
#endif
/**
* Handle to the hostlist client's advertisement handler
*/
-static GNUNET_CORE_MessageCallback client_adv_handler;
+static GNUNET_HOSTLIST_UriHandler client_adv_handler;
/**
* Handle to hostlist client's connect handler
*/
-static GNUNET_CORE_ConnectEventHandler client_ch;
+static GNUNET_CORE_ConnecTEventHandler client_ch;
/**
* Handle to hostlist client's disconnect handler
*/
-static GNUNET_CORE_DisconnectEventHandler client_dh;
+static GNUNET_CORE_DisconnecTEventHandler client_dh;
+
+GNUNET_NETWORK_STRUCT_BEGIN
/**
* A HOSTLIST_ADV message is used to exchange information about
*/
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,
- const struct GNUNET_PeerIdentity *my_identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+ const struct GNUNET_PeerIdentity *my_identity)
{
me = *my_identity;
}
+
/**
* Core handler for p2p hostlist advertisements
+ *
+ * @param cls closure
+ * @param message advertisement message we got
+ * @return #GNUNET_OK if message is well-formed
*/
static int
-advertisement_handler (void *cls,
- const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+check_advertisement (void *cls,
+ const struct GNUNET_MessageHeader *message)
+{
+ size_t size;
+ size_t uri_size;
+ const char *uri;
+
+ size = ntohs (message->size);
+ if (size <= sizeof (struct GNUNET_MessageHeader))
+ {
+ 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;
+ }
+ return GNUNET_OK;
+}
+
+
+/**
+ * Core handler for p2p hostlist advertisements
+ *
+ * @param cls closure
+ * @param message advertisement message we got
+ * @return #GNUNET_OK on success
+ */
+static void
+handle_advertisement (void *cls,
+ const struct GNUNET_MessageHeader *message)
{
+ const char *uri = (const char *) &message[1];
+
GNUNET_assert (NULL != client_adv_handler);
- return (*client_adv_handler) (cls, peer, message, atsi);
+ (void) (*client_adv_handler) (uri);
}
/**
- * 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 mq queue for sending messages to @a peer
+ * @return peer
*/
-static void
+static void *
connect_handler (void *cls,
- const struct
- GNUNET_PeerIdentity *peer,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+ const struct GNUNET_PeerIdentity *peer,
+ struct GNUNET_MQ_Handle *mq)
{
- if (0 == memcmp (&me, peer, sizeof (struct GNUNET_PeerIdentity)))
- return;
+ if (0 == memcmp (&me,
+ peer,
+ sizeof (struct GNUNET_PeerIdentity)))
+ return NULL;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"A new peer connected, notifying client and server\n");
if (NULL != client_ch)
- (*client_ch) (cls, peer, atsi);
+ GNUNET_assert (NULL ==
+ (*client_ch) (cls,
+ peer,
+ mq));
#if HAVE_MHD
if (NULL != server_ch)
- (*server_ch) (cls, peer, atsi);
+ GNUNET_assert (NULL ==
+ (*server_ch) (cls,
+ peer,
+ mq));
#endif
+ return (void *) peer;
}
+
/**
- * 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,
+ void *internal_cls)
{
- if (0 == memcmp (&me, peer, sizeof (struct GNUNET_PeerIdentity)))
+ if (0 == memcmp (&me,
+ peer,
+ sizeof (struct GNUNET_PeerIdentity)))
return;
/* 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
+ (*client_dh) (cls,
+ peer,
+ NULL);
}
+
/**
* Last task run during shutdown. Disconnects us from
* the other services.
+ *
+ * @param cls NULL
*/
static void
-cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+cleaning_task (void *cls)
{
- 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);
+ GNUNET_CORE_disconnecT (core);
core = NULL;
}
if (bootstrapping)
GNUNET_HOSTLIST_server_stop ();
}
#endif
- if (stats != NULL)
+ if (NULL != stats)
{
- GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
+ GNUNET_STATISTICS_destroy (stats,
+ GNUNET_NO);
stats = NULL;
}
}
static void
run (void *cls,
char *const *args,
- const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
+ 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}
+ 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 ()
};
- static const struct GNUNET_CORE_MessageHandler no_learn_handlers[] = {
- {NULL, 0, 0}
+ struct GNUNET_MQ_MessageHandler no_learn_handlers[] = {
+ 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"));
+ _("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,
- NULL, GNUNET_NO,
- NULL, GNUNET_NO,
- learning ? learn_handlers : no_learn_handlers);
-
- if (bootstrapping)
+ if (NULL == stats)
{
- GNUNET_HOSTLIST_client_start (cfg, stats,
- &client_ch, &client_dh, &client_adv_handler,
- learning);
+ GNUNET_break (0);
+ return;
}
+ 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,
+ learning ? learn_handlers : no_learn_handlers);
+
#if HAVE_MHD
if (provide_hostlist)
- {
- GNUNET_HOSTLIST_server_start (cfg, stats, core, &server_ch, &server_dh,
+ GNUNET_HOSTLIST_server_start (cfg,
+ stats,
+ core,
+ &server_ch,
advertising);
- }
#endif
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &cleaning_task, NULL);
+ GNUNET_SCHEDULER_add_shutdown (&cleaning_task,
+ NULL);
if (NULL == core)
{
int ret;
- 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;
+ 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,
+ &run, NULL)) ? 0 : 1;
+ GNUNET_free ((void*) argv);
return ret;
}