1 files changed, 52 insertions, 231 deletions

diff --git a/src/transport/test_transport_api_timeout.c b/src/transport/test_transport_api_timeout.c
index 29d69c879..05fb01d1d 100644
--- a/src/transport/test_transport_api_timeout.c
+++ b/src/transport/test_transport_api_timeout.c
@@ -1,6 +1,6 @@
 /*
-     This file is part of GNUnet.
-     Copyright (C) 2009, 2010 GNUnet e.V.
+     This file is part of GNUnet.x
+     Copyright (C) 2009, 2010, 2016 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -40,129 +40,67 @@
 
 #define MTYPE 12345
 
-static char *test_source;
-
-static char *test_plugin;
-
-static char *test_name;
-
-static int ok;
-
-static struct GNUNET_SCHEDULER_Task * die_task;
-
-static struct GNUNET_SCHEDULER_Task * timer_task;
-
-static struct GNUNET_TRANSPORT_TESTING_Handle *tth;
-
-static struct GNUNET_TRANSPORT_TESTING_PeerContext *p1;
-
-static struct GNUNET_TRANSPORT_TESTING_PeerContext *p2;
-
-static struct GNUNET_TRANSPORT_TESTING_ConnectRequest * cc;
-
-static char *cfg_file_p1;
-
-static char *cfg_file_p2;
+static struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc;
 
 static struct GNUNET_TIME_Relative time_running;
 
-static int shutdown_flag;
-
-static int disconnects;
+static struct GNUNET_SCHEDULER_Task *timer_task;
 
+static int shutdown_flag;
 
-#if VERBOSE
-#define OKPP do { ok++; FPRINTF (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
-#else
-#define OKPP do { ok++; } while (0)
-#endif
+static unsigned int disconnects;
 
 
 static void
-end ()
+custom_shutdown (void *cls)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n");
-
-  if (timer_task != NULL)
+  if (NULL != timer_task)
   {
     GNUNET_SCHEDULER_cancel (timer_task);
     timer_task = NULL;
   }
-
-  if (die_task != NULL)
+  if (0 == disconnects)
   {
-    GNUNET_SCHEDULER_cancel (die_task);
-    die_task = NULL;
+    ccc->global_ret = GNUNET_OK;
   }
-
-  GNUNET_TRANSPORT_TESTING_stop_peer (p1);
-  GNUNET_TRANSPORT_TESTING_stop_peer (p2);
-
-  if (disconnects == 0)
-    ok = 0;
   else
   {
-    ok = disconnects;
+    ccc->global_ret =- GNUNET_SYSERR;
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Fail! Had %u disconnects while waiting %s\n",
                 disconnects,
                 GNUNET_STRINGS_relative_time_to_string (WAIT,
                                                         GNUNET_YES));
   }
-
-  GNUNET_TRANSPORT_TESTING_done (tth);
 }
 
 
 static void
-end_badly (void *cls)
-{
-  die_task = NULL;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
-
-  if (timer_task != NULL)
-  {
-    GNUNET_SCHEDULER_cancel (timer_task);
-    timer_task = NULL;
-  }
-  if (cc != NULL)
-    GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc);
-  if (p1 != NULL)
-    GNUNET_TRANSPORT_TESTING_stop_peer (p1);
-  if (p2 != NULL)
-    GNUNET_TRANSPORT_TESTING_stop_peer (p2);
-  ok = GNUNET_SYSERR;
-
-  GNUNET_TRANSPORT_TESTING_done (tth);
-}
-
-
-static void
-notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
+notify_receive (void *cls,
+                struct GNUNET_TRANSPORT_TESTING_PeerContext *receiver,
+                const struct GNUNET_PeerIdentity *sender,
                 const struct GNUNET_MessageHeader *message)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received message of type %d from peer %s!\n",
-              ntohs (message->type), GNUNET_i2s (peer));
-}
-
-static void
-notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%4s' connected to us (%p)!\n",
-              GNUNET_i2s (peer), cls);
+              ntohs (message->type),
+              GNUNET_i2s (sender));
 }
 
 
 static void
-notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
+notify_disconnect (void *cls,
+                   struct GNUNET_TRANSPORT_TESTING_PeerContext *me,
+                   const struct GNUNET_PeerIdentity *other)
 {
+  GNUNET_TRANSPORT_TESTING_log_disconnect (cls,
+                                           me,
+                                           other);
   if (shutdown_flag != GNUNET_YES)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "FAIL! Peer `%4s' disconnected during waiting period!\n",
-                GNUNET_i2s (peer));
+                "FAIL! Peer `%s' disconnected during waiting period!\n",
+                GNUNET_i2s (other));
     disconnects++;
   }
 }
@@ -171,172 +109,55 @@ notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
 static void
 timer (void *cls)
 {
-  static int percentage;
+  static unsigned int percentage;
 
   timer_task = NULL;
   percentage += 10;
-  time_running =
-      GNUNET_TIME_relative_add (time_running,
-                                GNUNET_TIME_relative_divide (WAIT, 10));
+  time_running = GNUNET_TIME_relative_add (time_running,
+                                           GNUNET_TIME_relative_divide (WAIT,
+                                                                        10));
 
   if (time_running.rel_value_us ==
       GNUNET_TIME_relative_max (time_running, WAIT).rel_value_us)
   {
     FPRINTF (stderr, "%s",  "100%%\n");
     shutdown_flag = GNUNET_YES;
-    GNUNET_SCHEDULER_add_now (&end, NULL);
+    GNUNET_SCHEDULER_shutdown ();
   }
   else
   {
-    FPRINTF (stderr, "%u%%..", percentage);
+    FPRINTF (stderr,
+             "%u%%..",
+             percentage);
     timer_task =
         GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_divide (WAIT, 10),
-                                      &timer, NULL);
-  }
-}
-
-
-static void
-testing_connect_cb (void *cls)
-{
-  cc = NULL;
-  char *p1_c = GNUNET_strdup (GNUNET_i2s (&p1->id));
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Peers connected: %s <-> %s\n", p1_c,
-              GNUNET_i2s (&p2->id));
-  GNUNET_free (p1_c);
-
-  shutdown_flag = GNUNET_NO;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Waiting for %s\n",
-              GNUNET_STRINGS_relative_time_to_string (WAIT,
-                                                      GNUNET_YES));
-
-  if (die_task != NULL)
-    GNUNET_SCHEDULER_cancel (die_task);
-  die_task = GNUNET_SCHEDULER_add_delayed (WAIT, &end_badly, NULL);
-
-  timer_task = GNUNET_SCHEDULER_add_now (&timer, NULL);
-}
-
-
-static void
-start_cb (struct GNUNET_TRANSPORT_TESTING_PeerContext *p, void *cls)
-{
-  static int started;
-
-  started++;
-
-  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);
-
-  cc = GNUNET_TRANSPORT_TESTING_connect_peers (p1,
-                                               p2,
-                                               &testing_connect_cb,
-                                               NULL);
-
-}
-
-static void
-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 (tth,
-                                            cfg_file_p1,
-                                            1,
-                                            &notify_receive,
-                                            &notify_connect,
-                                            &notify_disconnect,
-                                            NULL,
-                                            &start_cb,
-                                            NULL);
-  p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
-                                            cfg_file_p2,
-                                            2,
-                                            &notify_receive,
-                                            &notify_connect,
-                                            &notify_disconnect,
-                                            NULL,
-                                            &start_cb,
-                                            NULL);
-
-  if ((p1 == NULL) || (p2 == NULL))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n");
-    if (die_task != NULL)
-      GNUNET_SCHEDULER_cancel (die_task);
-    die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-    return;
+                                      &timer,
+                                      NULL);
   }
 }
 
-static int
-check ()
-{
-  static char *const argv[] = { "test-transport-api-timeout",
-    "-c",
-    "test_transport_api_data.conf",
-    NULL
-  };
-  static struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-
-  timer_task = NULL;
-
-  ok = 1;
-  GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
-                      "test-transport-api-timeout", "nohelp", options, &run,
-                      &ok);
-
-  return ok;
-}
 
 int
-main (int argc, char *argv[])
+main (int argc,
+      char *argv[])
 {
-  int ret;
-
-  test_name = GNUNET_TRANSPORT_TESTING_get_test_name (argv[0]);
-
-  GNUNET_log_setup (test_name,
-                    "WARNING",
-                    NULL);
-
-  test_source = GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__);
-  test_plugin = GNUNET_TRANSPORT_TESTING_get_test_plugin_name (argv[0],
-                                                               test_source);
-
-  tth = GNUNET_TRANSPORT_TESTING_init ();
-
-  cfg_file_p1 = GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], 1);
-  cfg_file_p2 = GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], 2);
-
-  ret = check ();
-
-  GNUNET_free (cfg_file_p1);
-  GNUNET_free (cfg_file_p2);
-
-  GNUNET_free (test_source);
-  GNUNET_free (test_plugin);
-  GNUNET_free (test_name);
-
+  struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext my_ccc = {
+    .connect_continuation = &timer,
+    .config_file = "test_transport_api_data.conf",
+    .rec = &notify_receive,
+    .nc = &GNUNET_TRANSPORT_TESTING_log_connect,
+    .nd = &notify_disconnect,
+    .shutdown_task = &custom_shutdown,
+    .timeout = TIMEOUT
+  };
 
-  return ret;
+  ccc = &my_ccc;
+  if (GNUNET_OK !=
+      GNUNET_TRANSPORT_TESTING_main (2,
+                                     &GNUNET_TRANSPORT_TESTING_connect_check,
+                                     ccc))
+    return 1;
+  return 0;
 }
 
 /* end of test_transport_api_timeout.c*/