1 files changed, 41 insertions, 60 deletions

diff --git a/src/peerinfo/gnunet-service-peerinfo.c b/src/peerinfo/gnunet-service-peerinfo.c
index 160993649..26fec5289 100644
--- a/src/peerinfo/gnunet-service-peerinfo.c
+++ b/src/peerinfo/gnunet-service-peerinfo.c
@@ -124,10 +124,9 @@ 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;
 
@@ -170,8 +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);
 }
 
@@ -195,8 +194,8 @@ add_host_to_known_hosts (const struct GNUNET_PeerIdentity *identity)
   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;
 
@@ -216,16 +215,14 @@ add_host_to_known_hosts (const struct GNUNET_PeerIdentity *identity)
     else
     {
       now = GNUNET_TIME_absolute_get ();
-      hello_clean = GNUNET_HELLO_iterate_addresses (hello,
-                                                    GNUNET_YES,
-                                                    &discard_expired, &now);
+      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_multihashmap_put (hostmap, &identity->hashPubKey, entry,
                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
   notify_all (entry);
 }
@@ -244,8 +241,8 @@ 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);
 }
 
 
@@ -271,8 +268,8 @@ hosts_directory_scan_callback (void *cls, const char *fullname)
     remove_garbage (fullname);
     return GNUNET_OK;
   }
-  if (GNUNET_OK != GNUNET_CRYPTO_hash_from_string (filename,
-                                                   &identity.hashPubKey))
+  if (GNUNET_OK !=
+      GNUNET_CRYPTO_hash_from_string (filename, &identity.hashPubKey))
   {
     remove_garbage (fullname);
     return GNUNET_OK;
@@ -305,11 +302,10 @@ cron_scan_directory_data_hosts (void *cls,
   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 (DATA_HOST_FREQ,
-                                &cron_scan_directory_data_hosts, NULL);
+  GNUNET_SCHEDULER_add_delayed (DATA_HOST_FREQ, &cron_scan_directory_data_hosts,
+                                NULL);
 }
 
 
@@ -352,9 +348,7 @@ bind_address (const struct GNUNET_PeerIdentity *peer,
   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_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 |
@@ -425,14 +419,11 @@ discard_hosts_helper (void *cls, const char *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_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 |
@@ -461,8 +452,8 @@ cron_clean_data_hosts (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     return;
   now = GNUNET_TIME_absolute_get ();
   GNUNET_DISK_directory_scan (networkIdDirectory, &discard_hosts_helper, &now);
-  GNUNET_SCHEDULER_add_delayed (DATA_HOST_CLEAN_FREQ,
-                                &cron_clean_data_hosts, NULL);
+  GNUNET_SCHEDULER_add_delayed (DATA_HOST_CLEAN_FREQ, &cron_clean_data_hosts,
+                                NULL);
 }
 
 
@@ -474,8 +465,7 @@ cron_clean_data_hosts (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * @param message the actual message
  */
 static void
-handle_hello (void *cls,
-              struct GNUNET_SERVER_Client *client,
+handle_hello (void *cls, struct GNUNET_SERVER_Client *client,
               const struct GNUNET_MessageHeader *message)
 {
   const struct GNUNET_HELLO_Message *hello;
@@ -489,8 +479,7 @@ handle_hello (void *cls,
     return;
   }
 #if DEBUG_PEERINFO
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "`%s' message received for peer `%4s'\n",
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "`%s' message received for peer `%4s'\n",
               "HELLO", GNUNET_i2s (&pid));
 #endif
   bind_address (&pid, hello);
@@ -506,8 +495,7 @@ 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;
@@ -516,13 +504,11 @@ handle_get (void *cls,
   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",
+  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,
+  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);
@@ -538,8 +524,7 @@ 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;
@@ -563,8 +548,8 @@ do_notify_entry (void *cls, const GNUNET_HashCode * key, void *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;
 }
@@ -578,8 +563,7 @@ do_notify_entry (void *cls, const GNUNET_HashCode * key, void *value)
  * @param message the actual message
  */
 static void
-handle_notify (void *cls,
-               struct GNUNET_SERVER_Client *client,
+handle_notify (void *cls, struct GNUNET_SERVER_Client *client,
                const struct GNUNET_MessageHeader *message)
 {
 #if DEBUG_PEERINFO
@@ -630,8 +614,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * @param cfg configuration to use
  */
 static void
-run (void *cls,
-     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[] = {
@@ -649,8 +632,7 @@ run (void *cls,
   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);
@@ -658,8 +640,8 @@ run (void *cls,
                                       &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_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
+                                NULL);
   GNUNET_SERVER_add_handlers (server, handlers);
 }
 
@@ -676,11 +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;
 }