1 files changed, 109 insertions, 119 deletions

diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index 0e3473441..f9ac6a8e5 100644
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -57,17 +57,17 @@
 
 static int ok;
 
-static  GNUNET_SCHEDULER_TaskIdentifier die_task;
+static GNUNET_SCHEDULER_TaskIdentifier die_task;
 
-struct PeerContext * p1;
+struct PeerContext *p1;
 
-struct PeerContext * p2;
+struct PeerContext *p2;
 
-struct GNUNET_TRANSPORT_TransmitHandle * th;
+struct GNUNET_TRANSPORT_TransmitHandle *th;
 
-char * cfg_file_p1;
+char *cfg_file_p1;
 
-char * cfg_file_p2;
+char *cfg_file_p2;
 
 #if VERBOSE
 #define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
@@ -82,33 +82,33 @@ end ()
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n");
 
   if (die_task != GNUNET_SCHEDULER_NO_TASK)
-    GNUNET_SCHEDULER_cancel(die_task);
+    GNUNET_SCHEDULER_cancel (die_task);
 
   if (th != NULL)
-    GNUNET_TRANSPORT_notify_transmit_ready_cancel(th);
+    GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
   th = NULL;
 
-  GNUNET_TRANSPORT_TESTING_stop_peer(p1);
-  GNUNET_TRANSPORT_TESTING_stop_peer(p2);
+  GNUNET_TRANSPORT_TESTING_stop_peer (p1);
+  GNUNET_TRANSPORT_TESTING_stop_peer (p2);
 }
 
 static void
 end_badly ()
 {
   if (die_task != GNUNET_SCHEDULER_NO_TASK)
-    GNUNET_SCHEDULER_cancel(die_task);
+    GNUNET_SCHEDULER_cancel (die_task);
 
   die_task = GNUNET_SCHEDULER_NO_TASK;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
 
   if (th != NULL)
-    GNUNET_TRANSPORT_notify_transmit_ready_cancel(th);
+    GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
   th = NULL;
 
   if (p1 != NULL)
-    GNUNET_TRANSPORT_TESTING_stop_peer(p1);
+    GNUNET_TRANSPORT_TESTING_stop_peer (p1);
   if (p2 != NULL)
-    GNUNET_TRANSPORT_TESTING_stop_peer(p2);
+    GNUNET_TRANSPORT_TESTING_stop_peer (p2);
 
   ok = GNUNET_SYSERR;
 }
@@ -121,22 +121,21 @@ notify_receive (void *cls,
                 const struct GNUNET_TRANSPORT_ATS_Information *ats,
                 uint32_t ats_count)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
-              "Received message of type %d from peer %s!\n",
-              ntohs(message->type), 
-              GNUNET_i2s (peer));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Received message of type %d from peer %s!\n",
+              ntohs (message->type), GNUNET_i2s (peer));
 
   if ((MTYPE == ntohs (message->type)) &&
       (sizeof (struct GNUNET_MessageHeader) == ntohs (message->size)))
   {
     ok = 0;
-    end();
+    end ();
   }
   else
   {
     GNUNET_break (0);
     ok = 1;
-    end();
+    end ();
   }
 }
 
@@ -150,9 +149,8 @@ notify_ready (void *cls, size_t size, void *buf)
   th = NULL;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Transmitting message with %u bytes to peer %s\n", 
-              sizeof (struct GNUNET_MessageHeader),
-              GNUNET_i2s (&p->id));
+              "Transmitting message with %u bytes to peer %s\n",
+              sizeof (struct GNUNET_MessageHeader), GNUNET_i2s (&p->id));
   GNUNET_assert (size >= 256);
 
   if (buf != NULL)
@@ -172,41 +170,37 @@ 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);
 }
 
 
 static void
-notify_disconnect (void *cls,
-                   const struct GNUNET_PeerIdentity *peer)
+notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
 {
   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
 sendtask ()
 {
   th = GNUNET_TRANSPORT_notify_transmit_ready (p1->th,
-                                              &p2->id,
-                                              256, 0, TIMEOUT, &notify_ready,
-                                              &p1);
+                                               &p2->id,
+                                               256, 0, TIMEOUT, &notify_ready,
+                                               &p1);
 }
 
 static void
-testing_connect_cb (struct PeerContext * p1, struct PeerContext * p2, void *cls)
+testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
 {
-  char * p1_c = strdup (GNUNET_i2s(&p1->id));
+  char *p1_c = strdup (GNUNET_i2s (&p1->id));
+
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peers connected: %s <-> %s\n",
-       p1_c,
-       GNUNET_i2s (&p2->id));
+              p1_c, GNUNET_i2s (&p2->id));
   GNUNET_free (p1_c);
 
   // FIXME: THIS IS REQUIRED! SEEMS TO BE A BUG!
-  GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_SECONDS, &sendtask, NULL);
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &sendtask, NULL);
 }
 
 static void
@@ -214,21 +208,18 @@ run (void *cls,
      char *const *args,
      const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
-                                           &end_badly, NULL);
-
-  p1 = GNUNET_TRANSPORT_TESTING_start_peer(cfg_file_p1,
-      &notify_receive,
-      &notify_connect,
-      &notify_disconnect,
-      NULL);
-  p2 = GNUNET_TRANSPORT_TESTING_start_peer(cfg_file_p2,
-      &notify_receive,
-      &notify_connect,
-      &notify_disconnect,
-      NULL);
-
-  GNUNET_TRANSPORT_TESTING_connect_peers(p1, p2, &testing_connect_cb, NULL);
+  die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
+
+  p1 = GNUNET_TRANSPORT_TESTING_start_peer (cfg_file_p1,
+                                            &notify_receive,
+                                            &notify_connect,
+                                            &notify_disconnect, NULL);
+  p2 = GNUNET_TRANSPORT_TESTING_start_peer (cfg_file_p2,
+                                            &notify_receive,
+                                            &notify_connect,
+                                            &notify_disconnect, NULL);
+
+  GNUNET_TRANSPORT_TESTING_connect_peers (p1, p2, &testing_connect_cb, NULL);
 }
 
 static int
@@ -247,12 +238,11 @@ 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);
 
   return ok;
 }
@@ -274,32 +264,32 @@ get_path_from_PATH (char *binary)
 
   p = getenv ("PATH");
   if (p == NULL)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _("PATH environment variable is unset.\n"));
-      return NULL;
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("PATH environment variable is unset.\n"));
+    return NULL;
+  }
   path = GNUNET_strdup (p);     /* because we write on it */
   buf = GNUNET_malloc (strlen (path) + 20);
   pos = path;
 
   while (NULL != (end = strchr (pos, PATH_SEPARATOR)))
-    {
-      *end = '\0';
-      sprintf (buf, "%s/%s", pos, binary);
-      if (GNUNET_DISK_file_test (buf) == GNUNET_YES)
-        {
-          GNUNET_free (path);
-          return buf;
-        }
-      pos = end + 1;
-    }
-  sprintf (buf, "%s/%s", pos, binary);
-  if (GNUNET_DISK_file_test (buf) == GNUNET_YES)
+  {
+    *end = '\0';
+    sprintf (buf, "%s/%s", pos, binary);
+    if (GNUNET_DISK_file_test (buf) == GNUNET_YES)
     {
       GNUNET_free (path);
       return buf;
     }
+    pos = end + 1;
+  }
+  sprintf (buf, "%s/%s", pos, binary);
+  if (GNUNET_DISK_file_test (buf) == GNUNET_YES)
+  {
+    GNUNET_free (path);
+    return buf;
+  }
   GNUNET_free (buf);
   GNUNET_free (path);
   return NULL;
@@ -316,16 +306,18 @@ get_path_from_PATH (char *binary)
  *         can be run properly, GNUNET_NO otherwise
  */
 static int
-check_gnunet_nat_binary(char *binary)
+check_gnunet_nat_binary (char *binary)
 {
   struct stat statbuf;
   char *p;
+
 #ifdef MINGW
   SOCKET rawsock;
 #endif
 
 #ifdef MINGW
   char *binaryexe;
+
   GNUNET_asprintf (&binaryexe, "%s.exe", binary);
   p = get_path_from_PATH (binaryexe);
   free (binaryexe);
@@ -333,36 +325,34 @@ check_gnunet_nat_binary(char *binary)
   p = get_path_from_PATH (binary);
 #endif
   if (p == NULL)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _("Could not find binary `%s' in PATH!\n"),
-                  binary);
-      return GNUNET_NO;
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Could not find binary `%s' in PATH!\n"), binary);
+    return GNUNET_NO;
+  }
   if (0 != STAT (p, &statbuf))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  _("stat (%s) failed: %s\n"),
-                  p,
-                  STRERROR (errno));
-      GNUNET_free (p);
-      return GNUNET_SYSERR;
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                _("stat (%s) failed: %s\n"), p, STRERROR (errno));
+    GNUNET_free (p);
+    return GNUNET_SYSERR;
+  }
   GNUNET_free (p);
 #ifndef MINGW
-  if ( (0 != (statbuf.st_mode & S_ISUID)) &&
-       (statbuf.st_uid == 0) )
+  if ((0 != (statbuf.st_mode & S_ISUID)) && (statbuf.st_uid == 0))
     return GNUNET_YES;
   return GNUNET_NO;
 #else
   rawsock = socket (AF_INET, SOCK_RAW, IPPROTO_ICMP);
   if (INVALID_SOCKET == rawsock)
-    {
-      DWORD err = GetLastError ();
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "socket (AF_INET, SOCK_RAW, IPPROTO_ICMP) have failed! GLE = %d\n", err);
-      return GNUNET_NO; /* not running as administrator */
-    }
+  {
+    DWORD err = GetLastError ();
+
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "socket (AF_INET, SOCK_RAW, IPPROTO_ICMP) have failed! GLE = %d\n",
+                err);
+    return GNUNET_NO;           /* not running as administrator */
+  }
   closesocket (rawsock);
   return GNUNET_YES;
 #endif
@@ -381,13 +371,13 @@ main (int argc, char *argv[])
 #endif
                     NULL);
 
-  char * pch = strdup(argv[0]);
-  char * backup = pch;
-  char * filename = NULL;
+  char *pch = strdup (argv[0]);
+  char *backup = pch;
+  char *filename = NULL;
   char *dotexe;
 
   /* get executable filename */
-  pch = strtok (pch,"/");
+  pch = strtok (pch, "/");
   while (pch != NULL)
   {
     pch = strtok (NULL, "/");
@@ -395,35 +385,35 @@ main (int argc, char *argv[])
       filename = pch;
   }
   /* remove "lt-" */
-  filename = strstr(filename, "tes");
+  filename = strstr (filename, "tes");
   if (NULL != (dotexe = strstr (filename, ".exe")))
     dotexe[0] = '\0';
 
   /* create cfg filename */
-  GNUNET_asprintf(&cfg_file_p1, "%s_peer1.conf",filename);
-  GNUNET_asprintf(&cfg_file_p2, "%s_peer2.conf", filename);
+  GNUNET_asprintf (&cfg_file_p1, "%s_peer1.conf", filename);
+  GNUNET_asprintf (&cfg_file_p2, "%s_peer2.conf", filename);
   GNUNET_free (backup);
 
-  if (strstr(argv[0], "tcp_nat") != NULL)
+  if (strstr (argv[0], "tcp_nat") != NULL)
+  {
+    if (GNUNET_YES != check_gnunet_nat_binary ("gnunet-nat-server"))
     {
-      if (GNUNET_YES != check_gnunet_nat_binary("gnunet-nat-server"))
-        {
-          GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                      "`%s' not properly installed, cannot run NAT test!\n",
-                      "gnunet-nat-server");
-          return 0;
-        }
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "`%s' not properly installed, cannot run NAT test!\n",
+                  "gnunet-nat-server");
+      return 0;
     }
-  else if (strstr(argv[0], "udp_nat") != NULL)
+  }
+  else if (strstr (argv[0], "udp_nat") != NULL)
+  {
+    if (GNUNET_YES != check_gnunet_nat_binary ("gnunet-nat-server"))
     {
-      if (GNUNET_YES != check_gnunet_nat_binary("gnunet-nat-server"))
-        {
-          GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                      "`%s' not properly installed, cannot run NAT test!\n",
-                      "gnunet-nat-server");
-          return 0;
-        }
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "`%s' not properly installed, cannot run NAT test!\n",
+                  "gnunet-nat-server");
+      return 0;
     }
+  }
 
   ret = check ();