1 files changed, 651 insertions, 646 deletions

diff --git a/src/peerinfo/gnunet-service-peerinfo.c b/src/peerinfo/gnunet-service-peerinfo.c
index 25a3fabd7..27e0337ee 100644
--- a/src/peerinfo/gnunet-service-peerinfo.c
+++ b/src/peerinfo/gnunet-service-peerinfo.c
@@ -39,19 +39,20 @@
  * How often do we scan the HOST_DIR for new entries?
  */
 #define DATA_HOST_FREQ \
-  GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 15)
+  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
 
 /**
  * How often do we discard old entries in data/hosts/?
  */
 #define DATA_HOST_CLEAN_FREQ \
-  GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 60)
+  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 60)
 
 
 /**
  * In-memory cache of known hosts.
  */
-struct HostEntry {
+struct HostEntry
+{
   /**
    * Identity of the peer.
    */
@@ -72,7 +73,8 @@ struct HostEntry {
 /**
  * Result of reading a file
  */
-struct ReadHostFileContext {
+struct ReadHostFileContext
+{
   /**
    * Hello for the peer (can be NULL)
    */
@@ -132,7 +134,7 @@ static struct GNUNET_SCHEDULER_Task *cron_scan;
  * @return generated notification message
  */
 static struct InfoMessage *
-make_info_message(const struct HostEntry *he, int include_friend_only)
+make_info_message (const struct HostEntry *he, int include_friend_only)
 {
   struct InfoMessage *im;
   struct GNUNET_HELLO_Message *src;
@@ -142,12 +144,12 @@ make_info_message(const struct HostEntry *he, int include_friend_only)
     src = he->friend_only_hello;
   else
     src = he->hello;
-  hs = (NULL == src) ? 0 : GNUNET_HELLO_size(src);
-  im = GNUNET_malloc(sizeof(struct InfoMessage) + hs);
-  im->header.size = htons(hs + sizeof(struct InfoMessage));
-  im->header.type = htons(GNUNET_MESSAGE_TYPE_PEERINFO_INFO);
+  hs = (NULL == src) ? 0 : GNUNET_HELLO_size (src);
+  im = GNUNET_malloc (sizeof(struct InfoMessage) + hs);
+  im->header.size = htons (hs + sizeof(struct InfoMessage));
+  im->header.type = htons (GNUNET_MESSAGE_TYPE_PEERINFO_INFO);
   im->peer = he->identity;
-  GNUNET_memcpy(&im[1], src, hs);
+  GNUNET_memcpy (&im[1], src, hs);
   return im;
 }
 
@@ -161,19 +163,19 @@ make_info_message(const struct HostEntry *he, int include_friend_only)
  * @return #GNUNET_NO if expiration smaller than the current time
  */
 static int
-discard_expired(void *cls,
-                const struct GNUNET_HELLO_Address *address,
-                struct GNUNET_TIME_Absolute expiration)
+discard_expired (void *cls,
+                 const struct GNUNET_HELLO_Address *address,
+                 struct GNUNET_TIME_Absolute expiration)
 {
   const struct GNUNET_TIME_Absolute *now = cls;
 
   if (now->abs_value_us > expiration.abs_value_us)
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_INFO,
-                 _("Removing expired address of transport `%s'\n"),
-                 address->transport_name);
-      return GNUNET_NO;
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                _ ("Removing expired address of transport `%s'\n"),
+                address->transport_name);
+    return GNUNET_NO;
+  }
   return GNUNET_OK;
 }
 
@@ -187,14 +189,14 @@ discard_expired(void *cls,
  * @return #GNUNET_OK (always)
  */
 static int
-count_addresses(void *cls,
-                const struct GNUNET_HELLO_Address *address,
-                struct GNUNET_TIME_Absolute expiration)
+count_addresses (void *cls,
+                 const struct GNUNET_HELLO_Address *address,
+                 struct GNUNET_TIME_Absolute expiration)
 {
   unsigned int *cnt = cls;
 
-  (void)address;
-  (void)expiration;
+  (void) address;
+  (void) expiration;
   (*cnt)++;
   return GNUNET_OK;
 }
@@ -208,17 +210,17 @@ count_addresses(void *cls,
  * @return filename of the form DIRECTORY/HOSTID
  */
 static char *
-get_host_filename(const struct GNUNET_PeerIdentity *id)
+get_host_filename (const struct GNUNET_PeerIdentity *id)
 {
   char *fn;
 
   if (NULL == networkIdDirectory)
     return NULL;
-  GNUNET_asprintf(&fn,
-                  "%s%s%s",
-                  networkIdDirectory,
-                  DIR_SEPARATOR_STR,
-                  GNUNET_i2s_full(id));
+  GNUNET_asprintf (&fn,
+                   "%s%s%s",
+                   networkIdDirectory,
+                   DIR_SEPARATOR_STR,
+                   GNUNET_i2s_full (id));
   return fn;
 }
 
@@ -230,24 +232,24 @@ get_host_filename(const struct GNUNET_PeerIdentity *id)
  * @param entry entry to broadcast about
  */
 static void
-notify_all(struct HostEntry *entry)
+notify_all (struct HostEntry *entry)
 {
   struct InfoMessage *msg_pub;
   struct InfoMessage *msg_friend;
 
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Notifying all clients about peer `%s'\n",
-             GNUNET_i2s(&entry->identity));
-  msg_pub = make_info_message(entry, GNUNET_NO);
-  GNUNET_notification_context_broadcast(notify_list,
-                                        &msg_pub->header,
-                                        GNUNET_NO);
-  GNUNET_free(msg_pub);
-  msg_friend = make_info_message(entry, GNUNET_YES);
-  GNUNET_notification_context_broadcast(notify_friend_only_list,
-                                        &msg_friend->header,
-                                        GNUNET_NO);
-  GNUNET_free(msg_friend);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Notifying all clients about peer `%s'\n",
+              GNUNET_i2s (&entry->identity));
+  msg_pub = make_info_message (entry, GNUNET_NO);
+  GNUNET_notification_context_broadcast (notify_list,
+                                         &msg_pub->header,
+                                         GNUNET_NO);
+  GNUNET_free (msg_pub);
+  msg_friend = make_info_message (entry, GNUNET_YES);
+  GNUNET_notification_context_broadcast (notify_friend_only_list,
+                                         &msg_friend->header,
+                                         GNUNET_NO);
+  GNUNET_free (msg_friend);
 }
 
 
@@ -258,8 +260,8 @@ notify_all(struct HostEntry *entry)
  * @param hello the verified (!) hello message
  */
 static void
-update_hello(const struct GNUNET_PeerIdentity *peer,
-             const struct GNUNET_HELLO_Message *hello);
+update_hello (const struct GNUNET_PeerIdentity *peer,
+              const struct GNUNET_HELLO_Message *hello);
 
 
 /**
@@ -274,9 +276,9 @@ update_hello(const struct GNUNET_PeerIdentity *peer,
  * @param r ReadHostFileContext to store the resutl
  */
 static void
-read_host_file(const char *fn,
-               int unlink_garbage,
-               struct ReadHostFileContext *r)
+read_host_file (const char *fn,
+                int unlink_garbage,
+                struct ReadHostFileContext *r)
 {
   char buffer[GNUNET_MAX_MESSAGE_SIZE - 1] GNUNET_ALIGN;
   ssize_t size_total;
@@ -290,114 +292,114 @@ read_host_file(const char *fn,
   r->friend_only_hello = NULL;
   r->hello = NULL;
 
-  if (GNUNET_YES != GNUNET_DISK_file_test(fn))
+  if (GNUNET_YES != GNUNET_DISK_file_test (fn))
     return;
-  size_total = GNUNET_DISK_fn_read(fn, buffer, sizeof(buffer));
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Read %d bytes from `%s'\n",
-             (int)size_total,
-             fn);
+  size_total = GNUNET_DISK_fn_read (fn, buffer, sizeof(buffer));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Read %d bytes from `%s'\n",
+              (int) size_total,
+              fn);
   if ((size_total < 0) ||
-      (((size_t)size_total) < sizeof(struct GNUNET_MessageHeader)))
+      (((size_t) size_total) < sizeof(struct GNUNET_MessageHeader)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _ ("Failed to parse HELLO in file `%s': %s\n"),
+                fn,
+                "File has invalid size");
+    if ((GNUNET_YES == unlink_garbage) && (0 != unlink (fn)) &&
+        (ENOENT != errno))
+      GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", fn);
+    return;
+  }
+
+  read_pos = 0;
+  while (read_pos < (size_t) size_total)
+  {
+    hello = (const struct GNUNET_HELLO_Message *) &buffer[read_pos];
+    size_hello = GNUNET_HELLO_size (hello);
+    if ((0 == size_hello) || (((size_t) size_total) - read_pos < size_hello))
     {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                 _("Failed to parse HELLO in file `%s': %s\n"),
-                 fn,
-                 "File has invalid size");
-      if ((GNUNET_YES == unlink_garbage) && (0 != unlink(fn)) &&
-          (ENOENT != errno))
-        GNUNET_log_strerror_file(GNUNET_ERROR_TYPE_WARNING, "unlink", fn);
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  _ ("Failed to parse HELLO in file `%s'\n"),
+                  fn);
+      if (0 == read_pos)
+      {
+        if ((GNUNET_YES == unlink_garbage) && (0 != unlink (fn)) &&
+            (ENOENT != errno))
+          GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", fn);
+      }
+      else
+      {
+        if ((GNUNET_YES == unlink_garbage) && (0 != truncate (fn, read_pos)) &&
+            (ENOENT != errno))
+          GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "truncate", fn);
+      }
       return;
     }
 
-  read_pos = 0;
-  while (read_pos < (size_t)size_total)
+    now = GNUNET_TIME_absolute_get ();
+    hello_clean = GNUNET_HELLO_iterate_addresses (hello,
+                                                  GNUNET_YES,
+                                                  &discard_expired,
+                                                  &now);
+    if (NULL == hello_clean)
     {
-      hello = (const struct GNUNET_HELLO_Message *)&buffer[read_pos];
-      size_hello = GNUNET_HELLO_size(hello);
-      if ((0 == size_hello) || (((size_t)size_total) - read_pos < size_hello))
-        {
-          GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                     _("Failed to parse HELLO in file `%s'\n"),
-                     fn);
-          if (0 == read_pos)
-            {
-              if ((GNUNET_YES == unlink_garbage) && (0 != unlink(fn)) &&
-                  (ENOENT != errno))
-                GNUNET_log_strerror_file(GNUNET_ERROR_TYPE_WARNING, "unlink", fn);
-            }
-          else
-            {
-              if ((GNUNET_YES == unlink_garbage) && (0 != truncate(fn, read_pos)) &&
-                  (ENOENT != errno))
-                GNUNET_log_strerror_file(GNUNET_ERROR_TYPE_WARNING, "truncate", fn);
-            }
-          return;
-        }
-
-      now = GNUNET_TIME_absolute_get();
-      hello_clean = GNUNET_HELLO_iterate_addresses(hello,
-                                                   GNUNET_YES,
-                                                   &discard_expired,
-                                                   &now);
-      if (NULL == hello_clean)
-        {
-          GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                     _("Failed to parse HELLO in file `%s'\n"),
-                     fn);
-          if ((GNUNET_YES == unlink_garbage) && (0 != unlink(fn)) &&
-              (ENOENT != errno))
-            GNUNET_log_strerror_file(GNUNET_ERROR_TYPE_WARNING, "unlink", fn);
-          return;
-        }
-      left = 0;
-      (void)GNUNET_HELLO_iterate_addresses(hello_clean,
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  _ ("Failed to parse HELLO in file `%s'\n"),
+                  fn);
+      if ((GNUNET_YES == unlink_garbage) && (0 != unlink (fn)) &&
+          (ENOENT != errno))
+        GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", fn);
+      return;
+    }
+    left = 0;
+    (void) GNUNET_HELLO_iterate_addresses (hello_clean,
                                            GNUNET_NO,
                                            &count_addresses,
                                            &left);
 
-      if (0 == left)
-        {
-          GNUNET_free(hello_clean);
-          break;
-        }
-
-      if (GNUNET_NO == GNUNET_HELLO_is_friend_only(hello_clean))
-        {
-          if (NULL == r->hello)
-            r->hello = hello_clean;
-          else
-            {
-              GNUNET_break(0);
-              GNUNET_free(r->hello);
-              r->hello = hello_clean;
-            }
-        }
-      else
-        {
-          if (NULL == r->friend_only_hello)
-            r->friend_only_hello = hello_clean;
-          else
-            {
-              GNUNET_break(0);
-              GNUNET_free(r->friend_only_hello);
-              r->friend_only_hello = hello_clean;
-            }
-        }
-      read_pos += size_hello;
+    if (0 == left)
+    {
+      GNUNET_free (hello_clean);
+      break;
     }
 
-  if (0 == left)
+    if (GNUNET_NO == GNUNET_HELLO_is_friend_only (hello_clean))
     {
-      /* no addresses left, remove from disk */
-      if ((GNUNET_YES == unlink_garbage) && (0 != unlink(fn)))
-        GNUNET_log_strerror_file(GNUNET_ERROR_TYPE_WARNING, "unlink", fn);
+      if (NULL == r->hello)
+        r->hello = hello_clean;
+      else
+      {
+        GNUNET_break (0);
+        GNUNET_free (r->hello);
+        r->hello = hello_clean;
+      }
+    }
+    else
+    {
+      if (NULL == r->friend_only_hello)
+        r->friend_only_hello = hello_clean;
+      else
+      {
+        GNUNET_break (0);
+        GNUNET_free (r->friend_only_hello);
+        r->friend_only_hello = hello_clean;
+      }
     }
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Found `%s' and `%s' HELLO message in file\n",
-             (NULL != r->hello) ? "public" : "NON-public",
-             (NULL != r->friend_only_hello) ? "friend only"
-             : "NO friend only");
+    read_pos += size_hello;
+  }
+
+  if (0 == left)
+  {
+    /* no addresses left, remove from disk */
+    if ((GNUNET_YES == unlink_garbage) && (0 != unlink (fn)))
+      GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", fn);
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Found `%s' and `%s' HELLO message in file\n",
+              (NULL != r->hello) ? "public" : "NON-public",
+              (NULL != r->friend_only_hello) ? "friend only"
+              : "NO friend only");
 }
 
 
@@ -408,44 +410,44 @@ read_host_file(const char *fn,
  * @return the HostEntry
  */
 static struct HostEntry *
-add_host_to_known_hosts(const struct GNUNET_PeerIdentity *identity)
+add_host_to_known_hosts (const struct GNUNET_PeerIdentity *identity)
 {
   struct HostEntry *entry;
   struct ReadHostFileContext r;
   char *fn;
 
-  entry = GNUNET_CONTAINER_multipeermap_get(hostmap, identity);
+  entry = GNUNET_CONTAINER_multipeermap_get (hostmap, identity);
   if (NULL == entry)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Adding new peer `%s'\n",
+                GNUNET_i2s (identity));
+    GNUNET_STATISTICS_update (stats,
+                              gettext_noop ("# peers known"),
+                              1,
+                              GNUNET_NO);
+    entry = GNUNET_new (struct HostEntry);
+    entry->identity = *identity;
+    GNUNET_assert (GNUNET_OK ==
+                   GNUNET_CONTAINER_multipeermap_put (
+                     hostmap,
+                     &entry->identity,
+                     entry,
+                     GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+    notify_all (entry);
+    fn = get_host_filename (identity);
+    if (NULL != fn)
     {
-      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-                 "Adding new peer `%s'\n",
-                 GNUNET_i2s(identity));
-      GNUNET_STATISTICS_update(stats,
-                               gettext_noop("# peers known"),
-                               1,
-                               GNUNET_NO);
-      entry = GNUNET_new(struct HostEntry);
-      entry->identity = *identity;
-      GNUNET_assert(GNUNET_OK ==
-                    GNUNET_CONTAINER_multipeermap_put(
-                      hostmap,
-                      &entry->identity,
-                      entry,
-                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
-      notify_all(entry);
-      fn = get_host_filename(identity);
-      if (NULL != fn)
-        {
-          read_host_file(fn, GNUNET_YES, &r);
-          if (NULL != r.hello)
-            update_hello(identity, r.hello);
-          if (NULL != r.friend_only_hello)
-            update_hello(identity, r.friend_only_hello);
-          GNUNET_free_non_null(r.hello);
-          GNUNET_free_non_null(r.friend_only_hello);
-          GNUNET_free(fn);
-        }
+      read_host_file (fn, GNUNET_YES, &r);
+      if (NULL != r.hello)
+        update_hello (identity, r.hello);
+      if (NULL != r.friend_only_hello)
+        update_hello (identity, r.friend_only_hello);
+      GNUNET_free_non_null (r.hello);
+      GNUNET_free_non_null (r.friend_only_hello);
+      GNUNET_free (fn);
     }
+  }
   return entry;
 }
 
@@ -457,26 +459,27 @@ add_host_to_known_hosts(const struct GNUNET_PeerIdentity *identity)
  * @param fullname name of the file to remove
  */
 static void
-remove_garbage(const char *fullname)
+remove_garbage (const char *fullname)
 {
-  if (0 == unlink(fullname))
-    GNUNET_log(
+  if (0 == unlink (fullname))
+    GNUNET_log (
       GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
-      _(
+      _ (
         "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);
 }
 
 
 /**
  * Closure for #hosts_directory_scan_callback().
  */
-struct DirScanContext {
+struct DirScanContext
+{
   /**
    * #GNUNET_YES if we should remove files that are broken,
    * #GNUNET_NO if the directory we are iterating over should
@@ -502,7 +505,7 @@ struct DirScanContext {
  * @return #GNUNET_OK (continue iteration)
  */
 static int
-hosts_directory_scan_callback(void *cls, const char *fullname)
+hosts_directory_scan_callback (void *cls, const char *fullname)
 {
   struct DirScanContext *dsc = cls;
   struct GNUNET_PeerIdentity identity;
@@ -512,81 +515,81 @@ hosts_directory_scan_callback(void *cls, const char *fullname)
   struct GNUNET_PeerIdentity id_friend;
   struct GNUNET_PeerIdentity id;
 
-  if (GNUNET_YES != GNUNET_DISK_file_test(fullname))
+  if (GNUNET_YES != GNUNET_DISK_file_test (fullname))
     return GNUNET_OK; /* ignore non-files */
 
-  filename = strrchr(fullname, DIR_SEPARATOR);
-  if ((NULL == filename) || (1 > strlen(filename)))
+  filename = strrchr (fullname, DIR_SEPARATOR);
+  if ((NULL == filename) || (1 > strlen (filename)))
     filename = fullname;
   else
     filename++;
 
-  read_host_file(fullname, dsc->remove_files, &r);
+  read_host_file (fullname, dsc->remove_files, &r);
   if ((NULL == r.hello) && (NULL == r.friend_only_hello))
     return GNUNET_OK;
   if (NULL != r.friend_only_hello)
+  {
+    if (GNUNET_OK != GNUNET_HELLO_get_id (r.friend_only_hello, &id_friend))
     {
-      if (GNUNET_OK != GNUNET_HELLO_get_id(r.friend_only_hello, &id_friend))
-        {
-          if (GNUNET_YES == dsc->remove_files)
-            remove_garbage(fullname);
-          return GNUNET_OK;
-        }
-      id = id_friend;
+      if (GNUNET_YES == dsc->remove_files)
+        remove_garbage (fullname);
+      return GNUNET_OK;
     }
+    id = id_friend;
+  }
   if (NULL != r.hello)
+  {
+    if (GNUNET_OK != GNUNET_HELLO_get_id (r.hello, &id_public))
     {
-      if (GNUNET_OK != GNUNET_HELLO_get_id(r.hello, &id_public))
-        {
-          if (GNUNET_YES == dsc->remove_files)
-            remove_garbage(fullname);
-          return GNUNET_OK;
-        }
-      id = id_public;
+      if (GNUNET_YES == dsc->remove_files)
+        remove_garbage (fullname);
+      return GNUNET_OK;
     }
+    id = id_public;
+  }
 
   if ((NULL != r.hello) && (NULL != r.friend_only_hello) &&
-      (0 != GNUNET_memcmp(&id_friend, &id_public)))
+      (0 != GNUNET_memcmp (&id_friend, &id_public)))
+  {
+    /* HELLOs are not for the same peer */
+    GNUNET_break (0);
+    if (GNUNET_YES == dsc->remove_files)
+      remove_garbage (fullname);
+    return GNUNET_OK;
+  }
+  if (GNUNET_OK ==
+      GNUNET_CRYPTO_eddsa_public_key_from_string (filename,
+                                                  strlen (filename),
+                                                  &identity.public_key))
+  {
+    if (0 != GNUNET_memcmp (&id, &identity))
     {
       /* HELLOs are not for the same peer */
-      GNUNET_break(0);
+      GNUNET_break (0);
       if (GNUNET_YES == dsc->remove_files)
-        remove_garbage(fullname);
+        remove_garbage (fullname);
       return GNUNET_OK;
     }
-  if (GNUNET_OK ==
-      GNUNET_CRYPTO_eddsa_public_key_from_string(filename,
-                                                 strlen(filename),
-                                                 &identity.public_key))
-    {
-      if (0 != GNUNET_memcmp(&id, &identity))
-        {
-          /* HELLOs are not for the same peer */
-          GNUNET_break(0);
-          if (GNUNET_YES == dsc->remove_files)
-            remove_garbage(fullname);
-          return GNUNET_OK;
-        }
-    }
+  }
 
   /* ok, found something valid, remember HELLO */
-  add_host_to_known_hosts(&id);
+  add_host_to_known_hosts (&id);
   if (NULL != r.hello)
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-                 "Updating peer `%s' public HELLO \n",
-                 GNUNET_i2s(&id));
-      update_hello(&id, r.hello);
-      GNUNET_free(r.hello);
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Updating peer `%s' public HELLO \n",
+                GNUNET_i2s (&id));
+    update_hello (&id, r.hello);
+    GNUNET_free (r.hello);
+  }
   if (NULL != r.friend_only_hello)
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-                 "Updating peer `%s' friend only HELLO \n",
-                 GNUNET_i2s(&id));
-      update_hello(&id, r.friend_only_hello);
-      GNUNET_free(r.friend_only_hello);
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Updating peer `%s' friend only HELLO \n",
+                GNUNET_i2s (&id));
+    update_hello (&id, r.friend_only_hello);
+    GNUNET_free (r.friend_only_hello);
+  }
   dsc->matched++;
   return GNUNET_OK;
 }
@@ -598,39 +601,40 @@ hosts_directory_scan_callback(void *cls, const char *fullname)
  * @param cls unused
  */
 static void
-cron_scan_directory_data_hosts(void *cls)
+cron_scan_directory_data_hosts (void *cls)
 {
   static unsigned int retries;
   struct DirScanContext dsc;
 
-  (void)cls;
+  (void) cls;
   cron_scan = NULL;
-  if (GNUNET_SYSERR == GNUNET_DISK_directory_create(networkIdDirectory))
-    {
-      cron_scan =
-        GNUNET_SCHEDULER_add_delayed_with_priority(DATA_HOST_FREQ,
-                                                   GNUNET_SCHEDULER_PRIORITY_IDLE,
-                                                   &cron_scan_directory_data_hosts,
-                                                   NULL);
-      return;
-    }
+  if (GNUNET_SYSERR == GNUNET_DISK_directory_create (networkIdDirectory))
+  {
+    cron_scan =
+      GNUNET_SCHEDULER_add_delayed_with_priority (DATA_HOST_FREQ,
+                                                  GNUNET_SCHEDULER_PRIORITY_IDLE,
+                                                  &
+                                                  cron_scan_directory_data_hosts,
+                                                  NULL);
+    return;
+  }
   dsc.matched = 0;
   dsc.remove_files = GNUNET_YES;
-  GNUNET_log(GNUNET_ERROR_TYPE_INFO | GNUNET_ERROR_TYPE_BULK,
-             _("Scanning directory `%s'\n"),
-             networkIdDirectory);
-  GNUNET_DISK_directory_scan(networkIdDirectory,
-                             &hosts_directory_scan_callback,
-                             &dsc);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO | GNUNET_ERROR_TYPE_BULK,
+              _ ("Scanning directory `%s'\n"),
+              networkIdDirectory);
+  GNUNET_DISK_directory_scan (networkIdDirectory,
+                              &hosts_directory_scan_callback,
+                              &dsc);
   if ((0 == dsc.matched) && (0 == (++retries & 31)))
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
-               _("Still no peers found in `%s'!\n"),
-               networkIdDirectory);
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
+                _ ("Still no peers found in `%s'!\n"),
+                networkIdDirectory);
   cron_scan =
-    GNUNET_SCHEDULER_add_delayed_with_priority(DATA_HOST_FREQ,
-                                               GNUNET_SCHEDULER_PRIORITY_IDLE,
-                                               &cron_scan_directory_data_hosts,
-                                               NULL);
+    GNUNET_SCHEDULER_add_delayed_with_priority (DATA_HOST_FREQ,
+                                                GNUNET_SCHEDULER_PRIORITY_IDLE,
+                                                &cron_scan_directory_data_hosts,
+                                                NULL);
 }
 
 
@@ -642,29 +646,29 @@ cron_scan_directory_data_hosts(void *cls)
  * @return merged HELLO
  */
 static struct GNUNET_HELLO_Message *
-update_friend_hello(const struct GNUNET_HELLO_Message *hello,
-                    const struct GNUNET_HELLO_Message *friend_hello)
+update_friend_hello (const struct GNUNET_HELLO_Message *hello,
+                     const struct GNUNET_HELLO_Message *friend_hello)
 {
   struct GNUNET_HELLO_Message *res;
   struct GNUNET_HELLO_Message *tmp;
   struct GNUNET_PeerIdentity pid;
 
   if (NULL != friend_hello)
-    {
-      res = GNUNET_HELLO_merge(hello, friend_hello);
-      GNUNET_assert(GNUNET_YES == GNUNET_HELLO_is_friend_only(res));
-      return res;
-    }
-
-  if (GNUNET_OK != GNUNET_HELLO_get_id(hello, &pid))
-    {
-      GNUNET_break(0);
-      return NULL;
-    }
-  tmp = GNUNET_HELLO_create(&pid.public_key, NULL, NULL, GNUNET_YES);
-  res = GNUNET_HELLO_merge(hello, tmp);
-  GNUNET_free(tmp);
-  GNUNET_assert(GNUNET_YES == GNUNET_HELLO_is_friend_only(res));
+  {
+    res = GNUNET_HELLO_merge (hello, friend_hello);
+    GNUNET_assert (GNUNET_YES == GNUNET_HELLO_is_friend_only (res));
+    return res;
+  }
+
+  if (GNUNET_OK != GNUNET_HELLO_get_id (hello, &pid))
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
+  tmp = GNUNET_HELLO_create (&pid.public_key, NULL, NULL, GNUNET_YES);
+  res = GNUNET_HELLO_merge (hello, tmp);
+  GNUNET_free (tmp);
+  GNUNET_assert (GNUNET_YES == GNUNET_HELLO_is_friend_only (res));
   return res;
 }
 
@@ -676,8 +680,8 @@ update_friend_hello(const struct GNUNET_HELLO_Message *hello,
  * @param hello the verified (!) hello message
  */
 static void
-update_hello(const struct GNUNET_PeerIdentity *peer,
-             const struct GNUNET_HELLO_Message *hello)
+update_hello (const struct GNUNET_PeerIdentity *peer,
+              const struct GNUNET_HELLO_Message *hello)
 {
   char *fn;
   struct HostEntry *host;
@@ -692,144 +696,145 @@ update_hello(const struct GNUNET_PeerIdentity *peer,
   unsigned int pos;
   char *buffer;
 
-  host = GNUNET_CONTAINER_multipeermap_get(hostmap, peer);
-  GNUNET_assert(NULL != host);
+  host = GNUNET_CONTAINER_multipeermap_get (hostmap, peer);
+  GNUNET_assert (NULL != host);
 
-  friend_hello_type = GNUNET_HELLO_is_friend_only(hello);
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Updating %s HELLO for `%s'\n",
-             (GNUNET_YES == friend_hello_type) ? "friend-only" : "public",
-             GNUNET_i2s(peer));
+  friend_hello_type = GNUNET_HELLO_is_friend_only (hello);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Updating %s HELLO for `%s'\n",
+              (GNUNET_YES == friend_hello_type) ? "friend-only" : "public",
+              GNUNET_i2s (peer));
 
   dest = NULL;
   if (GNUNET_YES == friend_hello_type)
-    {
-      dest = &host->friend_only_hello;
-    }
+  {
+    dest = &host->friend_only_hello;
+  }
   else
-    {
-      dest = &host->hello;
-    }
+  {
+    dest = &host->hello;
+  }
 
   if (NULL == (*dest))
-    {
-      (*dest) = GNUNET_malloc(GNUNET_HELLO_size(hello));
-      GNUNET_memcpy((*dest), hello, GNUNET_HELLO_size(hello));
-    }
+  {
+    (*dest) = GNUNET_malloc (GNUNET_HELLO_size (hello));
+    GNUNET_memcpy ((*dest), hello, GNUNET_HELLO_size (hello));
+  }
   else
+  {
+    mrg = GNUNET_HELLO_merge ((*dest), hello);
+    delta = GNUNET_HELLO_equals (mrg, (*dest), GNUNET_TIME_absolute_get ());
+    if (delta.abs_value_us == GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us)
     {
-      mrg = GNUNET_HELLO_merge((*dest), hello);
-      delta = GNUNET_HELLO_equals(mrg, (*dest), GNUNET_TIME_absolute_get());
-      if (delta.abs_value_us == GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us)
-        {
-          /* no differences, just ignore the update */
-          GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-                     "No change in %s HELLO for `%s'\n",
-                     (GNUNET_YES == friend_hello_type) ? "friend-only" : "public",
-                     GNUNET_i2s(peer));
-          GNUNET_free(mrg);
-          return;
-        }
-      GNUNET_free((*dest));
-      (*dest) = mrg;
+      /* no differences, just ignore the update */
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "No change in %s HELLO for `%s'\n",
+                  (GNUNET_YES == friend_hello_type) ? "friend-only" : "public",
+                  GNUNET_i2s (peer));
+      GNUNET_free (mrg);
+      return;
     }
+    GNUNET_free ((*dest));
+    (*dest) = mrg;
+  }
 
   if ((NULL != (host->hello)) && (GNUNET_NO == friend_hello_type))
-    {
-      /* Update friend only hello */
-      mrg = update_friend_hello(host->hello, host->friend_only_hello);
-      if (NULL != host->friend_only_hello)
-        GNUNET_free(host->friend_only_hello);
-      host->friend_only_hello = mrg;
-    }
+  {
+    /* Update friend only hello */
+    mrg = update_friend_hello (host->hello, host->friend_only_hello);
+    if (NULL != host->friend_only_hello)
+      GNUNET_free (host->friend_only_hello);
+    host->friend_only_hello = mrg;
+  }
 
   if (NULL != host->hello)
-    GNUNET_assert((GNUNET_NO == GNUNET_HELLO_is_friend_only(host->hello)));
+    GNUNET_assert ((GNUNET_NO == GNUNET_HELLO_is_friend_only (host->hello)));
   if (NULL != host->friend_only_hello)
-    GNUNET_assert(
-      (GNUNET_YES == GNUNET_HELLO_is_friend_only(host->friend_only_hello)));
-
-  fn = get_host_filename(peer);
-  if ((NULL != fn) && (GNUNET_OK == GNUNET_DISK_directory_create_for_file(fn)))
-    {
-      store_hello = GNUNET_NO;
-      size = 0;
-      cnt = 0;
-      if (NULL != host->hello)
-        (void)GNUNET_HELLO_iterate_addresses(host->hello,
+    GNUNET_assert (
+      (GNUNET_YES == GNUNET_HELLO_is_friend_only (host->friend_only_hello)));
+
+  fn = get_host_filename (peer);
+  if ((NULL != fn) && (GNUNET_OK == GNUNET_DISK_directory_create_for_file (fn)))
+  {
+    store_hello = GNUNET_NO;
+    size = 0;
+    cnt = 0;
+    if (NULL != host->hello)
+      (void) GNUNET_HELLO_iterate_addresses (host->hello,
                                              GNUNET_NO,
                                              &count_addresses,
                                              &cnt);
-      if (cnt > 0)
-        {
-          store_hello = GNUNET_YES;
-          size += GNUNET_HELLO_size(host->hello);
-        }
-      cnt = 0;
-      if (NULL != host->friend_only_hello)
-        (void)GNUNET_HELLO_iterate_addresses(host->friend_only_hello,
+    if (cnt > 0)
+    {
+      store_hello = GNUNET_YES;
+      size += GNUNET_HELLO_size (host->hello);
+    }
+    cnt = 0;
+    if (NULL != host->friend_only_hello)
+      (void) GNUNET_HELLO_iterate_addresses (host->friend_only_hello,
                                              GNUNET_NO,
                                              &count_addresses,
                                              &cnt);
-      store_friend_hello = GNUNET_NO;
-      if (0 < cnt)
-        {
-          store_friend_hello = GNUNET_YES;
-          size += GNUNET_HELLO_size(host->friend_only_hello);
-        }
-
-      if ((GNUNET_NO == store_hello) && (GNUNET_NO == store_friend_hello))
-        {
-          /* no valid addresses, don't put HELLO on disk; in fact,
-             if one exists on disk, remove it */
-          (void)unlink(fn);
-        }
+    store_friend_hello = GNUNET_NO;
+    if (0 < cnt)
+    {
+      store_friend_hello = GNUNET_YES;
+      size += GNUNET_HELLO_size (host->friend_only_hello);
+    }
+
+    if ((GNUNET_NO == store_hello) && (GNUNET_NO == store_friend_hello))
+    {
+      /* no valid addresses, don't put HELLO on disk; in fact,
+         if one exists on disk, remove it */
+      (void) unlink (fn);
+    }
+    else
+    {
+      buffer = GNUNET_malloc (size);
+      pos = 0;
+
+      if (GNUNET_YES == store_hello)
+      {
+        GNUNET_memcpy (buffer, host->hello, GNUNET_HELLO_size (host->hello));
+        pos += GNUNET_HELLO_size (host->hello);
+      }
+      if (GNUNET_YES == store_friend_hello)
+      {
+        GNUNET_memcpy (&buffer[pos],
+                       host->friend_only_hello,
+                       GNUNET_HELLO_size (host->friend_only_hello));
+        pos += GNUNET_HELLO_size (host->friend_only_hello);
+      }
+      GNUNET_assert (pos == size);
+
+      if (GNUNET_SYSERR == GNUNET_DISK_fn_write (fn,
+                                                 buffer,
+                                                 size,
+                                                 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);
       else
-        {
-          buffer = GNUNET_malloc(size);
-          pos = 0;
-
-          if (GNUNET_YES == store_hello)
-            {
-              GNUNET_memcpy(buffer, host->hello, GNUNET_HELLO_size(host->hello));
-              pos += GNUNET_HELLO_size(host->hello);
-            }
-          if (GNUNET_YES == store_friend_hello)
-            {
-              GNUNET_memcpy(&buffer[pos],
-                            host->friend_only_hello,
-                            GNUNET_HELLO_size(host->friend_only_hello));
-              pos += GNUNET_HELLO_size(host->friend_only_hello);
-            }
-          GNUNET_assert(pos == size);
-
-          if (GNUNET_SYSERR == GNUNET_DISK_fn_write(fn,
-                                                    buffer,
-                                                    size,
-                                                    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);
-          else
-            GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-                       "Stored %s %s HELLO in %s  with total size %u\n",
-                       (GNUNET_YES == store_friend_hello) ? "friend-only" : "",
-                       (GNUNET_YES == store_hello) ? "public" : "",
-                       fn,
-                       size);
-          GNUNET_free(buffer);
-        }
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                    "Stored %s %s HELLO in %s  with total size %u\n",
+                    (GNUNET_YES == store_friend_hello) ? "friend-only" : "",
+                    (GNUNET_YES == store_hello) ? "public" : "",
+                    fn,
+                    size);
+      GNUNET_free (buffer);
     }
-  GNUNET_free_non_null(fn);
-  notify_all(host);
+  }
+  GNUNET_free_non_null (fn);
+  notify_all (host);
 }
 
 
 /**
  * Closure for #add_to_tc()
  */
-struct TransmitContext {
+struct TransmitContext
+{
   /**
    * Client to transmit to
    */
@@ -851,7 +856,7 @@ struct TransmitContext {
  * @return #GNUNET_YES (continue to iterate)
  */
 static int
-add_to_tc(void *cls, const struct GNUNET_PeerIdentity *key, void *value)
+add_to_tc (void *cls, const struct GNUNET_PeerIdentity *key, void *value)
 {
   struct TransmitContext *tc = cls;
   struct HostEntry *pos = value;
@@ -862,38 +867,38 @@ add_to_tc(void *cls, const struct GNUNET_PeerIdentity *key, void *value)
   hs = 0;
 
   if ((NULL != pos->hello) && (GNUNET_NO == tc->friend_only))
-    {
-      /* Copy public HELLO */
-      hs = GNUNET_HELLO_size(pos->hello);
-      GNUNET_assert(hs < GNUNET_MAX_MESSAGE_SIZE - sizeof(struct InfoMessage));
-      env = GNUNET_MQ_msg_extra(im, hs, GNUNET_MESSAGE_TYPE_PEERINFO_INFO);
-      GNUNET_memcpy(&im[1], pos->hello, hs);
-      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-                 "Sending public HELLO with size %u for peer `%s'\n",
-                 hs,
-                 GNUNET_i2s(key));
-    }
+  {
+    /* Copy public HELLO */
+    hs = GNUNET_HELLO_size (pos->hello);
+    GNUNET_assert (hs < GNUNET_MAX_MESSAGE_SIZE - sizeof(struct InfoMessage));
+    env = GNUNET_MQ_msg_extra (im, hs, GNUNET_MESSAGE_TYPE_PEERINFO_INFO);
+    GNUNET_memcpy (&im[1], pos->hello, hs);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Sending public HELLO with size %u for peer `%s'\n",
+                hs,
+                GNUNET_i2s (key));
+  }
   else if ((NULL != pos->friend_only_hello) && (GNUNET_YES == tc->friend_only))
-    {
-      /* Copy friend only HELLO */
-      hs = GNUNET_HELLO_size(pos->friend_only_hello);
-      GNUNET_assert(hs < GNUNET_MAX_MESSAGE_SIZE - sizeof(struct InfoMessage));
-      env = GNUNET_MQ_msg_extra(im, hs, GNUNET_MESSAGE_TYPE_PEERINFO_INFO);
-      GNUNET_memcpy(&im[1], pos->friend_only_hello, hs);
-      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-                 "Sending friend-only HELLO with size %u for peer `%s'\n",
-                 hs,
-                 GNUNET_i2s(key));
-    }
+  {
+    /* Copy friend only HELLO */
+    hs = GNUNET_HELLO_size (pos->friend_only_hello);
+    GNUNET_assert (hs < GNUNET_MAX_MESSAGE_SIZE - sizeof(struct InfoMessage));
+    env = GNUNET_MQ_msg_extra (im, hs, GNUNET_MESSAGE_TYPE_PEERINFO_INFO);
+    GNUNET_memcpy (&im[1], pos->friend_only_hello, hs);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Sending friend-only HELLO with size %u for peer `%s'\n",
+                hs,
+                GNUNET_i2s (key));
+  }
   else
-    {
-      env = GNUNET_MQ_msg(im, GNUNET_MESSAGE_TYPE_PEERINFO_INFO);
-      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-                 "Adding no HELLO for peer `%s'\n",
-                 GNUNET_i2s(key));
-    }
+  {
+    env = GNUNET_MQ_msg (im, GNUNET_MESSAGE_TYPE_PEERINFO_INFO);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Adding no HELLO for peer `%s'\n",
+                GNUNET_i2s (key));
+  }
   im->peer = pos->identity;
-  GNUNET_MQ_send(GNUNET_SERVICE_client_get_mq(tc->client), env);
+  GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (tc->client), env);
   return GNUNET_YES;
 }
 
@@ -906,7 +911,7 @@ add_to_tc(void *cls, const struct GNUNET_PeerIdentity *key, void *value)
  * @return #GNUNET_OK (continue iteration)
  */
 static int
-discard_hosts_helper(void *cls, const char *fn)
+discard_hosts_helper (void *cls, const char *fn)
 {
   struct GNUNET_TIME_Absolute *now = cls;
   char buffer[GNUNET_MAX_MESSAGE_SIZE - 1] GNUNET_ALIGN;
@@ -921,82 +926,82 @@ discard_hosts_helper(void *cls, const char *fn)
   char *writebuffer;
   uint64_t fsize;
 
-  if (GNUNET_OK != GNUNET_DISK_file_size(fn, &fsize, GNUNET_YES, GNUNET_YES))
-    {
-      GNUNET_log_strerror_file(GNUNET_ERROR_TYPE_WARNING |
-                               GNUNET_ERROR_TYPE_BULK,
-                               "fstat",
-                               fn);
-      return GNUNET_OK;
-    }
-  read_size = GNUNET_DISK_fn_read(fn, buffer, sizeof(buffer));
+  if (GNUNET_OK != GNUNET_DISK_file_size (fn, &fsize, GNUNET_YES, GNUNET_YES))
+  {
+    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING
+                              | GNUNET_ERROR_TYPE_BULK,
+                              "fstat",
+                              fn);
+    return GNUNET_OK;
+  }
+  read_size = GNUNET_DISK_fn_read (fn, buffer, sizeof(buffer));
 
-  if ((read_size < (int)sizeof(struct GNUNET_MessageHeader)) ||
+  if ((read_size < (int) sizeof(struct GNUNET_MessageHeader)) ||
       (fsize > GNUNET_MAX_MESSAGE_SIZE))
-    {
-      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;
+  }
 
-  writebuffer = GNUNET_malloc(read_size);
+  writebuffer = GNUNET_malloc (read_size);
   read_pos = 0;
   write_pos = 0;
   while (read_pos < read_size)
+  {
+    /* Check each HELLO */
+    hello = (const struct GNUNET_HELLO_Message *) &buffer[read_pos];
+    cur_hello_size = GNUNET_HELLO_size (hello);
+    if (0 == cur_hello_size)
     {
-      /* Check each HELLO */
-      hello = (const struct GNUNET_HELLO_Message *)&buffer[read_pos];
-      cur_hello_size = GNUNET_HELLO_size(hello);
-      if (0 == cur_hello_size)
-        {
-          /* Invalid data, discard */
-          if (0 != unlink(fn))
-            GNUNET_log_strerror_file(GNUNET_ERROR_TYPE_WARNING |
-                                     GNUNET_ERROR_TYPE_BULK,
-                                     "unlink",
-                                     fn);
-          GNUNET_free(writebuffer);
-          return GNUNET_OK;
-        }
-      new_hello =
-        GNUNET_HELLO_iterate_addresses(hello, GNUNET_YES, &discard_expired, now);
-      cnt = 0;
-      if (NULL != new_hello)
-        (void)GNUNET_HELLO_iterate_addresses(hello,
+      /* Invalid data, discard */
+      if (0 != unlink (fn))
+        GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING
+                                  | GNUNET_ERROR_TYPE_BULK,
+                                  "unlink",
+                                  fn);
+      GNUNET_free (writebuffer);
+      return GNUNET_OK;
+    }
+    new_hello =
+      GNUNET_HELLO_iterate_addresses (hello, GNUNET_YES, &discard_expired, now);
+    cnt = 0;
+    if (NULL != new_hello)
+      (void) GNUNET_HELLO_iterate_addresses (hello,
                                              GNUNET_NO,
                                              &count_addresses,
                                              &cnt);
-      if ((NULL != new_hello) && (0 < cnt))
-        {
-          /* Store new HELLO to write it when done */
-          new_hello_size = GNUNET_HELLO_size(new_hello);
-          GNUNET_memcpy(&writebuffer[write_pos], new_hello, new_hello_size);
-          write_pos += new_hello_size;
-        }
-      read_pos += cur_hello_size;
-      GNUNET_free_non_null(new_hello);
-    }
-
-  if (0 < write_pos)
+    if ((NULL != new_hello) && (0 < cnt))
     {
-      GNUNET_DISK_fn_write(fn,
-                           writebuffer,
-                           write_pos,
-                           GNUNET_DISK_PERM_USER_READ |
-                           GNUNET_DISK_PERM_USER_WRITE |
-                           GNUNET_DISK_PERM_GROUP_READ |
-                           GNUNET_DISK_PERM_OTHER_READ);
+      /* Store new HELLO to write it when done */
+      new_hello_size = GNUNET_HELLO_size (new_hello);
+      GNUNET_memcpy (&writebuffer[write_pos], new_hello, new_hello_size);
+      write_pos += new_hello_size;
     }
-  else if (0 != unlink(fn))
-    GNUNET_log_strerror_file(GNUNET_ERROR_TYPE_WARNING |
-                             GNUNET_ERROR_TYPE_BULK,
-                             "unlink",
-                             fn);
+    read_pos += cur_hello_size;
+    GNUNET_free_non_null (new_hello);
+  }
 
-  GNUNET_free(writebuffer);
+  if (0 < write_pos)
+  {
+    GNUNET_DISK_fn_write (fn,
+                          writebuffer,
+                          write_pos,
+                          GNUNET_DISK_PERM_USER_READ
+                          | GNUNET_DISK_PERM_USER_WRITE
+                          | GNUNET_DISK_PERM_GROUP_READ
+                          | GNUNET_DISK_PERM_OTHER_READ);
+  }
+  else if (0 != unlink (fn))
+    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING
+                              | GNUNET_ERROR_TYPE_BULK,
+                              "unlink",
+                              fn);
+
+  GNUNET_free (writebuffer);
   return GNUNET_OK;
 }
 
@@ -1008,20 +1013,20 @@ discard_hosts_helper(void *cls, const char *fn)
  * @param cls unused
  */
 static void
-cron_clean_data_hosts(void *cls)
+cron_clean_data_hosts (void *cls)
 {
   struct GNUNET_TIME_Absolute now;
 
-  (void)cls;
+  (void) cls;
   cron_clean = NULL;
-  now = GNUNET_TIME_absolute_get();
-  GNUNET_log(GNUNET_ERROR_TYPE_INFO | GNUNET_ERROR_TYPE_BULK,
-             _("Cleaning up directory `%s'\n"),
-             networkIdDirectory);
-  GNUNET_DISK_directory_scan(networkIdDirectory, &discard_hosts_helper, &now);
-  cron_clean = GNUNET_SCHEDULER_add_delayed(DATA_HOST_CLEAN_FREQ,
-                                            &cron_clean_data_hosts,
-                                            NULL);
+  now = GNUNET_TIME_absolute_get ();
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO | GNUNET_ERROR_TYPE_BULK,
+              _ ("Cleaning up directory `%s'\n"),
+              networkIdDirectory);
+  GNUNET_DISK_directory_scan (networkIdDirectory, &discard_hosts_helper, &now);
+  cron_clean = GNUNET_SCHEDULER_add_delayed (DATA_HOST_CLEAN_FREQ,
+                                             &cron_clean_data_hosts,
+                                             NULL);
 }
 
 
@@ -1033,16 +1038,16 @@ cron_clean_data_hosts(void *cls)
  * @return #GNUNET_OK if @a hello is well-formed
  */
 static int
-check_hello(void *cls, const struct GNUNET_HELLO_Message *hello)
+check_hello (void *cls, const struct GNUNET_HELLO_Message *hello)
 {
   struct GNUNET_PeerIdentity pid;
 
-  (void)cls;
-  if (GNUNET_OK != GNUNET_HELLO_get_id(hello, &pid))
-    {
-      GNUNET_break(0);
-      return GNUNET_SYSERR;
-    }
+  (void) cls;
+  if (GNUNET_OK != GNUNET_HELLO_get_id (hello, &pid))
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
   return GNUNET_OK;
 }
 
@@ -1054,18 +1059,18 @@ check_hello(void *cls, const struct GNUNET_HELLO_Message *hello)
  * @param hello the actual message
  */
 static void
-handle_hello(void *cls, const struct GNUNET_HELLO_Message *hello)
+handle_hello (void *cls, const struct GNUNET_HELLO_Message *hello)
 {
   struct GNUNET_SERVICE_Client *client = cls;
   struct GNUNET_PeerIdentity pid;
 
-  GNUNET_assert(GNUNET_OK == GNUNET_HELLO_get_id(hello, &pid));
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "HELLO message received for peer `%s'\n",
-             GNUNET_i2s(&pid));
-  add_host_to_known_hosts(&pid);
-  update_hello(&pid, hello);
-  GNUNET_SERVICE_client_continue(client);
+  GNUNET_assert (GNUNET_OK == GNUNET_HELLO_get_id (hello, &pid));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "HELLO message received for peer `%s'\n",
+              GNUNET_i2s (&pid));
+  add_host_to_known_hosts (&pid);
+  update_hello (&pid, hello);
+  GNUNET_SERVICE_client_continue (client);
 }
 
 
@@ -1076,25 +1081,25 @@ handle_hello(void *cls, const struct GNUNET_HELLO_Message *hello)
  * @param lpm the actual message
  */
 static void
-handle_get(void *cls, const struct ListPeerMessage *lpm)
+handle_get (void *cls, const struct ListPeerMessage *lpm)
 {
   struct GNUNET_SERVICE_Client *client = cls;
   struct TransmitContext tcx;
   struct GNUNET_MessageHeader *msg;
   struct GNUNET_MQ_Envelope *env;
 
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "GET message received for peer `%s'\n",
-             GNUNET_i2s(&lpm->peer));
-  tcx.friend_only = ntohl(lpm->include_friend_only);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "GET message received for peer `%s'\n",
+              GNUNET_i2s (&lpm->peer));
+  tcx.friend_only = ntohl (lpm->include_friend_only);
   tcx.client = client;
-  GNUNET_CONTAINER_multipeermap_get_multiple(hostmap,
-                                             &lpm->peer,
-                                             &add_to_tc,
-                                             &tcx);
-  env = GNUNET_MQ_msg(msg, GNUNET_MESSAGE_TYPE_PEERINFO_INFO_END);
-  GNUNET_MQ_send(GNUNET_SERVICE_client_get_mq(client), env);
-  GNUNET_SERVICE_client_continue(client);
+  GNUNET_CONTAINER_multipeermap_get_multiple (hostmap,
+                                              &lpm->peer,
+                                              &add_to_tc,
+                                              &tcx);
+  env = GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_PEERINFO_INFO_END);
+  GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client), env);
+  GNUNET_SERVICE_client_continue (client);
 }
 
 
@@ -1105,20 +1110,20 @@ handle_get(void *cls, const struct ListPeerMessage *lpm)
  * @param lapm the actual message
  */
 static void
-handle_get_all(void *cls, const struct ListAllPeersMessage *lapm)
+handle_get_all (void *cls, const struct ListAllPeersMessage *lapm)
 {
   struct GNUNET_SERVICE_Client *client = cls;
   struct TransmitContext tcx;
   struct GNUNET_MQ_Envelope *env;
   struct GNUNET_MessageHeader *msg;
 
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "GET_ALL message received\n");
-  tcx.friend_only = ntohl(lapm->include_friend_only);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "GET_ALL message received\n");
+  tcx.friend_only = ntohl (lapm->include_friend_only);
   tcx.client = client;
-  GNUNET_CONTAINER_multipeermap_iterate(hostmap, &add_to_tc, &tcx);
-  env = GNUNET_MQ_msg(msg, GNUNET_MESSAGE_TYPE_PEERINFO_INFO_END);
-  GNUNET_MQ_send(GNUNET_SERVICE_client_get_mq(client), env);
-  GNUNET_SERVICE_client_continue(client);
+  GNUNET_CONTAINER_multipeermap_iterate (hostmap, &add_to_tc, &tcx);
+  env = GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_PEERINFO_INFO_END);
+  GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client), env);
+  GNUNET_SERVICE_client_continue (client);
 }
 
 
@@ -1129,7 +1134,7 @@ handle_get_all(void *cls, const struct ListAllPeersMessage *lapm)
  * @param nm the actual message
  */
 static void
-handle_notify(void *cls, const struct NotifyMessage *nm)
+handle_notify (void *cls, const struct NotifyMessage *nm)
 {
   struct GNUNET_SERVICE_Client *client = cls;
   struct GNUNET_MQ_Handle *mq;
@@ -1137,19 +1142,19 @@ handle_notify(void *cls, const struct NotifyMessage *nm)
   struct GNUNET_MQ_Envelope *env;
   struct GNUNET_MessageHeader *msg;
 
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "NOTIFY message received\n");
-  mq = GNUNET_SERVICE_client_get_mq(client);
-  GNUNET_SERVICE_client_mark_monitor(client);
-  if (ntohl(nm->include_friend_only))
-    GNUNET_notification_context_add(notify_friend_only_list, mq);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "NOTIFY message received\n");
+  mq = GNUNET_SERVICE_client_get_mq (client);
+  GNUNET_SERVICE_client_mark_monitor (client);
+  if (ntohl (nm->include_friend_only))
+    GNUNET_notification_context_add (notify_friend_only_list, mq);
   else
-    GNUNET_notification_context_add(notify_list, mq);
-  tcx.friend_only = ntohl(nm->include_friend_only);
+    GNUNET_notification_context_add (notify_list, mq);
+  tcx.friend_only = ntohl (nm->include_friend_only);
   tcx.client = client;
-  GNUNET_CONTAINER_multipeermap_iterate(hostmap, &add_to_tc, &tcx);
-  env = GNUNET_MQ_msg(msg, GNUNET_MESSAGE_TYPE_PEERINFO_INFO_END);
-  GNUNET_MQ_send(GNUNET_SERVICE_client_get_mq(client), env);
-  GNUNET_SERVICE_client_continue(client);
+  GNUNET_CONTAINER_multipeermap_iterate (hostmap, &add_to_tc, &tcx);
+  env = GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_PEERINFO_INFO_END);
+  GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client), env);
+  GNUNET_SERVICE_client_continue (client);
 }
 
 
@@ -1162,12 +1167,12 @@ handle_notify(void *cls, const struct NotifyMessage *nm)
  * @return @a client
  */
 static void *
-client_connect_cb(void *cls,
-                  struct GNUNET_SERVICE_Client *client,
-                  struct GNUNET_MQ_Handle *mq)
+client_connect_cb (void *cls,
+                   struct GNUNET_SERVICE_Client *client,
+                   struct GNUNET_MQ_Handle *mq)
 {
-  (void)cls;
-  (void)mq;
+  (void) cls;
+  (void) mq;
   return client;
 }
 
@@ -1180,12 +1185,12 @@ client_connect_cb(void *cls,
  * @param app_ctx should be @a client
  */
 static void
-client_disconnect_cb(void *cls,
-                     struct GNUNET_SERVICE_Client *client,
-                     void *app_ctx)
+client_disconnect_cb (void *cls,
+                      struct GNUNET_SERVICE_Client *client,
+                      void *app_ctx)
 {
-  (void)cls;
-  GNUNET_assert(app_ctx == client);
+  (void) cls;
+  GNUNET_assert (app_ctx == client);
 }
 
 
@@ -1198,15 +1203,15 @@ client_disconnect_cb(void *cls,
  * @return #GNUNET_YES (continue to iterate)
  */
 static int
-free_host_entry(void *cls, const struct GNUNET_PeerIdentity *key, void *value)
+free_host_entry (void *cls, const struct GNUNET_PeerIdentity *key, void *value)
 {
   struct HostEntry *he = value;
 
-  (void)cls;
-  (void)key;
-  GNUNET_free_non_null(he->hello);
-  GNUNET_free_non_null(he->friend_only_hello);
-  GNUNET_free(he);
+  (void) cls;
+  (void) key;
+  GNUNET_free_non_null (he->hello);
+  GNUNET_free_non_null (he->friend_only_hello);
+  GNUNET_free (he);
   return GNUNET_YES;
 }
 
@@ -1217,36 +1222,36 @@ free_host_entry(void *cls, const struct GNUNET_PeerIdentity *key, void *value)
  * @param cls unused
  */
 static void
-shutdown_task(void *cls)
+shutdown_task (void *cls)
 {
-  (void)cls;
-  GNUNET_notification_context_destroy(notify_list);
+  (void) cls;
+  GNUNET_notification_context_destroy (notify_list);
   notify_list = NULL;
-  GNUNET_notification_context_destroy(notify_friend_only_list);
+  GNUNET_notification_context_destroy (notify_friend_only_list);
   notify_friend_only_list = NULL;
 
-  GNUNET_CONTAINER_multipeermap_iterate(hostmap, &free_host_entry, NULL);
-  GNUNET_CONTAINER_multipeermap_destroy(hostmap);
+  GNUNET_CONTAINER_multipeermap_iterate (hostmap, &free_host_entry, NULL);
+  GNUNET_CONTAINER_multipeermap_destroy (hostmap);
   if (NULL != stats)
-    {
-      GNUNET_STATISTICS_destroy(stats, GNUNET_NO);
-      stats = NULL;
-    }
+  {
+    GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
+    stats = NULL;
+  }
   if (NULL != cron_clean)
-    {
-      GNUNET_SCHEDULER_cancel(cron_clean);
-      cron_clean = NULL;
-    }
+  {
+    GNUNET_SCHEDULER_cancel (cron_clean);
+    cron_clean = NULL;
+  }
   if (NULL != cron_scan)
-    {
-      GNUNET_SCHEDULER_cancel(cron_scan);
-      cron_scan = NULL;
-    }
+  {
+    GNUNET_SCHEDULER_cancel (cron_scan);
+    cron_scan = NULL;
+  }
   if (NULL != networkIdDirectory)
-    {
-      GNUNET_free(networkIdDirectory);
-      networkIdDirectory = NULL;
-    }
+  {
+    GNUNET_free (networkIdDirectory);
+    networkIdDirectory = NULL;
+  }
 }
 
 
@@ -1258,9 +1263,9 @@ shutdown_task(void *cls)
  * @param service the initialized service
  */
 static void
-run(void *cls,
-    const struct GNUNET_CONFIGURATION_Handle *cfg,
-    struct GNUNET_SERVICE_Handle *service)
+run (void *cls,
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_SERVICE_Handle *service)
 {
   char *peerdir;
   char *ip;
@@ -1268,95 +1273,95 @@ run(void *cls,
   int noio;
   int use_included;
 
-  (void)cls;
-  (void)service;
-  hostmap = GNUNET_CONTAINER_multipeermap_create(1024, GNUNET_YES);
-  stats = GNUNET_STATISTICS_create("peerinfo", cfg);
-  notify_list = GNUNET_notification_context_create(0);
-  notify_friend_only_list = GNUNET_notification_context_create(0);
-  noio = GNUNET_CONFIGURATION_get_value_yesno(cfg, "peerinfo", "NO_IO");
-  use_included = GNUNET_CONFIGURATION_get_value_yesno(cfg,
-                                                      "peerinfo",
-                                                      "USE_INCLUDED_HELLOS");
+  (void) cls;
+  (void) service;
+  hostmap = GNUNET_CONTAINER_multipeermap_create (1024, GNUNET_YES);
+  stats = GNUNET_STATISTICS_create ("peerinfo", cfg);
+  notify_list = GNUNET_notification_context_create (0);
+  notify_friend_only_list = GNUNET_notification_context_create (0);
+  noio = GNUNET_CONFIGURATION_get_value_yesno (cfg, "peerinfo", "NO_IO");
+  use_included = GNUNET_CONFIGURATION_get_value_yesno (cfg,
+                                                       "peerinfo",
+                                                       "USE_INCLUDED_HELLOS");
   if (GNUNET_SYSERR == use_included)
     use_included = GNUNET_NO;
-  GNUNET_SCHEDULER_add_shutdown(&shutdown_task, NULL);
+  GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
   if (GNUNET_YES != noio)
+  {
+    GNUNET_assert (
+      GNUNET_OK ==
+      GNUNET_CONFIGURATION_get_value_filename (cfg,
+                                               "peerinfo",
+                                               "HOSTS",
+                                               &networkIdDirectory));
+    if (GNUNET_OK != GNUNET_DISK_directory_create (networkIdDirectory))
     {
-      GNUNET_assert(
-        GNUNET_OK ==
-        GNUNET_CONFIGURATION_get_value_filename(cfg,
-                                                "peerinfo",
-                                                "HOSTS",
-                                                &networkIdDirectory));
-      if (GNUNET_OK != GNUNET_DISK_directory_create(networkIdDirectory))
-        {
-          GNUNET_SCHEDULER_shutdown();
-          return;
-        }
-
-      cron_scan =
-        GNUNET_SCHEDULER_add_with_priority(GNUNET_SCHEDULER_PRIORITY_IDLE,
-                                           &cron_scan_directory_data_hosts,
-                                           NULL);
-
-      cron_clean =
-        GNUNET_SCHEDULER_add_with_priority(GNUNET_SCHEDULER_PRIORITY_IDLE,
-                                           &cron_clean_data_hosts,
-                                           NULL);
-      if (GNUNET_YES == use_included)
-        {
-          ip = GNUNET_OS_installation_get_path(GNUNET_OS_IPK_DATADIR);
-          GNUNET_asprintf(&peerdir, "%shellos", ip);
-          GNUNET_free(ip);
-
-          GNUNET_log(GNUNET_ERROR_TYPE_INFO,
-                     _("Importing HELLOs from `%s'\n"),
-                     peerdir);
-          dsc.matched = 0;
-          dsc.remove_files = GNUNET_NO;
-
-          GNUNET_DISK_directory_scan(peerdir,
-                                     &hosts_directory_scan_callback,
-                                     &dsc);
-          GNUNET_free(peerdir);
-        }
-      else
-        {
-          GNUNET_log(GNUNET_ERROR_TYPE_INFO,
-                     _("Skipping import of included HELLOs\n"));
-        }
+      GNUNET_SCHEDULER_shutdown ();
+      return;
+    }
+
+    cron_scan =
+      GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
+                                          &cron_scan_directory_data_hosts,
+                                          NULL);
+
+    cron_clean =
+      GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
+                                          &cron_clean_data_hosts,
+                                          NULL);
+    if (GNUNET_YES == use_included)
+    {
+      ip = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR);
+      GNUNET_asprintf (&peerdir, "%shellos", ip);
+      GNUNET_free (ip);
+
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  _ ("Importing HELLOs from `%s'\n"),
+                  peerdir);
+      dsc.matched = 0;
+      dsc.remove_files = GNUNET_NO;
+
+      GNUNET_DISK_directory_scan (peerdir,
+                                  &hosts_directory_scan_callback,
+                                  &dsc);
+      GNUNET_free (peerdir);
+    }
+    else
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  _ ("Skipping import of included HELLOs\n"));
     }
+  }
 }
 
 
 /**
  * Define "main" method using service macro.
  */
-GNUNET_SERVICE_MAIN(
+GNUNET_SERVICE_MAIN (
   "peerinfo",
   GNUNET_SERVICE_OPTION_NONE,
   &run,
   &client_connect_cb,
   &client_disconnect_cb,
   NULL,
-  GNUNET_MQ_hd_var_size(hello,
-                        GNUNET_MESSAGE_TYPE_HELLO,
-                        struct GNUNET_HELLO_Message,
-                        NULL),
-  GNUNET_MQ_hd_fixed_size(get,
-                          GNUNET_MESSAGE_TYPE_PEERINFO_GET,
-                          struct ListPeerMessage,
-                          NULL),
-  GNUNET_MQ_hd_fixed_size(get_all,
-                          GNUNET_MESSAGE_TYPE_PEERINFO_GET_ALL,
-                          struct ListAllPeersMessage,
-                          NULL),
-  GNUNET_MQ_hd_fixed_size(notify,
-                          GNUNET_MESSAGE_TYPE_PEERINFO_NOTIFY,
-                          struct NotifyMessage,
-                          NULL),
-  GNUNET_MQ_handler_end());
+  GNUNET_MQ_hd_var_size (hello,
+                         GNUNET_MESSAGE_TYPE_HELLO,
+                         struct GNUNET_HELLO_Message,
+                         NULL),
+  GNUNET_MQ_hd_fixed_size (get,
+                           GNUNET_MESSAGE_TYPE_PEERINFO_GET,
+                           struct ListPeerMessage,
+                           NULL),
+  GNUNET_MQ_hd_fixed_size (get_all,
+                           GNUNET_MESSAGE_TYPE_PEERINFO_GET_ALL,
+                           struct ListAllPeersMessage,
+                           NULL),
+  GNUNET_MQ_hd_fixed_size (notify,
+                           GNUNET_MESSAGE_TYPE_PEERINFO_NOTIFY,
+                           struct NotifyMessage,
+                           NULL),
+  GNUNET_MQ_handler_end ());
 
 
 /* end of gnunet-service-peerinfo.c */