aboutsummaryrefslogtreecommitdiff
path: root/src/ats-tests/ats-testing.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/ats-tests/ats-testing.c')
-rw-r--r--src/ats-tests/ats-testing.c25
1 files changed, 3 insertions, 22 deletions
diff --git a/src/ats-tests/ats-testing.c b/src/ats-tests/ats-testing.c
index eb30daa6b..326d3bdd4 100644
--- a/src/ats-tests/ats-testing.c
+++ b/src/ats-tests/ats-testing.c
@@ -1,6 +1,6 @@
1/* 1/*
2 This file is part of GNUnet. 2 This file is part of GNUnet.
3 Copyright (C) 2010-2013, 2016 GNUnet e.V. 3 Copyright (C) 2010-2013, 2016, 2017 GNUnet e.V.
4 4
5 GNUnet is free software; you can redistribute it and/or modify 5 GNUnet is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published 6 it under the terms of the GNU General Public License as published
@@ -88,11 +88,6 @@ do_shutdown (void *cls)
88 88
89 for (c_op = 0; c_op < p->num_partners; c_op++) 89 for (c_op = 0; c_op < p->num_partners; c_op++)
90 { 90 {
91 if (NULL != p->partners[c_op].cth)
92 {
93 GNUNET_CORE_notify_transmit_ready_cancel (p->partners[c_op].cth);
94 p->partners[c_op].cth = NULL;
95 }
96 if ( (NULL != p->core_connect_ops) && 91 if ( (NULL != p->core_connect_ops) &&
97 (NULL != p->core_connect_ops[c_op].connect_op) ) 92 (NULL != p->core_connect_ops[c_op].connect_op) )
98 { 93 {
@@ -128,15 +123,6 @@ do_shutdown (void *cls)
128 GNUNET_TESTBED_operation_done (p->peer_id_op); 123 GNUNET_TESTBED_operation_done (p->peer_id_op);
129 p->peer_id_op = NULL; 124 p->peer_id_op = NULL;
130 } 125 }
131
132 for (c_op = 0; c_op < p->num_partners; c_op++)
133 {
134 if (NULL != p->partners[c_op].cth)
135 {
136 GNUNET_CORE_notify_transmit_ready_cancel (p->partners[c_op].cth);
137 p->partners[c_op].cth = NULL;
138 }
139 }
140 if (NULL != p->ats_perf_op) 126 if (NULL != p->ats_perf_op)
141 { 127 {
142 GNUNET_TESTBED_operation_done (p->ats_perf_op); 128 GNUNET_TESTBED_operation_done (p->ats_perf_op);
@@ -314,11 +300,6 @@ comm_disconnect_cb (void *cls,
314 "%s disconnected from %s while benchmarking\n", 300 "%s disconnected from %s while benchmarking\n",
315 id, 301 id,
316 GNUNET_i2s (peer)); 302 GNUNET_i2s (peer));
317 if (NULL != p->cth)
318 {
319 GNUNET_CORE_notify_transmit_ready_cancel (p->cth);
320 p->cth = NULL;
321 }
322 } 303 }
323 GNUNET_free(id); 304 GNUNET_free(id);
324} 305}
@@ -403,7 +384,7 @@ core_connect_adapter (void *cls,
403 GNUNET_MQ_handler_end () 384 GNUNET_MQ_handler_end ()
404 }; 385 };
405 386
406 me->ch = GNUNET_CORE_connecT (cfg, 387 me->ch = GNUNET_CORE_connect (cfg,
407 me, 388 me,
408 NULL, 389 NULL,
409 &comm_connect_cb, 390 &comm_connect_cb,
@@ -422,7 +403,7 @@ core_disconnect_adapter (void *cls,
422{ 403{
423 struct BenchmarkPeer *me = cls; 404 struct BenchmarkPeer *me = cls;
424 405
425 GNUNET_CORE_disconnecT (me->ch); 406 GNUNET_CORE_disconnect (me->ch);
426 me->ch = NULL; 407 me->ch = NULL;
427} 408}
428 409