-fixes

diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c
index 1cce1bf423751b73610a86717602615f70b67449..70c61cfdc8b4e7665825739115d13992acd453c4 100644 (file)
--- a/src/testbed/gnunet-service-testbed.c
+++ b/src/testbed/gnunet-service-testbed.c
@@ -2897,14 +2897,13 @@ overlay_connect_notify (void *cls, const struct GNUNET_PeerIdentity *new_peer,
   GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != occ->timeout_task);
   GNUNET_SCHEDULER_cancel (occ->timeout_task);
   occ->timeout_task = GNUNET_SCHEDULER_NO_TASK;
-  GNUNET_free_non_null (occ->emsg);
-  occ->emsg = NULL;
-  if (NULL != occ->tcc.th)
+  if (GNUNET_SCHEDULER_NO_TASK != occ->tcc.task)
   {
-    GNUNET_TRANSPORT_disconnect (occ->tcc.th);
-    occ->tcc.th = NULL;
-    peer_list[occ->other_peer_id]->reference_cnt--;
+    GNUNET_SCHEDULER_cancel (occ->tcc.task);
+    occ->tcc.task = GNUNET_SCHEDULER_NO_TASK;
   }
+  GNUNET_free_non_null (occ->emsg);
+  occ->emsg = NULL;
   LOG_DEBUG ("Peers connected - Sending overlay connect success\n");
   msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_ConnectionEventMessage));
   msg->header.size =