-simplify logic

[oweals/gnunet.git] / src / transport / test_transport_api_reliability.c

diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c
index a727d3e6a2f871eea91efcd3a4aee5afe032b7be..91ef818689c7f40127a8cf16390aaac6e5137ab5 100644 (file)
--- a/src/transport/test_transport_api_reliability.c
+++ b/src/transport/test_transport_api_reliability.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009, 2010 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -48,7 +48,7 @@
 /**
  * Testcase timeout
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 900)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 90)
 
 /**
  * How long until we give up on transmitting the message?
@@ -87,22 +87,22 @@ static int ok;
 /**
  * Context of peer 1
  */
-struct PeerContext *p1;
+static struct PeerContext *p1;
 
 /**
  * Configuration file of peer 1
  */
-char *cfg_file_p1;
+static char *cfg_file_p1;
 
 /**
  * Context of peer 2
  */
-struct PeerContext *p2;
+static struct PeerContext *p2;
 
 /**
  * Configuration file of peer 1
  */
-char *cfg_file_p2;
+static char *cfg_file_p2;
 
 /**
  * Timeout task
@@ -112,12 +112,12 @@ static struct GNUNET_SCHEDULER_Task * die_task;
 /**
  * Transport transmit handle used
  */
-struct GNUNET_TRANSPORT_TransmitHandle *th;
+static struct GNUNET_TRANSPORT_TransmitHandle *th;
 
 /**
  * Transport testing handle
  */
-struct GNUNET_TRANSPORT_TESTING_handle *tth;
+static struct GNUNET_TRANSPORT_TESTING_handle *tth;
 
 /*
  * Total amount of bytes sent
@@ -145,7 +145,9 @@ static int msg_sent;
 static int msg_recv;
 
 static int test_connected;
+
 static int test_sending;
+
 static int test_send_timeout;
 
 
@@ -167,9 +169,11 @@ static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
 #define OKPP do { ok++; } while (0)
 #endif
 
+
 static int
 get_bit (const char *map, unsigned int bit);
 
+
 static void
 end ()
 {
@@ -223,14 +227,17 @@ end ()
 static void
 end_badly ()
 {
-  int i;
-  die_task = NULL;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
+  unsigned int i;
 
+  die_task = NULL;
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Fail! Stopping peers\n");
   if (test_connected == GNUNET_YES)
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peers got connected\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Peers got connected\n");
   else
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peers got NOT connected\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Peers got NOT connected\n");
 
   if (test_sending == GNUNET_NO)
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -242,7 +249,9 @@ end_badly ()
   {
     if (get_bit (bitmap, i) == 0)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Did not receive message %d\n", i);
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Did not receive message %u\n",
+                  i);
       ok = -1;
     }
   }