Check that you are not present in trail twice

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

diff --git a/src/transport/test_transport_address_switch.c b/src/transport/test_transport_address_switch.c
index d59d5d265ecade08eb3b42863a9827bd32a9b78c..fcbd798d04655dfe084abfdd57a6be1b041b9ac0 100644 (file)
--- a/src/transport/test_transport_address_switch.c
+++ b/src/transport/test_transport_address_switch.c
@@ -97,10 +97,12 @@ static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
 static unsigned int p1_switch_attempts;
 static unsigned int p1_switch_success;
 static unsigned int p1_switch_fail;
+static unsigned int p1_addresses_avail;
 
 static unsigned int p2_switch_attempts;
 static unsigned int p2_switch_success;
 static unsigned int p2_switch_fail;
+static unsigned int p2_addresses_avail;
 
 static unsigned long long bytes_sent_total;
 static unsigned long long bytes_recv_total;
@@ -169,6 +171,9 @@ static int
 stat_fail_attempt_cb (void *cls, const char *subsystem, const char *name,
     uint64_t value, int is_persistent)
 {
+  if (value == 0)
+    return GNUNET_OK;
+
   if (cls == p1)
   {
     p1_switch_fail++;
@@ -183,6 +188,21 @@ stat_fail_attempt_cb (void *cls, const char *subsystem, const char *name,
   return GNUNET_OK;
 }
 
+static int
+stat_addresses_available (void *cls, const char *subsystem, const char *name,
+    uint64_t value, int is_persistent)
+{
+  if (cls == p1)
+  {
+    p1_addresses_avail++;
+  }
+  if (cls == p2)
+  {
+    p2_addresses_avail++;
+  }
+
+  return GNUNET_OK;
+}
 
 static void
 clean_up ()
@@ -208,9 +228,11 @@ clean_up ()
   if (NULL != p1_stat)
   {
     GNUNET_STATISTICS_watch_cancel (p1_stat, "transport",
-        "# Attempts to switch addresses", stat_start_attempt_cb, p1);
+        "# Attempts to switch addresses",
+        stat_start_attempt_cb, p1);
     GNUNET_STATISTICS_watch_cancel (p1_stat, "transport",
-        "# Successful attempts to switch addresses", stat_success_attempt_cb, p1);
+        "# Successful attempts to switch addresses",
+        stat_success_attempt_cb, p1);
     GNUNET_STATISTICS_watch_cancel (p1_stat, "transport",
         "# Failed attempts to switch addresses (failed to send CONNECT CONT)",
         stat_fail_attempt_cb, p1);
@@ -220,6 +242,9 @@ clean_up ()
     GNUNET_STATISTICS_watch_cancel (p1_stat, "transport",
         "# Failed attempts to switch addresses (no response)",
         stat_fail_attempt_cb, p1);
+    GNUNET_STATISTICS_watch (p1_stat, "transport",
+        "# transport addresses",
+        stat_addresses_available, p1);
     GNUNET_STATISTICS_destroy (p1_stat, GNUNET_NO);
     p1_stat = NULL;
   }
@@ -238,6 +263,9 @@ clean_up ()
     GNUNET_STATISTICS_watch_cancel (p2_stat, "transport",
         "# Failed attempts to switch addresses (no response)",
         stat_fail_attempt_cb, p2);
+    GNUNET_STATISTICS_watch (p2_stat, "transport",
+        "# transport addresses",
+        stat_addresses_available, p2);
     GNUNET_STATISTICS_destroy (p2_stat, GNUNET_NO);
     p2_stat = NULL;
   }
@@ -287,26 +315,44 @@ end ()
     FPRINTF (stderr, "Peer 1 tried %u times to switch and succeeded %u times, failed %u times\n",
         p1_switch_attempts, p1_switch_success, p1_switch_fail);
     if (p1_switch_success != p1_switch_attempts)
+    {
+      GNUNET_break (0);
       result ++;
+    }
+  }
+  else
+  {
+    FPRINTF (stderr, "Peer 1 had %u addresses available, but did not try to switch\n",
+        p1_addresses_avail);
   }
   if (p2_switch_attempts > 0)
   {
     FPRINTF (stderr, "Peer 2 tried %u times to switch and succeeded %u times, failed %u times\n",
         p2_switch_attempts, p2_switch_success, p2_switch_fail);
     if (p2_switch_success != p2_switch_attempts)
+    {
+      GNUNET_break (0);
       result ++;
+    }
+  }
+  else
+  {
+    FPRINTF (stderr, "Peer 2 had %u addresses available, but did not try to switch\n",
+        p2_addresses_avail);
   }
 
   if ( ((p1_switch_attempts > 0) || (p2_switch_attempts > 0)) &&
        (bytes_sent_after_switch == 0) )
   {
     FPRINTF (stderr, "No data sent after switching!\n");
+    GNUNET_break (0);
     res ++;
   }
   if ( ((p1_switch_attempts > 0) || (p2_switch_attempts > 0)) &&
        (bytes_recv_after_switch == 0) )
   {
     FPRINTF (stderr, "No data received after switching!\n");
+    GNUNET_break (0);
     res ++;
   }
 
@@ -322,6 +368,11 @@ end_badly ()
   die_task = GNUNET_SCHEDULER_NO_TASK;
   GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
 
+  FPRINTF (stderr, "Peer 1 had %u addresses available, but did not try to switch\n",
+      p1_addresses_avail);
+  FPRINTF (stderr, "Peer 2 had %u addresses available, but did not try to switch\n",
+      p2_addresses_avail);
+
   if (test_connected == GNUNET_YES)
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Peers got connected\n");
   else
@@ -550,6 +601,19 @@ run (void *cls, char * const *args, const char *cfgfile,
 
   p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p1, 1,
       &notify_receive, &notify_connect, &notify_disconnect, &start_cb, NULL );
+
+  p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p2, 2,
+      &notify_receive, &notify_connect, &notify_disconnect, &start_cb, NULL );
+
+  if ((p1 == NULL )|| (p2 == NULL))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n");
+    if (die_task != GNUNET_SCHEDULER_NO_TASK)
+    GNUNET_SCHEDULER_cancel (die_task);
+    die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+    return;
+  }
+
   p1_stat = GNUNET_STATISTICS_create ("transport", p1->cfg);
   GNUNET_STATISTICS_watch (p1_stat, "transport",
       "# Attempts to switch addresses",
@@ -566,9 +630,9 @@ run (void *cls, char * const *args, const char *cfgfile,
   GNUNET_STATISTICS_watch (p1_stat, "transport",
       "# Failed attempts to switch addresses (no response)",
       stat_fail_attempt_cb, p1);
-
-  p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p2, 2,
-      &notify_receive, &notify_connect, &notify_disconnect, &start_cb, NULL );
+  GNUNET_STATISTICS_watch (p1_stat, "transport",
+      "# transport addresses",
+      stat_addresses_available, p1);
 
   p2_stat = GNUNET_STATISTICS_create ("transport", p2->cfg);
   GNUNET_STATISTICS_watch (p2_stat, "transport",
@@ -586,15 +650,9 @@ run (void *cls, char * const *args, const char *cfgfile,
   GNUNET_STATISTICS_watch (p2_stat, "transport",
       "# Failed attempts to switch addresses (no response)",
       stat_fail_attempt_cb, p2);
-
-  if ((p1 == NULL )|| (p2 == NULL))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n");
-    if (die_task != GNUNET_SCHEDULER_NO_TASK)
-    GNUNET_SCHEDULER_cancel (die_task);
-    die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-    return;
-  }
+  GNUNET_STATISTICS_watch (p2_stat, "transport",
+      "# transport addresses",
+      stat_addresses_available, p2);
 
   if ((p1_stat == NULL )|| (p2_stat == NULL))
   {