diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-10-29 14:27:37 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-10-29 14:27:37 +0000 |
commit | 9baa7c3f6e6b7f1a29e3004147b9c70dddd33c74 (patch) | |
tree | ca1237b138edb085fa91ca34cf8069b86fe6a64c /src/core/test_core_api_reliability.c | |
parent | 8459c76076092899a74aa7e4451ed24faf91684b (diff) | |
download | gnunet-9baa7c3f6e6b7f1a29e3004147b9c70dddd33c74.tar.gz gnunet-9baa7c3f6e6b7f1a29e3004147b9c70dddd33c74.zip |
replacing deprecated transport_try_connect call with ATS call
Diffstat (limited to 'src/core/test_core_api_reliability.c')
-rw-r--r-- | src/core/test_core_api_reliability.c | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/src/core/test_core_api_reliability.c b/src/core/test_core_api_reliability.c index dfea0cdcc..ffbdd3a28 100644 --- a/src/core/test_core_api_reliability.c +++ b/src/core/test_core_api_reliability.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet. | 2 | This file is part of GNUnet. |
3 | Copyright (C) 2009, 2010 Christian Grothoff (and other contributing authors) | 3 | Copyright (C) 2009, 2010, 2015 Christian Grothoff (and other contributing authors) |
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 |
@@ -55,8 +55,6 @@ static struct GNUNET_TIME_Absolute start_time; | |||
55 | 55 | ||
56 | static struct GNUNET_SCHEDULER_Task *err_task; | 56 | static struct GNUNET_SCHEDULER_Task *err_task; |
57 | 57 | ||
58 | static struct GNUNET_SCHEDULER_Task *connect_task; | ||
59 | |||
60 | 58 | ||
61 | struct PeerContext | 59 | struct PeerContext |
62 | { | 60 | { |
@@ -137,11 +135,6 @@ terminate_task (void *cls, | |||
137 | 135 | ||
138 | terminate_peer (&p1); | 136 | terminate_peer (&p1); |
139 | terminate_peer (&p2); | 137 | terminate_peer (&p2); |
140 | if (NULL != connect_task) | ||
141 | { | ||
142 | GNUNET_SCHEDULER_cancel (connect_task); | ||
143 | connect_task = NULL; | ||
144 | } | ||
145 | delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value_us; | 138 | delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value_us; |
146 | FPRINTF (stderr, | 139 | FPRINTF (stderr, |
147 | "\nThroughput was %llu kb/s\n", | 140 | "\nThroughput was %llu kb/s\n", |
@@ -159,26 +152,10 @@ terminate_task_error (void *cls, | |||
159 | GNUNET_break (0); | 152 | GNUNET_break (0); |
160 | terminate_peer (&p1); | 153 | terminate_peer (&p1); |
161 | terminate_peer (&p2); | 154 | terminate_peer (&p2); |
162 | if (NULL != connect_task) | ||
163 | { | ||
164 | GNUNET_SCHEDULER_cancel (connect_task); | ||
165 | connect_task = NULL; | ||
166 | } | ||
167 | ok = 42; | 155 | ok = 42; |
168 | } | 156 | } |
169 | 157 | ||
170 | 158 | ||
171 | static void | ||
172 | try_connect (void *cls, | ||
173 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
174 | { | ||
175 | connect_task = | ||
176 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &try_connect, | ||
177 | NULL); | ||
178 | GNUNET_TRANSPORT_try_connect (p1.th, &p2.id, NULL, NULL); /*FIXME TRY_CONNECT change */ | ||
179 | } | ||
180 | |||
181 | |||
182 | static size_t | 159 | static size_t |
183 | transmit_ready (void *cls, size_t size, void *buf) | 160 | transmit_ready (void *cls, size_t size, void *buf) |
184 | { | 161 | { |
@@ -396,7 +373,9 @@ init_notify (void *cls, | |||
396 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 373 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
397 | "Asking transport (1) to connect to peer `%s'\n", | 374 | "Asking transport (1) to connect to peer `%s'\n", |
398 | GNUNET_i2s (&p2.id)); | 375 | GNUNET_i2s (&p2.id)); |
399 | connect_task = GNUNET_SCHEDULER_add_now (&try_connect, NULL); | 376 | p1.ats_sh = GNUNET_ATS_connectivity_suggest (p1.ats, |
377 | &p2.id, | ||
378 | 1); | ||
400 | } | 379 | } |
401 | } | 380 | } |
402 | 381 | ||