aboutsummaryrefslogtreecommitdiff
path: root/src/transport/test_transport_api_timeout.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/transport/test_transport_api_timeout.c')
-rw-r--r--src/transport/test_transport_api_timeout.c25
1 files changed, 6 insertions, 19 deletions
diff --git a/src/transport/test_transport_api_timeout.c b/src/transport/test_transport_api_timeout.c
index 8a392949c..9ce701a6f 100644
--- a/src/transport/test_transport_api_timeout.c
+++ b/src/transport/test_transport_api_timeout.c
@@ -235,6 +235,12 @@ testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
235 235
236 shutdown_flag = GNUNET_NO; 236 shutdown_flag = GNUNET_NO;
237 237
238 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Waiting for %llu seconds\n", (WAIT.rel_value) / 1000);
239
240 if (die_task != GNUNET_SCHEDULER_NO_TASK)
241 GNUNET_SCHEDULER_cancel (die_task);
242 die_task = GNUNET_SCHEDULER_add_delayed (WAIT, &end_badly, NULL);
243
238 timer_task = GNUNET_SCHEDULER_add_now (&timer, NULL); 244 timer_task = GNUNET_SCHEDULER_add_now (&timer, NULL);
239} 245}
240 246
@@ -319,7 +325,6 @@ int
319main (int argc, char *argv[]) 325main (int argc, char *argv[])
320{ 326{
321 int ret; 327 int ret;
322 int nat_res;
323 328
324 GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); 329 GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name);
325 330
@@ -337,24 +342,6 @@ main (int argc, char *argv[])
337 342
338 tth = GNUNET_TRANSPORT_TESTING_init (); 343 tth = GNUNET_TRANSPORT_TESTING_init ();
339 344
340 if ((strcmp (test_plugin, "tcp_nat") == 0) ||
341 (strcmp (test_plugin, "udp_nat") == 0))
342 {
343 nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server");
344 if (GNUNET_NO == nat_res)
345 {
346 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n",
347 "gnunet-nat-server", "SUID not set");
348 return 0;
349 }
350 if (GNUNET_SYSERR == nat_res)
351 {
352 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n",
353 "gnunet-nat-server", "file not found");
354 return 0;
355 }
356 }
357
358 GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1); 345 GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1);
359 GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2); 346 GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2);
360 347