1 files changed, 48 insertions, 44 deletions

diff --git a/src/transport/test_transport_testing_restart.c b/src/transport/test_transport_testing_restart.c
index 2f36e080a..2d06bf668 100644
--- a/src/transport/test_transport_testing_restart.c
+++ b/src/transport/test_transport_testing_restart.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     Copyright (C) 2009, 2010 GNUnet e.V.
+     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
@@ -21,52 +21,48 @@
  * @file transport/test_transport_testing_restart.c
  * @brief test case for transport testing library:
  * start the peer, get the HELLO message, restart and stop the peer
- *
  */
 #include "platform.h"
 #include "gnunet_transport_service.h"
 #include "transport-testing.h"
 
-/**
- * How long until we give up on transmitting the message?
- */
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
 
-struct GNUNET_SCHEDULER_Task * timeout_task;
+
+static struct GNUNET_SCHEDULER_Task *timeout_task;
 
 static struct GNUNET_TRANSPORT_TESTING_PeerContext *p;
 
-struct GNUNET_TRANSPORT_TESTING_Handle *tth;
+static struct GNUNET_TRANSPORT_TESTING_Handle *tth;
+
+static int ret;
 
-static int ret = 0;
 
 static void
 end ()
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n");
-
-  if (timeout_task != NULL)
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Stopping peers\n");
+  if (NULL != timeout_task)
     GNUNET_SCHEDULER_cancel (timeout_task);
-
-  GNUNET_TRANSPORT_TESTING_stop_peer (p);
-  GNUNET_TRANSPORT_TESTING_done (tth);
+  if (NULL != p)
+    GNUNET_TRANSPORT_TESTING_stop_peer (p);
+  if (NULL != tth)
+    GNUNET_TRANSPORT_TESTING_done (tth);
 }
 
+
 static void
 end_badly ()
 {
   timeout_task = NULL;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
-
-  if (NULL != p)
-    GNUNET_TRANSPORT_TESTING_stop_peer (p);
-
-  if (NULL != tth)
-    GNUNET_TRANSPORT_TESTING_done (tth);
-
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Timeout!\n");
+  end ();
   ret = GNUNET_SYSERR;
 }
 
+
 static void
 restart_cb (struct GNUNET_TRANSPORT_TESTING_PeerContext *p,
             void *cls)
@@ -76,7 +72,7 @@ restart_cb (struct GNUNET_TRANSPORT_TESTING_PeerContext *p,
               p->no,
               GNUNET_i2s (&p->id));
   ret = 0;
-  GNUNET_SCHEDULER_add_now (&end, NULL);
+  end ();
 }
 
 
@@ -84,7 +80,7 @@ static void
 restart_task ()
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Peer %u (`%s') restarting, \n",
+              "Peer %u (`%s') restarting\n",
               p->no,
               GNUNET_i2s (&p->id));
   GNUNET_TRANSPORT_TESTING_restart_peer (p,
@@ -94,26 +90,30 @@ restart_task ()
 
 
 static void
-start_cb (struct GNUNET_TRANSPORT_TESTING_PeerContext *p, void *cls)
+start_cb (struct GNUNET_TRANSPORT_TESTING_PeerContext *p,
+          void *cls)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%s') successfully started\n",
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Peer %u (`%s') successfully started\n",
               p->no,
               GNUNET_i2s (&p->id));
-
-  GNUNET_SCHEDULER_add_now (&restart_task, NULL);
+  GNUNET_SCHEDULER_add_now (&restart_task,
+                            NULL);
 }
 
 
 static void
-run (void *cls, char *const *args, const char *cfgfile,
+run (void *cls,
+     char *const *args,
+     const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   ret = 1;
   tth = GNUNET_TRANSPORT_TESTING_init ();
   GNUNET_assert (NULL != tth);
 
-  timeout_task =
-      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
+  timeout_task
+    = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
                                     &end_badly,
                                     NULL);
   p = GNUNET_TRANSPORT_TESTING_start_peer(tth,
@@ -126,33 +126,37 @@ run (void *cls, char *const *args, const char *cfgfile,
                                           NULL); /* closure */
   if (NULL == p)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Failed to start peer\n");
-    if (timeout_task != NULL)
-      GNUNET_SCHEDULER_cancel (timeout_task);
-    timeout_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to start peer\n");
+    end ();
+    ret = 1;
   }
 }
 
+
 int
-main (int argc, char *argv[])
+main (int argc,
+      char *argv[])
 {
-  GNUNET_log_setup ("test_transport_testing_restart",
-                    "WARNING",
-                    NULL);
-
   char *const argv_1[] = { "test_transport_testing_restart",
     "-c",
     "test_transport_api_data.conf",
     NULL
   };
-
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
 
-  GNUNET_PROGRAM_run ((sizeof (argv_1) / sizeof (char *)) - 1, argv_1,
-                      "test_transport_testing_restart", "nohelp", options, &run, &ret);
-
+  GNUNET_log_setup ("test_transport_testing_restart",
+                    "WARNING",
+                    NULL);
+  GNUNET_PROGRAM_run ((sizeof (argv_1) / sizeof (char *)) - 1,
+                      argv_1,
+                      "test_transport_testing_restart",
+                      "nohelp",
+                      options,
+                      &run,
+                      NULL);
   return ret;
 }