[GNUnet-SVN] r17531 - gnunet/src/core

[gnunet]

Author: grothoff
Date: 2011-10-17 13:12:21 +0200 (Mon, 17 Oct 2011)
New Revision: 17531

Modified:
   gnunet/src/core/test_core_quota_compliance.c
Log:
try to connect more than just once

Modified: gnunet/src/core/test_core_quota_compliance.c
===================================================================
--- gnunet/src/core/test_core_quota_compliance.c        2011-10-17 11:05:05 UTC 
(rev 17530)
+++ gnunet/src/core/test_core_quota_compliance.c        2011-10-17 11:12:21 UTC 
(rev 17531)
@@ -72,7 +72,9 @@
 
 static GNUNET_SCHEDULER_TaskIdentifier measure_task;
 
+static GNUNET_SCHEDULER_TaskIdentifier connect_task;
 
+
 struct PeerContext
 {
   struct GNUNET_CONFIGURATION_Handle *cfg;
@@ -132,6 +134,8 @@
     GNUNET_CORE_notify_transmit_ready_cancel (p1.nth);
     p1.nth = NULL;
   }
+  if (connect_task != GNUNET_SCHEDULER_NO_TASK)
+    GNUNET_SCHEDULER_cancel (connect_task);
   ch = p1.ch;
   p1.ch = NULL;
   GNUNET_CORE_disconnect (ch);
@@ -160,6 +164,8 @@
   }
   if (measure_task != GNUNET_SCHEDULER_NO_TASK)
     GNUNET_SCHEDULER_cancel (measure_task);
+  if (connect_task != GNUNET_SCHEDULER_NO_TASK)
+    GNUNET_SCHEDULER_cancel (connect_task);
 
   GNUNET_TRANSPORT_get_hello_cancel (p1.ghh);
   GNUNET_TRANSPORT_get_hello_cancel (p2.ghh);
@@ -176,6 +182,15 @@
 }
 
 
+static void
+try_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  connect_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+                                              &try_connect, NULL);
+  GNUNET_TRANSPORT_try_connect (p1.th, &p2.id);
+  GNUNET_TRANSPORT_try_connect (p2.th, &p1.id);
+}
+
 /**
  * Callback function to process statistic values.
  *
@@ -533,8 +548,8 @@
                 "Asking core (1) to connect to peer `%4s'\n",
                 GNUNET_i2s (&p2.id));
 #endif
-    GNUNET_TRANSPORT_try_connect (p1.th, &p2.id);
-    GNUNET_TRANSPORT_try_connect (p2.th, &p1.id);
+    connect_task = GNUNET_SCHEDULER_add_now (&try_connect,
+                                            NULL);
   }
 }