1 files changed, 85 insertions, 100 deletions

diff --git a/src/transport/test_transport_api_multiaddress.c b/src/transport/test_transport_api_multiaddress.c
index b2ac507d2..63ef28862 100644
--- a/src/transport/test_transport_api_multiaddress.c
+++ b/src/transport/test_transport_api_multiaddress.c
@@ -63,9 +63,9 @@ static int ok;
 
 static int is_tcp;
 
-static  GNUNET_SCHEDULER_TaskIdentifier die_task;
+static GNUNET_SCHEDULER_TaskIdentifier die_task;
 
-static  GNUNET_SCHEDULER_TaskIdentifier tct;
+static GNUNET_SCHEDULER_TaskIdentifier tct;
 
 
 #if VERBOSE
@@ -81,13 +81,13 @@ stop_arm (struct PeerContext *p)
 {
 #if START_ARM
   if (NULL != p->arm_proc)
-    {
-      if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
-        GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-      GNUNET_OS_process_wait (p->arm_proc);
-      GNUNET_OS_process_close (p->arm_proc);
-      p->arm_proc = NULL;
-    }
+  {
+    if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
+      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+    GNUNET_OS_process_wait (p->arm_proc);
+    GNUNET_OS_process_close (p->arm_proc);
+    p->arm_proc = NULL;
+  }
 #endif
   GNUNET_CONFIGURATION_destroy (p->cfg);
 }
@@ -96,16 +96,15 @@ stop_arm (struct PeerContext *p)
 
 
 static void
-exchange_hello_last (void *cls,
-                     const struct GNUNET_MessageHeader *message)
+exchange_hello_last (void *cls, const struct GNUNET_MessageHeader *message)
 {
   struct PeerContext *me = cls;
 
   GNUNET_assert (message != NULL);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Exchanging HELLO of size %d with peer (%s)!\n", 
-              (int) GNUNET_HELLO_size((const struct GNUNET_HELLO_Message *)message),
-              GNUNET_i2s (&me->id));
+              "Exchanging HELLO of size %d with peer (%s)!\n",
+              (int) GNUNET_HELLO_size ((const struct GNUNET_HELLO_Message *)
+                                       message), GNUNET_i2s (&me->id));
   GNUNET_assert (GNUNET_OK ==
                  GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *)
                                       message, &me->id));
@@ -114,8 +113,7 @@ exchange_hello_last (void *cls,
 
 
 static void
-exchange_hello (void *cls,
-                const struct GNUNET_MessageHeader *message)
+exchange_hello (void *cls, const struct GNUNET_MessageHeader *message)
 {
   struct PeerContext *me = cls;
 
@@ -124,9 +122,9 @@ exchange_hello (void *cls,
                  GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *)
                                       message, &me->id));
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Exchanging HELLO of size %d from peer %s!\n", 
-              (int) GNUNET_HELLO_size((const struct GNUNET_HELLO_Message *)message),
-              GNUNET_i2s (&me->id));
+              "Exchanging HELLO of size %d from peer %s!\n",
+              (int) GNUNET_HELLO_size ((const struct GNUNET_HELLO_Message *)
+                                       message), GNUNET_i2s (&me->id));
   GNUNET_TRANSPORT_offer_hello (p2.th, message, NULL, NULL);
 }
 
@@ -142,10 +140,10 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GNUNET_TRANSPORT_disconnect (p1.th);
   GNUNET_TRANSPORT_disconnect (p2.th);
   if (GNUNET_SCHEDULER_NO_TASK != tct)
-    {
-      GNUNET_SCHEDULER_cancel (tct);
-      tct = GNUNET_SCHEDULER_NO_TASK;
-    }
+  {
+    GNUNET_SCHEDULER_cancel (tct);
+    tct = GNUNET_SCHEDULER_NO_TASK;
+  }
   ok = 1;
 }
 
@@ -159,10 +157,10 @@ end_normally (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GNUNET_TRANSPORT_disconnect (p1.th);
   GNUNET_TRANSPORT_disconnect (p2.th);
   if (GNUNET_SCHEDULER_NO_TASK != tct)
-    {
-      GNUNET_SCHEDULER_cancel (tct);
-      tct = GNUNET_SCHEDULER_NO_TASK;
-    }
+  {
+    GNUNET_SCHEDULER_cancel (tct);
+    tct = GNUNET_SCHEDULER_NO_TASK;
+  }
   ok = 0;
 }
 
@@ -173,87 +171,76 @@ notify_connect (void *cls,
                 uint32_t ats_count)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Peer `%4s' connected to us (%p)!\n", 
-              GNUNET_i2s (peer), 
-              cls);
+              "Peer `%4s' connected to us (%p)!\n", GNUNET_i2s (peer), cls);
   if (cls == &p1)
-    {
-      GNUNET_assert (ok >= 2);
-      OKPP;
-      OKPP;
-      if (GNUNET_SCHEDULER_NO_TASK != die_task)
-        GNUNET_SCHEDULER_cancel (die_task);
-      if (GNUNET_SCHEDULER_NO_TASK != tct)
-        GNUNET_SCHEDULER_cancel (tct);
-      tct = GNUNET_SCHEDULER_NO_TASK;
-      die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT_TRANSMIT,
-                                               &end_normally, NULL);
-    }
+  {
+    GNUNET_assert (ok >= 2);
+    OKPP;
+    OKPP;
+    if (GNUNET_SCHEDULER_NO_TASK != die_task)
+      GNUNET_SCHEDULER_cancel (die_task);
+    if (GNUNET_SCHEDULER_NO_TASK != tct)
+      GNUNET_SCHEDULER_cancel (tct);
+    tct = GNUNET_SCHEDULER_NO_TASK;
+    die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT_TRANSMIT,
+                                             &end_normally, NULL);
+  }
 }
 
 
 static void
-notify_disconnect (void *cls,
-                   const struct GNUNET_PeerIdentity *peer)
+notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
 {
-   if ( (ok != 60) &&
-         (GNUNET_SCHEDULER_NO_TASK != die_task) )
-     {
-       GNUNET_SCHEDULER_cancel (die_task);
-       die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-     }
+  if ((ok != 60) && (GNUNET_SCHEDULER_NO_TASK != die_task))
+  {
+    GNUNET_SCHEDULER_cancel (die_task);
+    die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+  }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Peer `%4s' disconnected (%p)!\n",
-              GNUNET_i2s (peer), cls);
+              "Peer `%4s' disconnected (%p)!\n", GNUNET_i2s (peer), cls);
 }
 
 
 static void
-setup_peer (struct PeerContext *p, 
-            const char *cfgname)
+setup_peer (struct PeerContext *p, const char *cfgname)
 {
   p->cfg = GNUNET_CONFIGURATION_create ();
 
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
-  if (GNUNET_CONFIGURATION_have_value (p->cfg,"PATHS", "SERVICEHOME"))
-    {
-      GNUNET_assert (GNUNET_OK == 
-                     GNUNET_CONFIGURATION_get_value_string (p->cfg, 
-                                                            "PATHS", "SERVICEHOME", 
-                                                            &p->servicehome));
-      GNUNET_DISK_directory_remove (p->servicehome);
-    }
+  if (GNUNET_CONFIGURATION_have_value (p->cfg, "PATHS", "SERVICEHOME"))
+  {
+    GNUNET_assert (GNUNET_OK ==
+                   GNUNET_CONFIGURATION_get_value_string (p->cfg,
+                                                          "PATHS",
+                                                          "SERVICEHOME",
+                                                          &p->servicehome));
+    GNUNET_DISK_directory_remove (p->servicehome);
+  }
 
 #if START_ARM
   p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
-                                        "gnunet-service-arm",
+                                         "gnunet-service-arm",
 #if VERBOSE_ARM
-                                        "-L", "DEBUG",
+                                         "-L", "DEBUG",
 #endif
-                                        "-c", cfgname, NULL);
+                                         "-c", cfgname, NULL);
 #endif
   p->th = GNUNET_TRANSPORT_connect (p->cfg,
                                     NULL, p,
-                                    NULL,
-                                    &notify_connect, &notify_disconnect);
+                                    NULL, &notify_connect, &notify_disconnect);
   GNUNET_assert (p->th != NULL);
 }
 
 
 static void
-try_connect (void *cls,
-             const struct GNUNET_SCHEDULER_TaskContext *tc)
+try_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Asking peers to connect...\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Asking peers to connect...\n");
   /* FIXME: 'pX.id' may still be all-zeros here... */
-  GNUNET_TRANSPORT_try_connect (p2.th,
-                                &p1.id);
-  GNUNET_TRANSPORT_try_connect (p1.th,
-                                &p2.id);
+  GNUNET_TRANSPORT_try_connect (p2.th, &p1.id);
+  GNUNET_TRANSPORT_try_connect (p1.th, &p2.id);
   tct = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                      &try_connect,
-                                      NULL);
+                                      &try_connect, NULL);
 }
 
 
@@ -264,15 +251,14 @@ run (void *cls,
 {
   GNUNET_assert (ok == 1);
   OKPP;
-  die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
-                                           &end_badly, NULL);
+  die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
   if (is_tcp)
-    {
-      setup_peer (&p1, "test_transport_api_multiaddress_tcp_peer1.conf");
-      setup_peer (&p2, "test_transport_api_multiaddress_tcp_peer2.conf");
-    }
-  GNUNET_assert(p1.th != NULL);
-  GNUNET_assert(p2.th != NULL);
+  {
+    setup_peer (&p1, "test_transport_api_multiaddress_tcp_peer1.conf");
+    setup_peer (&p2, "test_transport_api_multiaddress_tcp_peer2.conf");
+  }
+  GNUNET_assert (p1.th != NULL);
+  GNUNET_assert (p2.th != NULL);
 
   GNUNET_TRANSPORT_get_hello (p1.th, &exchange_hello, &p1);
   GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, &p2);
@@ -295,25 +281,24 @@ check ()
   };
 
 #if WRITECONFIG
-  setTransportOptions("test_transport_api_data.conf");
+  setTransportOptions ("test_transport_api_data.conf");
 #endif
   ok = 1;
   GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
-                      argv, "test-transport-api", "nohelp",
-                      options, &run, &ok);
+                      argv, "test-transport-api", "nohelp", options, &run, &ok);
   stop_arm (&p1);
   stop_arm (&p2);
 
   if (p1.servicehome != NULL)
-    {
-      GNUNET_DISK_directory_remove (p1.servicehome);
-      GNUNET_free(p1.servicehome);
-    }
+  {
+    GNUNET_DISK_directory_remove (p1.servicehome);
+    GNUNET_free (p1.servicehome);
+  }
   if (p2.servicehome != NULL)
-    {
-      GNUNET_DISK_directory_remove (p2.servicehome);
-      GNUNET_free(p2.servicehome);
-    }
+  {
+    GNUNET_DISK_directory_remove (p2.servicehome);
+    GNUNET_free (p2.servicehome);
+  }
   return ok;
 }
 
@@ -331,10 +316,10 @@ main (int argc, char *argv[])
 #endif
                     NULL);
 
-  if (strstr(argv[0], "tcp") != NULL)
-    {
-      is_tcp = GNUNET_YES;
-    }
+  if (strstr (argv[0], "tcp") != NULL)
+  {
+    is_tcp = GNUNET_YES;
+  }
 
   ret = check ();