[GNUnet-SVN] r18037 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2011-11-07 10:31:01 +0100 (Mon, 07 Nov 2011)
New Revision: 18037

Modified:
   gnunet/src/transport/test_transport_api_disconnect.c
   gnunet/src/transport/transport-testing.c
Log:
fixing mantis 1878


Modified: gnunet/src/transport/test_transport_api_disconnect.c
===================================================================
--- gnunet/src/transport/test_transport_api_disconnect.c        2011-11-07 
01:51:34 UTC (rev 18036)
+++ gnunet/src/transport/test_transport_api_disconnect.c        2011-11-07 
09:31:01 UTC (rev 18037)
@@ -34,7 +34,7 @@
 #include "transport.h"
 #include "transport-testing.h"
 
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_YES
 #define VERBOSE_ARM GNUNET_EXTRA_LOGGING
 
 #define START_ARM GNUNET_YES
@@ -126,6 +126,12 @@
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
 
+  if (cc != NULL)
+  {
+    GNUNET_TRANSPORT_TESTING_connect_peers_cancel(tth, cc);
+    cc = NULL;
+  }
+
   if (send_task != GNUNET_SCHEDULER_NO_TASK)
   {
     GNUNET_SCHEDULER_cancel (send_task);

Modified: gnunet/src/transport/transport-testing.c
===================================================================
--- gnunet/src/transport/transport-testing.c    2011-11-07 01:51:34 UTC (rev 
18036)
+++ gnunet/src/transport/transport-testing.c    2011-11-07 09:31:01 UTC (rev 
18037)
@@ -205,6 +205,10 @@
   if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
     return;
 
+  GNUNET_assert (cc != NULL);
+  GNUNET_assert (cc->p1 != NULL);
+  GNUNET_assert (cc->p2 != NULL);
+
   char *p2_s = GNUNET_strdup (GNUNET_i2s (&p2->id));
 
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
@@ -402,9 +406,9 @@
 
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
                    "Canceling connect request %X!\n", cc);
+
   if (cc->tct != GNUNET_SCHEDULER_NO_TASK)
     GNUNET_SCHEDULER_cancel (cc->tct);
-
   cc->tct = GNUNET_SCHEDULER_NO_TASK;
 
   GNUNET_CONTAINER_DLL_remove (tth->cc_head, tth->cc_tail, cc);