1 files changed, 140 insertions, 84 deletions

diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
index 54f219ad8..041898abd 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet
-     Copyright (C) 2009, 2010, 2011, 2012 GNUnet e.V.
+     Copyright (C) 2009, 2010, 2011, 2012, 2016 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
@@ -63,9 +63,9 @@ static char *current_adv_uri;
 
 static const struct GNUNET_CONFIGURATION_Handle *cfg;
 
-static struct GNUNET_SCHEDULER_Task * timeout_task;
+static struct GNUNET_SCHEDULER_Task *timeout_task;
 
-static struct GNUNET_SCHEDULER_Task * check_task;
+static struct GNUNET_SCHEDULER_Task *check_task;
 
 static struct PeerContext adv_peer;
 
@@ -81,8 +81,9 @@ static struct GNUNET_STATISTICS_GetHandle *advsent_stat;
 static void
 shutdown_testcase ()
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown testcase....\n");
-  if (timeout_task != NULL)
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Shutdown testcase....\n");
+  if (NULL != timeout_task)
   {
     GNUNET_SCHEDULER_cancel (timeout_task);
     timeout_task = NULL;
@@ -112,7 +113,7 @@ shutdown_testcase ()
     GNUNET_STATISTICS_destroy (learn_peer.stats, GNUNET_NO);
     learn_peer.stats = NULL;
   }
-  if (check_task != NULL)
+  if (NULL != check_task)
   {
     GNUNET_SCHEDULER_cancel (check_task);
     check_task = NULL;
@@ -124,20 +125,24 @@ shutdown_testcase ()
   }
   if (NULL != adv_peer.core)
   {
-    GNUNET_CORE_disconnect (adv_peer.core);
+    GNUNET_CORE_disconnecT (adv_peer.core);
     adv_peer.core = NULL;
   }
   if (NULL != learn_peer.core)
   {
-    GNUNET_CORE_disconnect (learn_peer.core);
+    GNUNET_CORE_disconnecT (learn_peer.core);
     learn_peer.core = NULL;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Killing hostlist server ARM process.\n");
-  if (0 != GNUNET_OS_process_kill (adv_peer.arm_proc, GNUNET_TERM_SIG))
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-  if (GNUNET_OS_process_wait (adv_peer.arm_proc) != GNUNET_OK)
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+  if (0 != GNUNET_OS_process_kill (adv_peer.arm_proc,
+                                   GNUNET_TERM_SIG))
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
+                         "kill");
+  if (GNUNET_OK !=
+      GNUNET_OS_process_wait (adv_peer.arm_proc))
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
+                         "waitpid");
   GNUNET_OS_process_destroy (adv_peer.arm_proc);
   adv_peer.arm_proc = NULL;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -156,6 +161,7 @@ shutdown_testcase ()
               "Shutdown complete....\n");
 }
 
+
 /**
  * Timeout, give up.
  */
@@ -185,10 +191,14 @@ do_shutdown (void *cls)
 
 
 static int
-process_downloads (void *cls, const char *subsystem, const char *name,
-                   uint64_t value, int is_persistent)
+process_downloads (void *cls,
+                   const char *subsystem,
+                   const char *name,
+                   uint64_t value,
+                   int is_persistent)
 {
-  if ((value >= 2) && (learned_hostlist_downloaded == GNUNET_NO))
+  if ( (value >= 2) &&
+       (GNUNET_NO == learned_hostlist_downloaded) )
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Peer has successfully downloaded advertised URI\n");
@@ -210,18 +220,25 @@ process_uris_recv_done (void *cls, int success)
 
 
 static int
-process_uris_recv (void *cls, const char *subsystem, const char *name,
-                   uint64_t value, int is_persistent)
+process_uris_recv (void *cls,
+                   const char *subsystem,
+                   const char *name,
+                   uint64_t value,
+                   int is_persistent)
 {
-  if (((struct PeerContext *) cls == &learn_peer) && (value == 1) &&
-      (learned_hostlist_saved == GNUNET_NO))
+  struct PeerContext *pc = cls;
+  if ( (pc == &learn_peer) &&
+       (value == 1) &&
+       (learned_hostlist_saved == GNUNET_NO) )
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Peer has successfully saved advertised URI\n");
     learned_hostlist_saved = GNUNET_YES;
-    if ((learned_hostlist_downloaded == GNUNET_YES) && (adv_sent == GNUNET_YES))
+    if ( (learned_hostlist_downloaded == GNUNET_YES) &&
+         (adv_sent == GNUNET_YES) )
     {
-      GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+      GNUNET_SCHEDULER_add_now (&do_shutdown,
+                                NULL);
     }
   }
   return GNUNET_OK;
@@ -239,7 +256,8 @@ static int
 process_adv_sent (void *cls,
                   const char *subsystem,
                   const char *name,
-                  uint64_t value, int is_persistent)
+                  uint64_t value,
+                  int is_persistent)
 {
   if ((value >= 1) && (adv_sent == GNUNET_NO))
   {
@@ -249,7 +267,8 @@ process_adv_sent (void *cls,
     if ((learned_hostlist_downloaded == GNUNET_YES) &&
         (learned_hostlist_saved == GNUNET_YES))
     {
-      GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+      GNUNET_SCHEDULER_add_now (&do_shutdown,
+                                NULL);
     }
   }
   return GNUNET_OK;
@@ -273,8 +292,11 @@ check_statistics (void *cls)
     if (NULL != download_stats)
       GNUNET_STATISTICS_get_cancel (download_stats);
     download_stats =
-        GNUNET_STATISTICS_get (learn_peer.stats, "hostlist", stat,
-                               &process_downloads_done, &process_downloads,
+        GNUNET_STATISTICS_get (learn_peer.stats,
+                               "hostlist",
+                               stat,
+                               &process_downloads_done,
+                               &process_downloads,
                                &learn_peer);
     if (NULL != urisrecv_stat)
       GNUNET_STATISTICS_get_cancel (urisrecv_stat);
@@ -293,55 +315,64 @@ check_statistics (void *cls)
         GNUNET_STATISTICS_get (adv_peer.stats, "hostlist",
                                gettext_noop ("# hostlist advertisements send"),
                                &process_adv_sent_done,
-                               &process_adv_sent, NULL);
+                               &process_adv_sent,
+                               NULL);
   }
   check_task =
-      GNUNET_SCHEDULER_add_delayed (CHECK_INTERVAL, &check_statistics, NULL);
+      GNUNET_SCHEDULER_add_delayed (CHECK_INTERVAL,
+                                    &check_statistics,
+                                    NULL);
 }
 
 
-/**
- * Core handler for p2p hostlist advertisements
- */
 static int
-ad_arrive_handler (void *cls,
-                   const struct GNUNET_PeerIdentity *peer,
+check_ad_arrive (void *cls,
+                 const struct GNUNET_MessageHeader *message)
+{
+  const char *end = (const char *) &message[1];
+  if ('\0' != end[ntohs (message->size) - sizeof (struct GNUNET_MessageHeader) - 1])
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
+static void
+handle_ad_arrive (void *cls,
                    const struct GNUNET_MessageHeader *message)
 {
   char *hostname;
   char *expected_uri;
   unsigned long long port;
-  const struct GNUNET_MessageHeader *incoming;
   const char *end;
 
-  if (-1 ==
-      GNUNET_CONFIGURATION_get_value_number (adv_peer.cfg, "HOSTLIST",
-                                             "HTTPPORT", &port))
+  if (GNUNET_SYSERR ==
+      GNUNET_CONFIGURATION_get_value_number (adv_peer.cfg,
+                                             "HOSTLIST",
+                                             "HTTPPORT",
+                                             &port))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Could not read advertising server's configuration\n");
-    return GNUNET_SYSERR;
+    return;
   }
 
   if (GNUNET_SYSERR ==
-      GNUNET_CONFIGURATION_get_value_string (adv_peer.cfg, "HOSTLIST",
-                                             "EXTERNAL_DNS_NAME", &hostname))
+      GNUNET_CONFIGURATION_get_value_string (adv_peer.cfg,
+                                             "HOSTLIST",
+                                             "EXTERNAL_DNS_NAME",
+                                             &hostname))
     hostname = GNUNET_RESOLVER_local_fqdn_get ();
-  GNUNET_asprintf (&expected_uri, "http://%s:%u/",
+  GNUNET_asprintf (&expected_uri,
+                   "http://%s:%u/",
                    hostname != NULL ? hostname : "localhost",
                    (unsigned int) port);
-  incoming = (const struct GNUNET_MessageHeader *) message;
-  end = (const char *) &incoming[1];
-  if ('\0' !=
-      end[ntohs (message->size) - sizeof (struct GNUNET_MessageHeader) - 1])
-  {
-    GNUNET_break (0);
-    GNUNET_free (expected_uri);
-    GNUNET_free_non_null (hostname);
-    return GNUNET_SYSERR;
-  }
+  end = (const char *) &message[1];
   current_adv_uri = GNUNET_strdup (end);
-  if (0 == strcmp (expected_uri, current_adv_uri))
+  if (0 == strcmp (expected_uri,
+                   current_adv_uri))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Received hostlist advertisement with URI `%s' as expected\n",
@@ -352,25 +383,24 @@ ad_arrive_handler (void *cls,
   else
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Expected URI `%s' and received URI `%s' differ\n",
-                expected_uri, current_adv_uri);
+                expected_uri,
+                current_adv_uri);
   GNUNET_free (expected_uri);
   GNUNET_free_non_null (hostname);
-  return GNUNET_OK;
 }
 
 
-/**
- * List of handlers if we are learning.
- */
-static struct GNUNET_CORE_MessageHandler learn_handlers[] = {
-  {&ad_arrive_handler, GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT, 0},
-  {NULL, 0, 0}
-};
-
-
 static void
-setup_learn_peer (struct PeerContext *p, const char *cfgname)
+setup_learn_peer (struct PeerContext *p,
+                  const char *cfgname)
 {
+  GNUNET_MQ_hd_var_size (ad_arrive,
+                         GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT,
+                         struct GNUNET_MessageHeader);
+  struct GNUNET_MQ_MessageHandler learn_handlers[] = {
+    make_ad_arrive_handler (NULL),
+    GNUNET_MQ_handler_end ()
+  };
   char *filename;
   unsigned int result;
   char *binary;
@@ -383,9 +413,13 @@ setup_learn_peer (struct PeerContext *p, const char *cfgname)
                              binary,
                              "gnunet-service-arm",
                              "-c", cfgname, NULL);
-  GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_CONFIGURATION_load (p->cfg,
+                                            cfgname));
   if (GNUNET_OK ==
-      GNUNET_CONFIGURATION_get_value_string (p->cfg, "HOSTLIST", "HOSTLISTFILE",
+      GNUNET_CONFIGURATION_get_value_string (p->cfg,
+                                             "HOSTLIST",
+                                             "HOSTLISTFILE",
                                              &filename))
   {
     if (GNUNET_YES == GNUNET_DISK_file_test (filename))
@@ -393,34 +427,43 @@ setup_learn_peer (struct PeerContext *p, const char *cfgname)
       result = UNLINK (filename);
       if (result == 0)
         GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                    _("Hostlist file `%s' was removed\n"), filename);
+                    _("Hostlist file `%s' was removed\n"),
+                    filename);
     }
     GNUNET_free (filename);
   }
-  p->core =
-      GNUNET_CORE_connect (p->cfg, NULL, NULL, NULL, NULL, NULL, GNUNET_NO,
-                           NULL, GNUNET_NO, learn_handlers);
+  p->core = GNUNET_CORE_connecT (p->cfg,
+                                 NULL,
+                                 NULL,
+                                 NULL,
+                                 NULL,
+                                 learn_handlers);
   GNUNET_assert (NULL != p->core);
-  p->stats = GNUNET_STATISTICS_create ("hostlist", p->cfg);
+  p->stats = GNUNET_STATISTICS_create ("hostlist",
+                                       p->cfg);
   GNUNET_assert (NULL != p->stats);
   GNUNET_free (binary);
 }
 
 
 static void
-setup_adv_peer (struct PeerContext *p, const char *cfgname)
+setup_adv_peer (struct PeerContext *p,
+                const char *cfgname)
 {
   char *binary;
 
   binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm");
   p->cfg = GNUNET_CONFIGURATION_create ();
   p->arm_proc =
-    GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+    GNUNET_OS_start_process (GNUNET_YES,
+                             GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                              NULL, NULL, NULL,
                              binary,
                              "gnunet-service-arm",
                              "-c", cfgname, NULL);
-  GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_CONFIGURATION_load (p->cfg,
+                                            cfgname));
   p->stats = GNUNET_STATISTICS_create ("hostlist", p->cfg);
   GNUNET_assert (NULL != p->stats);
   GNUNET_free (binary);
@@ -428,7 +471,9 @@ setup_adv_peer (struct PeerContext *p, const char *cfgname)
 
 
 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 *c)
 {
   timeout = GNUNET_NO;
@@ -440,12 +485,17 @@ run (void *cls, char *const *args, const char *cfgfile,
 
   cfg = c;
 
-  setup_adv_peer (&adv_peer, "test_learning_adv_peer.conf");
-  setup_learn_peer (&learn_peer, "test_learning_learn_peer.conf");
-  timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &timeout_error, NULL);
-
+  setup_adv_peer (&adv_peer,
+                  "test_learning_adv_peer.conf");
+  setup_learn_peer (&learn_peer,
+                    "test_learning_learn_peer.conf");
+  timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+                                               &timeout_error,
+                                               NULL);
   check_task =
-      GNUNET_SCHEDULER_add_delayed (CHECK_INTERVAL, &check_statistics, NULL);
+      GNUNET_SCHEDULER_add_delayed (CHECK_INTERVAL,
+                                    &check_statistics,
+                                    NULL);
 }
 
 
@@ -463,13 +513,18 @@ check ()
     GNUNET_GETOPT_OPTION_END
   };
 
-  GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
-                      "test-gnunet-daemon-hostlist-learning", "nohelp", options,
-                      &run, NULL);
+  GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
+                      argv,
+                      "test-gnunet-daemon-hostlist-learning",
+                      "nohelp",
+                      options,
+                      &run,
+                      NULL);
   failed = GNUNET_NO;
   if (timeout == GNUNET_YES)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Testcase timeout\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Testcase timeout\n");
     failed = GNUNET_YES;
   }
   if (adv_arrived != GNUNET_YES)
@@ -522,7 +577,8 @@ main (int argc, char *argv[])
   ret = check ();
   GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-1");
   GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-2");
-  if (GNUNET_YES == GNUNET_DISK_file_test ("hostlists_learn_peer.file"))
+  if (GNUNET_YES ==
+      GNUNET_DISK_file_test ("hostlists_learn_peer.file"))
   {
     if (0 == UNLINK ("hostlists_learn_peer.file"))
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,