/*
This file is part of GNUnet.
- (C) 2007, 2008, 2009, 2014 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
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
- 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.
+ SPDX-License-Identifier: AGPL3.0-or-later
*/
/**
*/
static GNUNET_CORE_ConnectEventHandler server_ch;
-/**
- * Handle to hostlist server's disconnect handler
- */
-static GNUNET_CORE_DisconnectEventHandler server_dh;
-
#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
* Core handler for p2p hostlist advertisements
*
* @param cls closure
- * @param peer identity of the sender
* @param message advertisement message we got
- * @return #GNUNET_OK on success
+ * @return #GNUNET_OK if message is well-formed
*/
static int
-advertisement_handler (void *cls,
- const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message)
+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);
+ (void) (*client_adv_handler) (uri);
}
*
* @param cls closure
* @param peer peer identity this notification is about
+ * @param mq queue for sending messages to @a peer
+ * @return peer
*/
-static void
-connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer)
+static void *
+connect_handler (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ struct GNUNET_MQ_Handle *mq)
{
- if (0 == memcmp (&me, peer, sizeof (struct GNUNET_PeerIdentity)))
- return;
+ if (0 == GNUNET_memcmp (&me,
+ peer))
+ 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);
+ GNUNET_assert (NULL ==
+ (*client_ch) (cls,
+ peer,
+ mq));
#if HAVE_MHD
if (NULL != server_ch)
- (*server_ch) (cls, peer);
+ GNUNET_assert (NULL ==
+ (*server_ch) (cls,
+ peer,
+ mq));
#endif
+ return (void *) peer;
}
*/
static void
disconnect_handler (void *cls,
- const struct GNUNET_PeerIdentity *peer)
+ const struct GNUNET_PeerIdentity *peer,
+ void *internal_cls)
{
- if (0 == memcmp (&me, peer, sizeof (struct GNUNET_PeerIdentity)))
+ if (0 == GNUNET_memcmp (&me,
+ peer))
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);
}
* 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)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Hostlist daemon is shutting down\n");
#endif
if (NULL != stats)
{
- GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
+ GNUNET_STATISTICS_destroy (stats,
+ GNUNET_NO);
stats = NULL;
}
}
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 HAVE_MHD
return;
}
stats = GNUNET_STATISTICS_create ("hostlist", cfg);
+ if (NULL == stats)
+ {
+ GNUNET_break (0);
+ return;
+ }
if (bootstrapping)
- GNUNET_HOSTLIST_client_start (cfg, stats, &client_ch, &client_dh,
- &client_adv_handler, learning);
+ GNUNET_HOSTLIST_client_start (cfg,
+ stats,
+ &client_ch,
+ &client_dh,
+ &client_adv_handler,
+ learning);
core =
- GNUNET_CORE_connect (cfg, NULL,
+ GNUNET_CORE_connect (cfg,
+ NULL,
&core_init,
&connect_handler,
- &disconnect_handler, NULL,
- GNUNET_NO, NULL,
- GNUNET_NO,
+ &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
main (int argc, char *const *argv)
{
- static const struct GNUNET_GETOPT_CommandLineOption options[] = {
+ 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},
+ GNUNET_GETOPT_option_flag ('a',
+ "advertise",
+ gettext_noop ("advertise our hostlist to other peers"),
+ &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},
+ GNUNET_GETOPT_option_flag ('b',
+ "bootstrap",
+ gettext_noop ("bootstrap using hostlists (it is highly recommended that you always use this option)"),
+ &bootstrapping),
+ GNUNET_GETOPT_option_flag ('e',
+ "enable-learning",
+ gettext_noop ("enable learning about hostlist servers from other peers"),
+ &learning),
#if HAVE_MHD
- {'p', "provide-hostlist", NULL,
- gettext_noop ("provide a hostlist server"),
- GNUNET_NO, &GNUNET_GETOPT_set_one, &provide_hostlist},
+ GNUNET_GETOPT_option_flag ('p',
+ "provide-hostlist",
+ gettext_noop ("provide a hostlist server"),
+ &provide_hostlist),
#endif
GNUNET_GETOPT_OPTION_END
};
GNUNET_log_setup ("hostlist", "WARNING", NULL);
ret =
(GNUNET_OK ==
- GNUNET_PROGRAM_run (argc, argv, "hostlist",
+ GNUNET_PROGRAM_run (argc, argv,
+ "hostlist",
_("GNUnet hostlist server and client"),
options,
&run, NULL)) ? 0 : 1;
projects / oweals / gnunet.git / blobdiff