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

[gnunet]

Author: grothoff
Date: 2011-10-05 15:45:47 +0200 (Wed, 05 Oct 2011)
New Revision: 17220

Modified:
   gnunet/src/core/test_core_api.c
   gnunet/src/core/test_core_quota_compliance.c
Log:
cancel con_task

Modified: gnunet/src/core/test_core_api.c
===================================================================
--- gnunet/src/core/test_core_api.c     2011-10-05 13:38:31 UTC (rev 17219)
+++ gnunet/src/core/test_core_api.c     2011-10-05 13:45:47 UTC (rev 17220)
@@ -91,11 +91,22 @@
 {
   GNUNET_assert (ok == 6);
   GNUNET_CORE_disconnect (p1.ch);
+  p1.ch = NULL;
   GNUNET_CORE_disconnect (p2.ch);
+  p2.ch = NULL;
   GNUNET_TRANSPORT_get_hello_cancel (p1.ghh);
+  p1.ghh = NULL;
   GNUNET_TRANSPORT_get_hello_cancel (p2.ghh);
+  p2.ghh = NULL;
   GNUNET_TRANSPORT_disconnect (p1.th);
+  p1.th = NULL;
   GNUNET_TRANSPORT_disconnect (p2.th);
+  p2.th = NULL;
+  if (GNUNET_SCHEDULER_NO_TASK != con_task)
+  {
+    GNUNET_SCHEDULER_cancel (con_task);
+    con_task = GNUNET_SCHEDULER_NO_TASK;
+  }
   ok = 0;
 }
 
@@ -129,6 +140,11 @@
     GNUNET_TRANSPORT_disconnect (p2.th);
     p2.th = NULL;
   }
+  if (GNUNET_SCHEDULER_NO_TASK != con_task)
+  {
+    GNUNET_SCHEDULER_cancel (con_task);
+    con_task = GNUNET_SCHEDULER_NO_TASK;
+  }
   ok = 42;
 }
 
@@ -259,11 +275,12 @@
       GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &connect_task,
                                     NULL);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Asking core (1) to connect to peer `%4s'\n",
+              "Asking transport (1) to connect to peer `%4s'\n",
               GNUNET_i2s (&p2.id));
   GNUNET_TRANSPORT_try_connect (p1.th, &p2.id);
 }
 
+
 static void
 init_notify (void *cls, struct GNUNET_CORE_Handle *server,
              const struct GNUNET_PeerIdentity *my_identity,
@@ -335,6 +352,7 @@
                            GNUNET_YES, &outbound_notify, GNUNET_YES, handlers);
 }
 
+
 static void
 stop_arm (struct PeerContext *p)
 {

Modified: gnunet/src/core/test_core_quota_compliance.c
===================================================================
--- gnunet/src/core/test_core_quota_compliance.c        2011-10-05 13:38:31 UTC 
(rev 17219)
+++ gnunet/src/core/test_core_quota_compliance.c        2011-10-05 13:45:47 UTC 
(rev 17220)
@@ -535,6 +535,7 @@
                 GNUNET_i2s (&p2.id));
 #endif
     GNUNET_TRANSPORT_try_connect (p1.th, &p2.id);
+    GNUNET_TRANSPORT_try_connect (p2.th, &p1.id);
   }
 }