aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2012-11-14 15:11:19 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2012-11-14 15:11:19 +0000
commit109dc0faed8cf1df4980c9fff9bca83bebdd099d (patch)
tree84d7024b7a3cf156f08681b73dc7800e225487e1
parent734c4245957b1df83c7818e44f1ec0a8f92d34c8 (diff)
downloadgnunet-109dc0faed8cf1df4980c9fff9bca83bebdd099d.tar.gz
gnunet-109dc0faed8cf1df4980c9fff9bca83bebdd099d.zip
-fixes
-rw-r--r--src/testbed/gnunet-service-testbed.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c
index 1cce1bf42..70c61cfdc 100644
--- 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,
2897 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != occ->timeout_task); 2897 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != occ->timeout_task);
2898 GNUNET_SCHEDULER_cancel (occ->timeout_task); 2898 GNUNET_SCHEDULER_cancel (occ->timeout_task);
2899 occ->timeout_task = GNUNET_SCHEDULER_NO_TASK; 2899 occ->timeout_task = GNUNET_SCHEDULER_NO_TASK;
2900 GNUNET_free_non_null (occ->emsg); 2900 if (GNUNET_SCHEDULER_NO_TASK != occ->tcc.task)
2901 occ->emsg = NULL;
2902 if (NULL != occ->tcc.th)
2903 { 2901 {
2904 GNUNET_TRANSPORT_disconnect (occ->tcc.th); 2902 GNUNET_SCHEDULER_cancel (occ->tcc.task);
2905 occ->tcc.th = NULL; 2903 occ->tcc.task = GNUNET_SCHEDULER_NO_TASK;
2906 peer_list[occ->other_peer_id]->reference_cnt--;
2907 } 2904 }
2905 GNUNET_free_non_null (occ->emsg);
2906 occ->emsg = NULL;
2908 LOG_DEBUG ("Peers connected - Sending overlay connect success\n"); 2907 LOG_DEBUG ("Peers connected - Sending overlay connect success\n");
2909 msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_ConnectionEventMessage)); 2908 msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_ConnectionEventMessage));
2910 msg->header.size = 2909 msg->header.size =