1 files changed, 172 insertions, 161 deletions

diff --git a/src/transport/test_transport_blacklisting.c b/src/transport/test_transport_blacklisting.c
index f0f5a2b63..d6961d8d0 100644
--- a/src/transport/test_transport_blacklisting.c
+++ b/src/transport/test_transport_blacklisting.c
@@ -50,7 +50,6 @@ struct GNUNET_TRANSPORT_TESTING_handle *tth;
 
 #define CONNECT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
 
-
 static int stage;
 static int ok;
 static int connected;
@@ -68,43 +67,43 @@ static GNUNET_SCHEDULER_TaskIdentifier stage_task;
 #endif
 
 static void
-run_stage (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+run_stage(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
 
 static void
-end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+end(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping\n");
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Stopping\n");
 
-  if (die_task != GNUNET_SCHEDULER_NO_TASK)
+  if (die_task != GNUNET_SCHEDULER_NO_TASK )
   {
     GNUNET_SCHEDULER_cancel (die_task);
     die_task = GNUNET_SCHEDULER_NO_TASK;
   }
 
-  if (timeout_task != GNUNET_SCHEDULER_NO_TASK)
+  if (timeout_task != GNUNET_SCHEDULER_NO_TASK )
   {
     GNUNET_SCHEDULER_cancel (timeout_task);
     timeout_task = GNUNET_SCHEDULER_NO_TASK;
   }
 
-  if (stage_task != GNUNET_SCHEDULER_NO_TASK)
+  if (stage_task != GNUNET_SCHEDULER_NO_TASK )
   {
     GNUNET_SCHEDULER_cancel (stage_task);
     stage_task = GNUNET_SCHEDULER_NO_TASK;
   }
 
-  if (cc != NULL)
+  if (cc != NULL )
   {
-    GNUNET_TRANSPORT_TESTING_connect_peers_cancel(tth, cc);
+    GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth, cc);
     cc = NULL;
   }
 
-  if (p1 != NULL)
+  if (p1 != NULL )
   {
     GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
     p1 = NULL;
   }
-  if (p2 != NULL)
+  if (p2 != NULL )
   {
     GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
     p2 = NULL;
@@ -112,240 +111,252 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 }
 
 static void
-end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+end_badly(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   die_task = GNUNET_SCHEDULER_NO_TASK;
 
-  if (timeout_task != GNUNET_SCHEDULER_NO_TASK)
+  if (timeout_task != GNUNET_SCHEDULER_NO_TASK )
   {
     GNUNET_SCHEDULER_cancel (timeout_task);
     timeout_task = GNUNET_SCHEDULER_NO_TASK;
   }
 
-  if (stage_task != GNUNET_SCHEDULER_NO_TASK)
+  if (stage_task != GNUNET_SCHEDULER_NO_TASK )
   {
     GNUNET_SCHEDULER_cancel (stage_task);
     stage_task = GNUNET_SCHEDULER_NO_TASK;
   }
 
-
-  if (cc != NULL)
+  if (cc != NULL )
   {
-    GNUNET_TRANSPORT_TESTING_connect_peers_cancel(tth, cc);
+    GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth, cc);
     cc = NULL;
   }
-  if (p1 != NULL)
+  if (p1 != NULL )
     GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
-  if (p2 != NULL)
+  if (p2 != NULL )
     GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
 
   ok = GNUNET_SYSERR;
 }
 
 static void
-testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
+testing_connect_cb(struct PeerContext *p1, struct PeerContext *p2, void *cls)
 {
   cc = NULL;
   char *p1_c = GNUNET_strdup (GNUNET_i2s (&p1->id));
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Peers connected: %u (%s) <-> %u (%s)\n",
-              p1->no, p1_c, p2->no, GNUNET_i2s (&p2->id));
-  GNUNET_free (p1_c);
+  GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Peers connected: %u (%s) <-> %u (%s)\n",
+      p1->no, p1_c, p2->no, GNUNET_i2s (&p2->id));
+  GNUNET_free(p1_c);
   connected = GNUNET_YES;
-  stage_task = GNUNET_SCHEDULER_add_now (&run_stage, NULL);
+  stage_task = GNUNET_SCHEDULER_add_now (&run_stage, NULL );
 }
 
 static void
-connect_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+connect_timeout(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Peers not connected, next stage\n");
-        timeout_task = GNUNET_SCHEDULER_NO_TASK;
-  stage_task = GNUNET_SCHEDULER_add_now (&run_stage, NULL);
+  GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Peers not connected, next stage\n");
+  timeout_task = GNUNET_SCHEDULER_NO_TASK;
+  stage_task = GNUNET_SCHEDULER_add_now (&run_stage, NULL );
 }
 
 static int started;
 
 void
-start_cb (struct PeerContext *p, void *cls)
+start_cb(struct PeerContext *p, void *cls)
 {
 
   started++;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%s') started\n", p->no,
-              GNUNET_i2s (&p->id));
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%s') started\n", p->no,
+      GNUNET_i2s (&p->id));
 
   if (started != 2)
     return;
 
   char *sender_c = GNUNET_strdup (GNUNET_i2s (&p1->id));
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Test tries to connect peer %u (`%s') -> peer %u (`%s')\n",
-              p1->no, sender_c, p2->no, GNUNET_i2s (&p2->id));
-  GNUNET_free (sender_c);
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+      "Test tries to connect peer %u (`%s') -> peer %u (`%s')\n", p1->no,
+      sender_c, p2->no, GNUNET_i2s (&p2->id));
+  GNUNET_free(sender_c);
 
   cc = GNUNET_TRANSPORT_TESTING_connect_peers (tth, p1, p2, &testing_connect_cb,
-                                               NULL);
+      NULL );
 
 }
 
 static void
-run_stage (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+run_stage(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-        stage_task = GNUNET_SCHEDULER_NO_TASK;
-        if (GNUNET_SCHEDULER_NO_TASK != die_task)
-                GNUNET_SCHEDULER_cancel (die_task);
-  die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Running stage %u\n", stage);
-
-        if (0 == stage)
-        {
-                  started = GNUNET_NO;
-                  connected = GNUNET_NO;
-                        if (0 == strcmp(test_name, "test_transport_blacklisting_no_bl"))
-                        {
-                                        /* Try to connect peers successfully */
-                                        p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_blacklisting_cfg_peer1.conf", 1,
-                                                            NULL, NULL, NULL, &start_cb, NULL);
-
-                                        p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_blacklisting_cfg_peer2.conf", 2,
-                                                                                                                                                                                        NULL, NULL, NULL, &start_cb, NULL);
-                        }
-                        else if (0 == strcmp(test_name, "test_transport_blacklisting_outbound_bl_full"))
-                        {
-                                        p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_blacklisting_cfg_blp_peer1_full.conf", 1,
-                                                            NULL, NULL, NULL, &start_cb, NULL);
-
-                                        p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_blacklisting_cfg_peer2.conf", 2,
-                                                                                                                                                                                        NULL, NULL, NULL, &start_cb, NULL);
-                        }
-                        else if (0 == strcmp(test_name, "test_transport_blacklisting_outbound_bl_plugin"))
-                        {
-                                        p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_blacklisting_cfg_blp_peer1_plugin.conf", 1,
-                                                            NULL, NULL, NULL, &start_cb, NULL);
-
-                                        p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_blacklisting_cfg_peer2.conf", 2,
-                                                                                                                                                                                        NULL, NULL, NULL, &start_cb, NULL);
-                        }
-                        else if (0 == strcmp(test_name, "test_transport_blacklisting_inbound_bl_full"))
-                        {
-                                        p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_blacklisting_cfg_peer1.conf", 1,
-                                                            NULL, NULL, NULL, &start_cb, NULL);
-
-                                        p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_blacklisting_cfg_blp_peer2_full.conf", 2,
-                                                                                                                                                                                        NULL, NULL, NULL, &start_cb, NULL);
-                        }
-                        else if (0 == strcmp(test_name, "test_transport_blacklisting_inbound_bl_plugin"))
-                        {
-                                        p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_blacklisting_cfg_peer1.conf", 1,
-                                                            NULL, NULL, NULL, &start_cb, NULL);
-
-                                        p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_blacklisting_cfg_blp_peer2_plugin.conf", 2,
-                                                                                                                                                                                        NULL, NULL, NULL, &start_cb, NULL);
-                        }
-                        else if (0 == strcmp(test_name, "test_transport_blacklisting_multiple_plugins"))
-                        {
-                                        p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf", 1,
-                                                            NULL, NULL, NULL, &start_cb, NULL);
-
-                                        p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf", 2,
-                                                                                                                                                                                        NULL, NULL, NULL, &start_cb, NULL);
-                        }
-
-
-                        if ((NULL == p1) || (NULL == p2))
-                        {
-                                GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to start peers\n");
-                                ok = 1;
-                          GNUNET_SCHEDULER_add_now (&end, NULL);
-                        }
-
-                        timeout_task = GNUNET_SCHEDULER_add_delayed (CONNECT_TIMEOUT, &connect_timeout, NULL);
-                  stage ++;
-                  return;
-        }
-
-
-  if (cc != NULL)
+  stage_task = GNUNET_SCHEDULER_NO_TASK;
+  if (GNUNET_SCHEDULER_NO_TASK != die_task)
+    GNUNET_SCHEDULER_cancel (die_task);
+  die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL );
+  GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Running stage %u\n", stage);
+
+  if (0 == stage)
+  {
+    started = GNUNET_NO;
+    connected = GNUNET_NO;
+    if (0 == strcmp (test_name, "test_transport_blacklisting_no_bl"))
+    {
+      /* Try to connect peers successfully */
+      p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+          "test_transport_blacklisting_cfg_peer1.conf", 1, NULL, NULL, NULL,
+          &start_cb, NULL );
+
+      p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+          "test_transport_blacklisting_cfg_peer2.conf", 2, NULL, NULL, NULL,
+          &start_cb, NULL );
+    }
+    else if (0
+        == strcmp (test_name, "test_transport_blacklisting_outbound_bl_full"))
+    {
+      p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+          "test_transport_blacklisting_cfg_blp_peer1_full.conf", 1, NULL, NULL,
+          NULL, &start_cb, NULL );
+
+      p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+          "test_transport_blacklisting_cfg_peer2.conf", 2, NULL, NULL, NULL,
+          &start_cb, NULL );
+    }
+    else if (0
+        == strcmp (test_name, "test_transport_blacklisting_outbound_bl_plugin"))
+    {
+      p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+          "test_transport_blacklisting_cfg_blp_peer1_plugin.conf", 1, NULL,
+          NULL, NULL, &start_cb, NULL );
+
+      p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+          "test_transport_blacklisting_cfg_peer2.conf", 2, NULL, NULL, NULL,
+          &start_cb, NULL );
+    }
+    else if (0
+        == strcmp (test_name, "test_transport_blacklisting_inbound_bl_full"))
+    {
+      p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+          "test_transport_blacklisting_cfg_peer1.conf", 1, NULL, NULL, NULL,
+          &start_cb, NULL );
+
+      p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+          "test_transport_blacklisting_cfg_blp_peer2_full.conf", 2, NULL, NULL,
+          NULL, &start_cb, NULL );
+    }
+    else if (0
+        == strcmp (test_name, "test_transport_blacklisting_inbound_bl_plugin"))
+    {
+      p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+          "test_transport_blacklisting_cfg_peer1.conf", 1, NULL, NULL, NULL,
+          &start_cb, NULL );
+
+      p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+          "test_transport_blacklisting_cfg_blp_peer2_plugin.conf", 2, NULL,
+          NULL, NULL, &start_cb, NULL );
+    }
+    else if (0
+        == strcmp (test_name, "test_transport_blacklisting_multiple_plugins"))
+    {
+      p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+          "test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf", 1,
+          NULL, NULL, NULL, &start_cb, NULL );
+
+      p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+          "test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf", 2,
+          NULL, NULL, NULL, &start_cb, NULL );
+    }
+    else
+    {
+      GNUNET_break (0);
+      GNUNET_SCHEDULER_add_now (&end, NULL );
+    }
+
+    if ((NULL == p1) || (NULL == p2))
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to start peers\n");
+      ok = 1;
+      GNUNET_SCHEDULER_add_now (&end, NULL );
+    }
+
+    timeout_task = GNUNET_SCHEDULER_add_delayed (CONNECT_TIMEOUT,
+        &connect_timeout, NULL );
+    stage++;
+    return;
+  }
+
+  if (cc != NULL )
   {
-    GNUNET_TRANSPORT_TESTING_connect_peers_cancel(tth, cc);
+    GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth, cc);
     cc = NULL;
   }
 
-  if (p1 != NULL)
+  if (p1 != NULL )
   {
     GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
     p1 = NULL;
   }
-  if (p2 != NULL)
+  if (p2 != NULL )
   {
     GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
     p2 = NULL;
   }
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Done in stage %u: Peers %s and %s!\n", stage,
-                (GNUNET_NO == started) ? "NOT STARTED" : "STARTED",
-                (GNUNET_YES == connected) ? "CONNECTED" : "NOT CONNECTED");
-
-        if ((0 == strcmp(test_name, "test_transport_blacklisting_no_bl")) ||
-                        (0 == strcmp(test_name, "test_transport_blacklisting_multiple_plugins")))
-        {
-                if ((GNUNET_NO != started) && (GNUNET_YES == connected))
-                        ok = 0;
-                else
-                {
-                        GNUNET_break (0);
-                        ok = 1;
-                }
-        }
-        else
-        {
-                        if ((GNUNET_NO != started) && (GNUNET_YES != connected))
-                                ok = 0;
-                        else
-                        {
-                                ok = 1;
-                        }
-        }
-  GNUNET_SCHEDULER_add_now (&end, NULL);
+  GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Done in stage %u: Peers %s and %s!\n",
+      stage, (GNUNET_NO == started) ? "NOT STARTED" : "STARTED",
+      (GNUNET_YES == connected) ? "CONNECTED" : "NOT CONNECTED");
+
+  if ((0 == strcmp (test_name, "test_transport_blacklisting_no_bl"))
+      || (0
+          == strcmp (test_name, "test_transport_blacklisting_multiple_plugins")))
+  {
+    if ((GNUNET_NO != started) && (GNUNET_YES == connected))
+      ok = 0;
+    else
+    {
+      GNUNET_break(0);
+      ok = 1;
+    }
+  }
+  else
+  {
+    if ((GNUNET_NO != started) && (GNUNET_YES != connected))
+      ok = 0;
+    else
+    {
+      ok = 1;
+    }
+  }
+  GNUNET_SCHEDULER_add_now (&end, NULL );
 }
 
 static void
-run (void *cls, char *const *args, const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+run(void *cls, char * const *args, const char *cfgfile,
+    const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   connected = GNUNET_NO;
   stage = 0;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Running test `%s'!\n", test_name);
-  stage_task = GNUNET_SCHEDULER_add_now (&run_stage, NULL);
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Running test `%s'!\n", test_name);
+  stage_task = GNUNET_SCHEDULER_add_now (&run_stage, NULL );
 }
 
-
 int
-main (int argc, char *argv0[])
+main(int argc, char *argv0[])
 {
   ok = 1;
 
   GNUNET_TRANSPORT_TESTING_get_test_name (argv0[0], &test_name);
 
-  GNUNET_log_setup ("test-transport-api-blacklisting",
-                    "WARNING",
-                    NULL);
+  GNUNET_log_setup ("test-transport-api-blacklisting", "WARNING", NULL );
 
-  static char *const argv[] = { "date",
-    "-c",
-    "test_transport_api_data.conf",
-    NULL
-  };
-  static struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
+  static char * const argv[] =
+  { "date", "-c", "test_transport_api_data.conf", NULL };
+  static struct GNUNET_GETOPT_CommandLineOption options[] =
+  { GNUNET_GETOPT_OPTION_END };
 
   tth = GNUNET_TRANSPORT_TESTING_init ();
 
-  GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
-                                                                                "test-transport-api-blacklisting",
-                      "nohelp", options, &run, NULL);
-
+  GNUNET_PROGRAM_run ((sizeof(argv) / sizeof(char *)) - 1, argv,
+      "test-transport-api-blacklisting", "nohelp", options, &run, NULL );
 
   GNUNET_TRANSPORT_TESTING_done (tth);