1 files changed, 108 insertions, 105 deletions

diff --git a/src/peerinfo/test_peerinfo_api_notify_friend_only.c b/src/peerinfo/test_peerinfo_api_notify_friend_only.c
index 80b5883de..7c5162102 100644
--- a/src/peerinfo/test_peerinfo_api_notify_friend_only.c
+++ b/src/peerinfo/test_peerinfo_api_notify_friend_only.c
@@ -34,7 +34,7 @@
 #include "gnunet_testing_lib.h"
 #include "peerinfo.h"
 
-#define TIMEOUT  GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 5)
+#define TIMEOUT  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
 
 static struct GNUNET_PEERINFO_Handle *h;
 static struct GNUNET_PEERINFO_NotifyContext *pnc_w_fo;
@@ -61,55 +61,55 @@ struct GNUNET_PeerIdentity pid;
 struct GNUNET_SCHEDULER_Task *timeout_task;
 
 static void
-end_badly(void *cls)
+end_badly (void *cls)
 {
   timeout_task = NULL;
-  GNUNET_break(0);
+  GNUNET_break (0);
   if (NULL != pnc_wo_fo)
-    {
-      GNUNET_PEERINFO_notify_cancel(pnc_wo_fo);
-      pnc_wo_fo = NULL;
-    }
+  {
+    GNUNET_PEERINFO_notify_cancel (pnc_wo_fo);
+    pnc_wo_fo = NULL;
+  }
   if (NULL != pnc_w_fo)
-    {
-      GNUNET_PEERINFO_notify_cancel(pnc_w_fo);
-      pnc_w_fo = NULL;
-    }
+  {
+    GNUNET_PEERINFO_notify_cancel (pnc_w_fo);
+    pnc_w_fo = NULL;
+  }
   if (NULL != h)
-    {
-      GNUNET_PEERINFO_disconnect(h);
-      h = NULL;
-    }
+  {
+    GNUNET_PEERINFO_disconnect (h);
+    h = NULL;
+  }
   global_ret = 255;
 }
 
 
 static void
-done(void *cls)
+done (void *cls)
 {
   if (NULL != pnc_w_fo)
-    GNUNET_PEERINFO_notify_cancel(pnc_w_fo);
+    GNUNET_PEERINFO_notify_cancel (pnc_w_fo);
   pnc_w_fo = NULL;
   if (NULL != pnc_wo_fo)
-    GNUNET_PEERINFO_notify_cancel(pnc_wo_fo);
+    GNUNET_PEERINFO_notify_cancel (pnc_wo_fo);
   pnc_wo_fo = NULL;
-  GNUNET_PEERINFO_disconnect(h);
+  GNUNET_PEERINFO_disconnect (h);
   h = NULL;
 
   if (NULL != timeout_task)
-    {
-      GNUNET_SCHEDULER_cancel(timeout_task);
-      timeout_task = NULL;
-    }
+  {
+    GNUNET_SCHEDULER_cancel (timeout_task);
+    timeout_task = NULL;
+  }
 
   if ((GNUNET_YES == res_cb_w_fo) && (GNUNET_NO == res_cb_wo_fo))
     global_ret = 0;
   else
-    GNUNET_break(0);
+    GNUNET_break (0);
 }
 
 static ssize_t
-address_generator(void *cls, size_t max, void *buf)
+address_generator (void *cls, size_t max, void *buf)
 {
   size_t *agc = cls;
   ssize_t ret;
@@ -117,137 +117,140 @@ address_generator(void *cls, size_t max, void *buf)
 
   if (0 == *agc)
     return GNUNET_SYSERR; /* Done */
-  memset(&address.peer, 0, sizeof(struct GNUNET_PeerIdentity));
+  memset (&address.peer, 0, sizeof(struct GNUNET_PeerIdentity));
   address.address = "Address";
   address.transport_name = "peerinfotest";
   address.address_length = *agc;
-  ret = GNUNET_HELLO_add_address(&address,
-                                 GNUNET_TIME_relative_to_absolute(GNUNET_TIME_UNIT_HOURS), buf, max);
+  ret = GNUNET_HELLO_add_address (&address,
+                                  GNUNET_TIME_relative_to_absolute (
+                                    GNUNET_TIME_UNIT_HOURS), buf, max);
   (*agc)--;
   return ret;
 }
 
 
 static void
-process_w_fo(void *cls,
-             const struct GNUNET_PeerIdentity *peer,
-             const struct GNUNET_HELLO_Message *hello,
-             const char *err_msg)
+process_w_fo (void *cls,
+              const struct GNUNET_PeerIdentity *peer,
+              const struct GNUNET_HELLO_Message *hello,
+              const char *err_msg)
 {
   if (err_msg != NULL)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _ ("Error in communication with PEERINFO service\n"));
+    GNUNET_SCHEDULER_add_now (&done, NULL);
+    return;
+  }
+
+  if (NULL != peer)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Received callback for peer `%s' %s HELLO\n", GNUNET_i2s (peer),
+                (NULL != hello) ? "with" : "without");
+
+    if (NULL == hello)
+      return;
+
+    if (GNUNET_NO == GNUNET_HELLO_is_friend_only (hello))
     {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                 _("Error in communication with PEERINFO service\n"));
-      GNUNET_SCHEDULER_add_now(&done, NULL);
+      GNUNET_break (0);
       return;
     }
 
-  if (NULL != peer)
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Received %s HELLO for peer `%s'\n",
+                (GNUNET_YES == GNUNET_HELLO_is_friend_only (hello)) ?
+                "friend only" : "public",
+                GNUNET_i2s (peer));
+    if (0 == GNUNET_memcmp (&pid, peer))
     {
-      GNUNET_log(GNUNET_ERROR_TYPE_INFO,
-                 "Received callback for peer `%s' %s HELLO\n", GNUNET_i2s(peer),
-                 (NULL != hello) ? "with" : "without");
-
-      if (NULL == hello)
-        return;
-
-      if (GNUNET_NO == GNUNET_HELLO_is_friend_only(hello))
-        {
-          GNUNET_break(0);
-          return;
-        }
-
-      GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Received %s HELLO for peer `%s'\n",
-                 (GNUNET_YES == GNUNET_HELLO_is_friend_only(hello)) ? "friend only" : "public",
-                 GNUNET_i2s(peer));
-      if (0 == GNUNET_memcmp(&pid, peer))
-        {
-          res_cb_w_fo = GNUNET_YES;
-          GNUNET_SCHEDULER_add_now(&done, NULL);
-        }
-      return;
+      res_cb_w_fo = GNUNET_YES;
+      GNUNET_SCHEDULER_add_now (&done, NULL);
     }
+    return;
+  }
 }
 
 static void
-process_wo_fo(void *cls, const struct GNUNET_PeerIdentity *peer,
-              const struct GNUNET_HELLO_Message *hello, const char *err_msg)
+process_wo_fo (void *cls, const struct GNUNET_PeerIdentity *peer,
+               const struct GNUNET_HELLO_Message *hello, const char *err_msg)
 {
   if (err_msg != NULL)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _ ("Error in communication with PEERINFO service\n"));
+    GNUNET_SCHEDULER_add_now (&done, NULL);
+    return;
+  }
+
+  if (NULL != peer)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Received callback for peer `%s' %s HELLO\n", GNUNET_i2s (peer),
+                (NULL != hello) ? "with" : "without");
+
+    if (NULL == hello)
+      return;
+
+    if (GNUNET_YES == GNUNET_HELLO_is_friend_only (hello))
     {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                 _("Error in communication with PEERINFO service\n"));
-      GNUNET_SCHEDULER_add_now(&done, NULL);
+      GNUNET_break (0);
       return;
     }
 
-  if (NULL != peer)
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Received %s HELLO for peer `%s'\n",
+                (GNUNET_YES == GNUNET_HELLO_is_friend_only (hello)) ?
+                "friend only" : "public",
+                GNUNET_i2s (peer));
+    if (0 == GNUNET_memcmp (&pid, peer))
     {
-      GNUNET_log(GNUNET_ERROR_TYPE_INFO,
-                 "Received callback for peer `%s' %s HELLO\n", GNUNET_i2s(peer),
-                 (NULL != hello) ? "with" : "without");
-
-      if (NULL == hello)
-        return;
-
-      if (GNUNET_YES == GNUNET_HELLO_is_friend_only(hello))
-        {
-          GNUNET_break(0);
-          return;
-        }
-
-      GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Received %s HELLO for peer `%s'\n",
-                 (GNUNET_YES == GNUNET_HELLO_is_friend_only(hello)) ? "friend only" : "public",
-                 GNUNET_i2s(peer));
-      if (0 == GNUNET_memcmp(&pid, peer))
-        {
-          GNUNET_break(0);
-          res_cb_wo_fo = GNUNET_YES;
-        }
+      GNUNET_break (0);
+      res_cb_wo_fo = GNUNET_YES;
     }
+  }
 }
 
 
 static void
-add_peer()
+add_peer ()
 {
   struct GNUNET_HELLO_Message *h2;
   size_t agc;
 
   agc = 2;
-  memset(&pid, 32, sizeof(pid));
-  h2 = GNUNET_HELLO_create(&pid.public_key, &address_generator, &agc,
-                           GNUNET_YES);
-  GNUNET_PEERINFO_add_peer(h, h2, NULL, NULL);
-  GNUNET_free(h2);
+  memset (&pid, 32, sizeof(pid));
+  h2 = GNUNET_HELLO_create (&pid.public_key, &address_generator, &agc,
+                            GNUNET_YES);
+  GNUNET_PEERINFO_add_peer (h, h2, NULL, NULL);
+  GNUNET_free (h2);
 }
 
 
 static void
-run(void *cls,
-    const struct GNUNET_CONFIGURATION_Handle *cfg,
-    struct GNUNET_TESTING_Peer *peer)
+run (void *cls,
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
 {
-  timeout_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT, &end_badly, NULL);
+  timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
   mycfg = cfg;
-  pnc_w_fo = GNUNET_PEERINFO_notify(mycfg, GNUNET_YES, &process_w_fo, NULL);
-  pnc_wo_fo = GNUNET_PEERINFO_notify(mycfg, GNUNET_NO, &process_wo_fo, NULL);
-  h = GNUNET_PEERINFO_connect(cfg);
-  GNUNET_assert(NULL != h);
-  add_peer();
+  pnc_w_fo = GNUNET_PEERINFO_notify (mycfg, GNUNET_YES, &process_w_fo, NULL);
+  pnc_wo_fo = GNUNET_PEERINFO_notify (mycfg, GNUNET_NO, &process_wo_fo, NULL);
+  h = GNUNET_PEERINFO_connect (cfg);
+  GNUNET_assert (NULL != h);
+  add_peer ();
 }
 
 
 int
-main(int argc, char *argv[])
+main (int argc, char *argv[])
 {
   res_cb_w_fo = GNUNET_NO;
   res_cb_wo_fo = GNUNET_NO;
   global_ret = 3;
-  if (0 != GNUNET_TESTING_service_run("test-peerinfo-api-friend-only",
-                                      "peerinfo",
-                                      "test_peerinfo_api_data.conf",
-                                      &run, NULL))
+  if (0 != GNUNET_TESTING_service_run ("test-peerinfo-api-friend-only",
+                                       "peerinfo",
+                                       "test_peerinfo_api_data.conf",
+                                       &run, NULL))
     return 1;
   return global_ret;
 }