does not terminate on invalid uri

[oweals/gnunet.git] / src / hostlist / gnunet-daemon-hostlist.c

diff --git a/src/hostlist/gnunet-daemon-hostlist.c b/src/hostlist/gnunet-daemon-hostlist.c
index b0fb03e29ec11cc27123377f9b7ac4805cacb13b..255f0d5443fab80bc9f4f3dbf8a087f7c7611b21 100644 (file)
--- a/src/hostlist/gnunet-daemon-hostlist.c
+++ b/src/hostlist/gnunet-daemon-hostlist.c
@@ -99,6 +99,8 @@ static GNUNET_CORE_ConnectEventHandler client_ch;
  */
 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
@@ -123,7 +125,7 @@ struct GNUNET_HOSTLIST_ADV_Message
    */
   uint32_t reserved GNUNET_PACKED;
 };
-
+GNUNET_NETWORK_STRUCT_END
 
 static struct GNUNET_PeerIdentity me;
 
@@ -137,7 +139,12 @@ core_init (void *cls, struct GNUNET_CORE_Handle *server,
 /**
  * Core handler for p2p hostlist advertisements
  *
+ * @param cls closure
+ * @param peer identity of the sender
+ * @param message advertisement message we got
+ * @param atsi performance information
  * @param atsi_count number of records in 'atsi'
+ * @return GNUNET_OK on success
  */
 static int
 advertisement_handler (void *cls, const struct GNUNET_PeerIdentity *peer,
@@ -263,7 +270,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   stats = GNUNET_STATISTICS_create ("hostlist", cfg);
 
   core =
-      GNUNET_CORE_connect (cfg, 1, NULL, &core_init, &connect_handler,
+      GNUNET_CORE_connect (cfg, NULL, &core_init, &connect_handler,
                            &disconnect_handler, NULL, GNUNET_NO, NULL,
                            GNUNET_NO,
                            learning ? learn_handlers : no_learn_handlers);
@@ -327,13 +334,16 @@ main (int argc, char *const *argv)
 
   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,
                            &run, NULL)) ? 0 : 1;
-
+  GNUNET_free ((void*) argv);
   return ret;
 }