Fixed reconnect
[oweals/gnunet.git] / src / peerinfo / gnunet-service-peerinfo.c
index 4879eea345bc96c53c0f638141fd23b2e7fa6816..e453621d28a547bf71a18cbf0e9c3fea1d54b846 100644 (file)
@@ -124,19 +124,18 @@ make_info_message (const struct HostEntry *he)
  * @return GNUNET_NO if expiration smaller than the current time
  */
 static int
-discard_expired (void *cls,
-                 const char *tname,
-                 struct GNUNET_TIME_Absolute expiration,
-                 const void *addr, uint16_t addrlen)
+discard_expired (void *cls, const char *tname,
+                 struct GNUNET_TIME_Absolute expiration, const void *addr,
+                 uint16_t addrlen)
 {
   const struct GNUNET_TIME_Absolute *now = cls;
-  if (now->value > expiration.value)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                 _("Removing expired address of transport `%s'\n"),
-                 tname);
-      return GNUNET_NO;
-    }
+
+  if (now->abs_value > expiration.abs_value)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                _("Removing expired address of transport `%s'\n"), tname);
+    return GNUNET_NO;
+  }
   return GNUNET_OK;
 }
 
@@ -153,14 +152,13 @@ get_host_filename (const struct GNUNET_PeerIdentity *id)
   char *fn;
 
   GNUNET_CRYPTO_hash_to_enc (&id->hashPubKey, &fil);
-  GNUNET_asprintf (&fn,
-                   "%s%s%s", networkIdDirectory, DIR_SEPARATOR_STR, &fil);
+  GNUNET_asprintf (&fn, "%s%s%s", networkIdDirectory, DIR_SEPARATOR_STR, &fil);
   return fn;
 }
 
 
 /**
- * Broadcast information about the given entry to all 
+ * Broadcast information about the given entry to all
  * clients that care.
  *
  * @param entry entry to broadcast about
@@ -171,9 +169,8 @@ notify_all (struct HostEntry *entry)
   struct InfoMessage *msg;
 
   msg = make_info_message (entry);
-  GNUNET_SERVER_notification_context_broadcast (notify_list,
-                                               &msg->header,
-                                               GNUNET_NO);
+  GNUNET_SERVER_notification_context_broadcast (notify_list, &msg->header,
+                                                GNUNET_NO);
   GNUNET_free (msg);
 }
 
@@ -194,46 +191,39 @@ add_host_to_known_hosts (const struct GNUNET_PeerIdentity *identity)
   struct GNUNET_TIME_Absolute now;
   char *fn;
 
-  entry = GNUNET_CONTAINER_multihashmap_get (hostmap,
-                                            &identity->hashPubKey);
+  entry = GNUNET_CONTAINER_multihashmap_get (hostmap, &identity->hashPubKey);
   if (entry != NULL)
     return;
-  GNUNET_STATISTICS_update (stats,
-                           gettext_noop ("# peers known"),
-                           1,
-                           GNUNET_NO);
+  GNUNET_STATISTICS_update (stats, gettext_noop ("# peers known"), 1,
+                            GNUNET_NO);
   entry = GNUNET_malloc (sizeof (struct HostEntry));
   entry->identity = *identity;
 
   fn = get_host_filename (identity);
   if (GNUNET_DISK_file_test (fn) == GNUNET_YES)
+  {
+    size = GNUNET_DISK_fn_read (fn, buffer, sizeof (buffer));
+    hello = (const struct GNUNET_HELLO_Message *) buffer;
+    if ((size < sizeof (struct GNUNET_MessageHeader)) ||
+        (size != ntohs ((((const struct GNUNET_MessageHeader *) hello)->size)))
+        || (size != GNUNET_HELLO_size (hello)))
+    {
+      GNUNET_break (0);
+      if (0 != UNLINK (fn))
+        GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", fn);
+    }
+    else
     {
-      size = GNUNET_DISK_fn_read (fn, buffer, sizeof (buffer));
-      hello = (const struct GNUNET_HELLO_Message *) buffer;
-      if ( (size < sizeof (struct GNUNET_MessageHeader)) ||
-          (size != ntohs((((const struct GNUNET_MessageHeader*) hello)->size))) ||
-          (size != GNUNET_HELLO_size (hello)) )
-       {
-         GNUNET_break (0);
-         if (0 != UNLINK (fn))
-           GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
-                                     "unlink",
-                                     fn);
-       }
-      else
-       {
-         now = GNUNET_TIME_absolute_get ();
-         hello_clean = GNUNET_HELLO_iterate_addresses (hello,
-                                                       GNUNET_YES,
-                                                       &discard_expired, &now);
-         entry->hello = hello_clean;
-       }
+      now = GNUNET_TIME_absolute_get ();
+      hello_clean =
+          GNUNET_HELLO_iterate_addresses (hello, GNUNET_YES, &discard_expired,
+                                          &now);
+      entry->hello = hello_clean;
     }
+  }
   GNUNET_free (fn);
-  GNUNET_CONTAINER_multihashmap_put (hostmap,
-                                    &identity->hashPubKey,
-                                    entry,
-                                    GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+  GNUNET_CONTAINER_multihashmap_put (hostmap, &identity->hashPubKey, entry,
+                                     GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
   notify_all (entry);
 }
 
@@ -251,14 +241,13 @@ remove_garbage (const char *fullname)
                 ("File `%s' in directory `%s' does not match naming convention. "
                  "Removed.\n"), fullname, networkIdDirectory);
   else
-    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR |
-                              GNUNET_ERROR_TYPE_BULK, "unlink", fullname);
+    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                              "unlink", fullname);
 }
 
 
 static int
-hosts_directory_scan_callback (void *cls,
-                              const char *fullname)
+hosts_directory_scan_callback (void *cls, const char *fullname)
 {
   unsigned int *matched = cls;
   struct GNUNET_PeerIdentity identity;
@@ -267,24 +256,24 @@ hosts_directory_scan_callback (void *cls,
   if (GNUNET_DISK_file_test (fullname) != GNUNET_YES)
     return GNUNET_OK;           /* ignore non-files */
   if (strlen (fullname) < sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded))
-    {
-      remove_garbage (fullname);
-      return GNUNET_OK;
-    }
+  {
+    remove_garbage (fullname);
+    return GNUNET_OK;
+  }
   filename =
-    &fullname[strlen (fullname) -
-              sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) + 1];
+      &fullname[strlen (fullname) -
+                sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) + 1];
   if (filename[-1] != DIR_SEPARATOR)
-    {
-      remove_garbage (fullname);
-      return GNUNET_OK;
-    }
-  if (GNUNET_OK != GNUNET_CRYPTO_hash_from_string (filename,
-                                                   &identity.hashPubKey))
-    {
-      remove_garbage (fullname);
-      return GNUNET_OK;
-    }
+  {
+    remove_garbage (fullname);
+    return GNUNET_OK;
+  }
+  if (GNUNET_OK !=
+      GNUNET_CRYPTO_hash_from_string (filename, &identity.hashPubKey))
+  {
+    remove_garbage (fullname);
+    return GNUNET_OK;
+  }
   (*matched)++;
   add_host_to_known_hosts (&identity);
   return GNUNET_OK;
@@ -304,16 +293,19 @@ cron_scan_directory_data_hosts (void *cls,
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
     return;
   count = 0;
-  GNUNET_DISK_directory_create (networkIdDirectory);
+  if (GNUNET_SYSERR == GNUNET_DISK_directory_create (networkIdDirectory))
+  {
+    GNUNET_SCHEDULER_add_delayed (DATA_HOST_FREQ,
+                                  &cron_scan_directory_data_hosts, NULL);
+    return;
+  }
   GNUNET_DISK_directory_scan (networkIdDirectory,
                               &hosts_directory_scan_callback, &count);
   if ((0 == count) && (0 == (++retries & 31)))
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING |
-                GNUNET_ERROR_TYPE_BULK,
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
                 _("Still no peers found in `%s'!\n"), networkIdDirectory);
-  GNUNET_SCHEDULER_add_delayed (tc->sched,
-                                DATA_HOST_FREQ,
-                                &cron_scan_directory_data_hosts, NULL);
+  GNUNET_SCHEDULER_add_delayed (DATA_HOST_FREQ, &cron_scan_directory_data_hosts,
+                                NULL);
 }
 
 
@@ -333,35 +325,37 @@ bind_address (const struct GNUNET_PeerIdentity *peer,
   struct GNUNET_TIME_Absolute delta;
 
   add_host_to_known_hosts (peer);
-  host = GNUNET_CONTAINER_multihashmap_get (hostmap,
-                                           &peer->hashPubKey);
+  host = GNUNET_CONTAINER_multihashmap_get (hostmap, &peer->hashPubKey);
   GNUNET_assert (host != NULL);
   if (host->hello == NULL)
-    {
-      host->hello = GNUNET_malloc (GNUNET_HELLO_size (hello));
-      memcpy (host->hello, hello, GNUNET_HELLO_size (hello));
-    }
+  {
+    host->hello = GNUNET_malloc (GNUNET_HELLO_size (hello));
+    memcpy (host->hello, hello, GNUNET_HELLO_size (hello));
+  }
   else
+  {
+    mrg = GNUNET_HELLO_merge (host->hello, hello);
+    delta = GNUNET_HELLO_equals (mrg, host->hello, GNUNET_TIME_absolute_get ());
+    if (delta.abs_value == GNUNET_TIME_UNIT_FOREVER_ABS.abs_value)
     {
-      mrg = GNUNET_HELLO_merge (host->hello, hello);
-      delta = GNUNET_HELLO_equals (mrg,
-                                  host->hello,
-                                  GNUNET_TIME_absolute_get ());
-      if (delta.value == GNUNET_TIME_UNIT_FOREVER_ABS.value)
-       {
-         GNUNET_free (mrg);
-         return;
-       }
-      GNUNET_free (host->hello);
-      host->hello = mrg;
+      GNUNET_free (mrg);
+      return;
     }
+    GNUNET_free (host->hello);
+    host->hello = mrg;
+  }
   fn = get_host_filename (peer);
-  GNUNET_DISK_directory_create_for_file (fn);
-  GNUNET_DISK_fn_write (fn, 
-                       host->hello, 
-                       GNUNET_HELLO_size (host->hello),
-                       GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE
-                       | GNUNET_DISK_PERM_GROUP_READ | GNUNET_DISK_PERM_OTHER_READ);
+  if (GNUNET_OK == GNUNET_DISK_directory_create_for_file (fn))
+  {
+    if (GNUNET_SYSERR ==
+        GNUNET_DISK_fn_write (fn, host->hello, GNUNET_HELLO_size (host->hello),
+                              GNUNET_DISK_PERM_USER_READ |
+                              GNUNET_DISK_PERM_USER_WRITE |
+                              GNUNET_DISK_PERM_GROUP_READ |
+                              GNUNET_DISK_PERM_OTHER_READ))
+      GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "write", fn);
+
+  }
   GNUNET_free (fn);
   notify_all (host);
 }
@@ -377,9 +371,7 @@ bind_address (const struct GNUNET_PeerIdentity *peer,
  * @return GNUNET_YES (continue to iterate)
  */
 static int
-add_to_tc (void *cls,
-          const GNUNET_HashCode *key,
-          void *value)
+add_to_tc (void *cls, const GNUNET_HashCode * key, void *value)
 {
   struct GNUNET_SERVER_TransmitContext *tc = cls;
   struct HostEntry *pos = value;
@@ -390,19 +382,18 @@ add_to_tc (void *cls,
   hs = 0;
   im = (struct InfoMessage *) buf;
   if (pos->hello != NULL)
-    {
-      hs = GNUNET_HELLO_size (pos->hello);
-      GNUNET_assert (hs <
-                    GNUNET_SERVER_MAX_MESSAGE_SIZE -
-                    sizeof (struct InfoMessage));
-      memcpy (&im[1], pos->hello, hs);
-    }
+  {
+    hs = GNUNET_HELLO_size (pos->hello);
+    GNUNET_assert (hs <
+                   GNUNET_SERVER_MAX_MESSAGE_SIZE -
+                   sizeof (struct InfoMessage));
+    memcpy (&im[1], pos->hello, hs);
+  }
   im->header.type = htons (GNUNET_MESSAGE_TYPE_PEERINFO_INFO);
   im->header.size = htons (sizeof (struct InfoMessage) + hs);
   im->reserved = htonl (0);
   im->peer = pos->identity;
-  GNUNET_SERVER_transmit_context_append_message (tc,
-                                                &im->header);
+  GNUNET_SERVER_transmit_context_append_message (tc, &im->header);
   return GNUNET_YES;
 }
 
@@ -421,31 +412,30 @@ discard_hosts_helper (void *cls, const char *fn)
 
   size = GNUNET_DISK_fn_read (fn, buffer, sizeof (buffer));
   if (size < sizeof (struct GNUNET_MessageHeader))
-    {
-      if (0 != UNLINK (fn))
-       GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING |
-                                 GNUNET_ERROR_TYPE_BULK, "unlink", fn);
-      return GNUNET_OK;
-    }
+  {
+    if (0 != UNLINK (fn))
+      GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING |
+                                GNUNET_ERROR_TYPE_BULK, "unlink", fn);
+    return GNUNET_OK;
+  }
   hello = (const struct GNUNET_HELLO_Message *) buffer;
-  new_hello = GNUNET_HELLO_iterate_addresses (hello,
-                                              GNUNET_YES,
-                                              &discard_expired, now);
+  new_hello =
+      GNUNET_HELLO_iterate_addresses (hello, GNUNET_YES, &discard_expired, now);
   if (new_hello != NULL)
-    {
-      GNUNET_DISK_fn_write (fn, 
-                           new_hello,
-                           GNUNET_HELLO_size (new_hello),
-                           GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE
-                           | GNUNET_DISK_PERM_GROUP_READ | GNUNET_DISK_PERM_OTHER_READ);
-      GNUNET_free (new_hello);
-    }
+  {
+    GNUNET_DISK_fn_write (fn, new_hello, GNUNET_HELLO_size (new_hello),
+                          GNUNET_DISK_PERM_USER_READ |
+                          GNUNET_DISK_PERM_USER_WRITE |
+                          GNUNET_DISK_PERM_GROUP_READ |
+                          GNUNET_DISK_PERM_OTHER_READ);
+    GNUNET_free (new_hello);
+  }
   else
-    {
-      if (0 != UNLINK (fn))
-       GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING |
-                                 GNUNET_ERROR_TYPE_BULK, "unlink", fn);      
-    }
+  {
+    if (0 != UNLINK (fn))
+      GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING |
+                                GNUNET_ERROR_TYPE_BULK, "unlink", fn);
+  }
   return GNUNET_OK;
 }
 
@@ -454,19 +444,16 @@ discard_hosts_helper (void *cls, const char *fn)
  * Call this method periodically to scan data/hosts for new hosts.
  */
 static void
-cron_clean_data_hosts (void *cls,
-                       const struct GNUNET_SCHEDULER_TaskContext *tc)
+cron_clean_data_hosts (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GNUNET_TIME_Absolute now;
 
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
     return;
   now = GNUNET_TIME_absolute_get ();
-  GNUNET_DISK_directory_scan (networkIdDirectory,
-                              &discard_hosts_helper, &now);
-  GNUNET_SCHEDULER_add_delayed (tc->sched,
-                                DATA_HOST_CLEAN_FREQ,
-                                &cron_clean_data_hosts, NULL);
+  GNUNET_DISK_directory_scan (networkIdDirectory, &discard_hosts_helper, &now);
+  GNUNET_SCHEDULER_add_delayed (DATA_HOST_CLEAN_FREQ, &cron_clean_data_hosts,
+                                NULL);
 }
 
 
@@ -478,25 +465,22 @@ cron_clean_data_hosts (void *cls,
  * @param message the actual message
  */
 static void
-handle_hello (void *cls,
-             struct GNUNET_SERVER_Client *client,
-             const struct GNUNET_MessageHeader *message)
+handle_hello (void *cls, struct GNUNET_SERVER_Client *client,
+              const struct GNUNET_MessageHeader *message)
 {
   const struct GNUNET_HELLO_Message *hello;
   struct GNUNET_PeerIdentity pid;
 
   hello = (const struct GNUNET_HELLO_Message *) message;
-  if (GNUNET_OK !=  GNUNET_HELLO_get_id (hello, &pid))
-    {
-      GNUNET_break (0);
-      GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-      return;
-    }
+  if (GNUNET_OK != GNUNET_HELLO_get_id (hello, &pid))
+  {
+    GNUNET_break (0);
+    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+    return;
+  }
 #if DEBUG_PEERINFO
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "`%s' message received for peer `%4s'\n",
-             "HELLO",
-             GNUNET_i2s (&pid));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "`%s' message received for peer `%4s'\n",
+              "HELLO", GNUNET_i2s (&pid));
 #endif
   bind_address (&pid, hello);
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
@@ -511,27 +495,23 @@ handle_hello (void *cls,
  * @param message the actual message
  */
 static void
-handle_get (void *cls,
-            struct GNUNET_SERVER_Client *client,
+handle_get (void *cls, struct GNUNET_SERVER_Client *client,
             const struct GNUNET_MessageHeader *message)
 {
   const struct ListPeerMessage *lpm;
   struct GNUNET_SERVER_TransmitContext *tc;
 
   lpm = (const struct ListPeerMessage *) message;
+  GNUNET_break (0 == ntohl (lpm->reserved));
 #if DEBUG_PEERINFO
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "`%s' message received for peer `%4s'\n",
-             "GET",
-             GNUNET_i2s (&lpm->peer));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "`%s' message received for peer `%4s'\n",
+              "GET", GNUNET_i2s (&lpm->peer));
 #endif
   tc = GNUNET_SERVER_transmit_context_create (client);
-  GNUNET_CONTAINER_multihashmap_get_multiple (hostmap,
-                                             &lpm->peer.hashPubKey,
-                                             &add_to_tc,
-                                             tc);
+  GNUNET_CONTAINER_multihashmap_get_multiple (hostmap, &lpm->peer.hashPubKey,
+                                              &add_to_tc, tc);
   GNUNET_SERVER_transmit_context_append_data (tc, NULL, 0,
-                                             GNUNET_MESSAGE_TYPE_PEERINFO_INFO_END);
+                                              GNUNET_MESSAGE_TYPE_PEERINFO_INFO_END);
   GNUNET_SERVER_transmit_context_run (tc, GNUNET_TIME_UNIT_FOREVER_REL);
 }
 
@@ -544,41 +524,32 @@ handle_get (void *cls,
  * @param message the actual message
  */
 static void
-handle_get_all (void *cls,
-                struct GNUNET_SERVER_Client *client,
+handle_get_all (void *cls, struct GNUNET_SERVER_Client *client,
                 const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_SERVER_TransmitContext *tc;
 
 #if DEBUG_PEERINFO
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "`%s' message received\n",
-             "GET_ALL");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "`%s' message received\n", "GET_ALL");
 #endif
   tc = GNUNET_SERVER_transmit_context_create (client);
-  GNUNET_CONTAINER_multihashmap_iterate (hostmap,
-                                        &add_to_tc,
-                                        tc);
+  GNUNET_CONTAINER_multihashmap_iterate (hostmap, &add_to_tc, tc);
   GNUNET_SERVER_transmit_context_append_data (tc, NULL, 0,
-                                             GNUNET_MESSAGE_TYPE_PEERINFO_INFO_END);
+                                              GNUNET_MESSAGE_TYPE_PEERINFO_INFO_END);
   GNUNET_SERVER_transmit_context_run (tc, GNUNET_TIME_UNIT_FOREVER_REL);
 }
 
 
 static int
-do_notify_entry (void *cls,
-                const GNUNET_HashCode *key,
-                void *value)
+do_notify_entry (void *cls, const GNUNET_HashCode * key, void *value)
 {
   struct GNUNET_SERVER_Client *client = cls;
   struct HostEntry *he = value;
   struct InfoMessage *msg;
 
   msg = make_info_message (he);
-  GNUNET_SERVER_notification_context_unicast (notify_list,
-                                             client,
-                                             &msg->header,
-                                             GNUNET_NO);
+  GNUNET_SERVER_notification_context_unicast (notify_list, client, &msg->header,
+                                              GNUNET_NO);
   GNUNET_free (msg);
   return GNUNET_YES;
 }
@@ -592,29 +563,24 @@ do_notify_entry (void *cls,
  * @param message the actual message
  */
 static void
-handle_notify (void *cls,
-              struct GNUNET_SERVER_Client *client,
-              const struct GNUNET_MessageHeader *message)
+handle_notify (void *cls, struct GNUNET_SERVER_Client *client,
+               const struct GNUNET_MessageHeader *message)
 {
 #if DEBUG_PEERINFO
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "`%s' message received\n",
-             "NOTIFY");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "`%s' message received\n", "NOTIFY");
 #endif
-  GNUNET_SERVER_notification_context_add (notify_list,
-                                         client);
-  GNUNET_CONTAINER_multihashmap_iterate (hostmap,
-                                        &do_notify_entry,
-                                        client);
+  GNUNET_SERVER_notification_context_add (notify_list, client);
+  GNUNET_CONTAINER_multihashmap_iterate (hostmap, &do_notify_entry, client);
+  GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 
 
 static int
-free_host_entry (void *cls,
-                const GNUNET_HashCode *key,
-                void *value)
+free_host_entry (void *cls, const GNUNET_HashCode * key, void *value)
 {
   struct HostEntry *he = value;
+
+  GNUNET_free_non_null (he->hello);
   GNUNET_free (he);
   return GNUNET_YES;
 }
@@ -626,20 +592,17 @@ free_host_entry (void *cls,
  * @param tc scheduler task context, unused
  */
 static void
-shutdown_task (void *cls,
-              const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_SERVER_notification_context_destroy (notify_list);
   notify_list = NULL;
-  GNUNET_CONTAINER_multihashmap_iterate (hostmap,
-                                        &free_host_entry,
-                                        NULL);
+  GNUNET_CONTAINER_multihashmap_iterate (hostmap, &free_host_entry, NULL);
   GNUNET_CONTAINER_multihashmap_destroy (hostmap);
   if (stats != NULL)
-    {
-      GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
-      stats = NULL;
-    }
+  {
+    GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
+    stats = NULL;
+  }
 }
 
 
@@ -647,14 +610,11 @@ shutdown_task (void *cls,
  * Process statistics requests.
  *
  * @param cls closure
- * @param sched scheduler to use
  * @param server the initialized server
  * @param cfg configuration to use
  */
 static void
-run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *sched,
-     struct GNUNET_SERVER_Handle *server,
+run (void *cls, struct GNUNET_SERVER_Handle *server,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   static const struct GNUNET_SERVER_MessageHandler handlers[] = {
@@ -669,23 +629,19 @@ run (void *cls,
   };
 
   hostmap = GNUNET_CONTAINER_multihashmap_create (1024);
-  stats = GNUNET_STATISTICS_create (sched, "peerinfo", cfg);
+  stats = GNUNET_STATISTICS_create ("peerinfo", cfg);
   notify_list = GNUNET_SERVER_notification_context_create (server, 0);
   GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                                          "peerinfo",
+                 GNUNET_CONFIGURATION_get_value_filename (cfg, "peerinfo",
                                                           "HOSTS",
                                                           &networkIdDirectory));
   GNUNET_DISK_directory_create (networkIdDirectory);
-  GNUNET_SCHEDULER_add_with_priority (sched,
-                                     GNUNET_SCHEDULER_PRIORITY_IDLE,
-                                     &cron_scan_directory_data_hosts, NULL);
-  GNUNET_SCHEDULER_add_with_priority (sched,
-                                     GNUNET_SCHEDULER_PRIORITY_IDLE,
-                                     &cron_clean_data_hosts, NULL);
-  GNUNET_SCHEDULER_add_delayed (sched,
-                               GNUNET_TIME_UNIT_FOREVER_REL,
-                               &shutdown_task, NULL);
+  GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
+                                      &cron_scan_directory_data_hosts, NULL);
+  GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
+                                      &cron_clean_data_hosts, NULL);
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
+                                NULL);
   GNUNET_SERVER_add_handlers (server, handlers);
 }
 
@@ -702,12 +658,10 @@ main (int argc, char *const *argv)
 {
   int ret;
 
-  ret = (GNUNET_OK ==
-        GNUNET_SERVICE_run (argc,
-                            argv,
-                              "peerinfo",
-                            GNUNET_SERVICE_OPTION_NONE,
-                            &run, NULL)) ? 0 : 1;
+  ret =
+      (GNUNET_OK ==
+       GNUNET_SERVICE_run (argc, argv, "peerinfo", GNUNET_SERVICE_OPTION_NONE,
+                           &run, NULL)) ? 0 : 1;
   GNUNET_free_non_null (networkIdDirectory);
   return ret;
 }