diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-02-27 15:24:26 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-02-27 15:24:26 +0000 |
commit | 1b4e1f7577f04263bb959874c5ddc1ef1a9f1769 (patch) | |
tree | 6473912c77b32b92a0f19254776526353febb654 | |
parent | 1ba0b6ccf604b30da51c7feba659b19d955e8b72 (diff) | |
download | gnunet-1b4e1f7577f04263bb959874c5ddc1ef1a9f1769.tar.gz gnunet-1b4e1f7577f04263bb959874c5ddc1ef1a9f1769.zip |
- removing old nat server code
-rw-r--r-- | src/transport/test_quota_compliance.c | 20 | ||||
-rw-r--r-- | src/transport/test_transport_api.c | 19 | ||||
-rw-r--r-- | src/transport/test_transport_api_bidirectional_connect.c | 19 | ||||
-rw-r--r-- | src/transport/test_transport_api_disconnect.c | 19 | ||||
-rw-r--r-- | src/transport/test_transport_api_limited_sockets.c | 20 | ||||
-rw-r--r-- | src/transport/test_transport_api_reliability.c | 19 | ||||
-rw-r--r-- | src/transport/test_transport_api_restart_1peer.c | 2 | ||||
-rw-r--r-- | src/transport/test_transport_api_restart_2peers.c | 2 | ||||
-rw-r--r-- | src/transport/test_transport_api_timeout.c | 25 | ||||
-rw-r--r-- | src/transport/test_transport_api_unreliability.c | 19 | ||||
-rw-r--r-- | src/transport/test_transport_api_unreliability_constant.c | 19 |
11 files changed, 6 insertions, 177 deletions
diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c index b0111cc89..8f4db5352 100644 --- a/src/transport/test_quota_compliance.c +++ b/src/transport/test_quota_compliance.c | |||
@@ -583,8 +583,6 @@ check () | |||
583 | int | 583 | int |
584 | main (int argc, char *argv[]) | 584 | main (int argc, char *argv[]) |
585 | { | 585 | { |
586 | int nat_res; | ||
587 | |||
588 | GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); | 586 | GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); |
589 | 587 | ||
590 | GNUNET_log_setup (test_name, | 588 | GNUNET_log_setup (test_name, |
@@ -601,24 +599,6 @@ main (int argc, char *argv[]) | |||
601 | 599 | ||
602 | tth = GNUNET_TRANSPORT_TESTING_init (); | 600 | tth = GNUNET_TRANSPORT_TESTING_init (); |
603 | 601 | ||
604 | if ((strcmp (test_plugin, "tcp_nat") == 0) || | ||
605 | (strcmp (test_plugin, "udp_nat") == 0)) | ||
606 | { | ||
607 | nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server"); | ||
608 | if (GNUNET_NO == nat_res) | ||
609 | { | ||
610 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n", | ||
611 | "gnunet-nat-server", "SUID not set"); | ||
612 | return 0; | ||
613 | } | ||
614 | if (GNUNET_SYSERR == nat_res) | ||
615 | { | ||
616 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n", | ||
617 | "gnunet-nat-server", "file not found"); | ||
618 | return 0; | ||
619 | } | ||
620 | } | ||
621 | |||
622 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1); | 602 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1); |
623 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2); | 603 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2); |
624 | 604 | ||
diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c index 021dec87a..5fb81e1af 100644 --- a/src/transport/test_transport_api.c +++ b/src/transport/test_transport_api.c | |||
@@ -406,7 +406,6 @@ int | |||
406 | main (int argc, char *argv[]) | 406 | main (int argc, char *argv[]) |
407 | { | 407 | { |
408 | int ret; | 408 | int ret; |
409 | int nat_res; | ||
410 | 409 | ||
411 | GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); | 410 | GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); |
412 | GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source); | 411 | GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source); |
@@ -423,24 +422,6 @@ main (int argc, char *argv[]) | |||
423 | 422 | ||
424 | tth = GNUNET_TRANSPORT_TESTING_init (); | 423 | tth = GNUNET_TRANSPORT_TESTING_init (); |
425 | 424 | ||
426 | if ((strcmp (test_plugin, "tcp_nat") == 0) || | ||
427 | (strcmp (test_plugin, "udp_nat") == 0)) | ||
428 | { | ||
429 | nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server"); | ||
430 | if (GNUNET_NO == nat_res) | ||
431 | { | ||
432 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n", | ||
433 | "gnunet-nat-server", "SUID not set"); | ||
434 | return 0; | ||
435 | } | ||
436 | if (GNUNET_SYSERR == nat_res) | ||
437 | { | ||
438 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n", | ||
439 | "gnunet-nat-server", "file not found"); | ||
440 | return 0; | ||
441 | } | ||
442 | } | ||
443 | |||
444 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1); | 425 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1); |
445 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2); | 426 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2); |
446 | 427 | ||
diff --git a/src/transport/test_transport_api_bidirectional_connect.c b/src/transport/test_transport_api_bidirectional_connect.c index a54d0891a..604554c51 100644 --- a/src/transport/test_transport_api_bidirectional_connect.c +++ b/src/transport/test_transport_api_bidirectional_connect.c | |||
@@ -378,7 +378,6 @@ int | |||
378 | main (int argc, char *argv[]) | 378 | main (int argc, char *argv[]) |
379 | { | 379 | { |
380 | int ret; | 380 | int ret; |
381 | int nat_res; | ||
382 | 381 | ||
383 | GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); | 382 | GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); |
384 | 383 | ||
@@ -396,24 +395,6 @@ main (int argc, char *argv[]) | |||
396 | 395 | ||
397 | tth = GNUNET_TRANSPORT_TESTING_init (); | 396 | tth = GNUNET_TRANSPORT_TESTING_init (); |
398 | 397 | ||
399 | if ((strcmp (test_plugin, "tcp_nat") == 0) || | ||
400 | (strcmp (test_plugin, "udp_nat") == 0)) | ||
401 | { | ||
402 | nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server"); | ||
403 | if (GNUNET_NO == nat_res) | ||
404 | { | ||
405 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n", | ||
406 | "gnunet-nat-server", "SUID not set"); | ||
407 | return 0; | ||
408 | } | ||
409 | if (GNUNET_SYSERR == nat_res) | ||
410 | { | ||
411 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n", | ||
412 | "gnunet-nat-server", "file not found"); | ||
413 | return 0; | ||
414 | } | ||
415 | } | ||
416 | |||
417 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1); | 398 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1); |
418 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2); | 399 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2); |
419 | 400 | ||
diff --git a/src/transport/test_transport_api_disconnect.c b/src/transport/test_transport_api_disconnect.c index 99271446c..973c4cfbc 100644 --- a/src/transport/test_transport_api_disconnect.c +++ b/src/transport/test_transport_api_disconnect.c | |||
@@ -399,7 +399,6 @@ int | |||
399 | main (int argc, char *argv[]) | 399 | main (int argc, char *argv[]) |
400 | { | 400 | { |
401 | int ret; | 401 | int ret; |
402 | int nat_res; | ||
403 | 402 | ||
404 | GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); | 403 | GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); |
405 | 404 | ||
@@ -417,24 +416,6 @@ main (int argc, char *argv[]) | |||
417 | 416 | ||
418 | tth = GNUNET_TRANSPORT_TESTING_init (); | 417 | tth = GNUNET_TRANSPORT_TESTING_init (); |
419 | 418 | ||
420 | if ((strcmp (test_plugin, "tcp_nat") == 0) || | ||
421 | (strcmp (test_plugin, "udp_nat") == 0)) | ||
422 | { | ||
423 | nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server"); | ||
424 | if (GNUNET_NO == nat_res) | ||
425 | { | ||
426 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n", | ||
427 | "gnunet-nat-server", "SUID not set"); | ||
428 | return 0; | ||
429 | } | ||
430 | if (GNUNET_SYSERR == nat_res) | ||
431 | { | ||
432 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n", | ||
433 | "gnunet-nat-server", "file not found"); | ||
434 | return 0; | ||
435 | } | ||
436 | } | ||
437 | |||
438 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1); | 419 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1); |
439 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2); | 420 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2); |
440 | 421 | ||
diff --git a/src/transport/test_transport_api_limited_sockets.c b/src/transport/test_transport_api_limited_sockets.c index 015c28c16..8b8cdc07a 100644 --- a/src/transport/test_transport_api_limited_sockets.c +++ b/src/transport/test_transport_api_limited_sockets.c | |||
@@ -304,7 +304,6 @@ int | |||
304 | main (int argc, char *argv[]) | 304 | main (int argc, char *argv[]) |
305 | { | 305 | { |
306 | int ret = 0; | 306 | int ret = 0; |
307 | int nat_res; | ||
308 | 307 | ||
309 | test_plugin = NULL; | 308 | test_plugin = NULL; |
310 | 309 | ||
@@ -321,25 +320,6 @@ main (int argc, char *argv[]) | |||
321 | #endif | 320 | #endif |
322 | NULL); | 321 | NULL); |
323 | 322 | ||
324 | if ((test_plugin != NULL) && | ||
325 | ((strcmp (test_plugin, "tcp_nat") == 0) || | ||
326 | (strcmp (test_plugin, "udp_nat") == 0))) | ||
327 | { | ||
328 | nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server"); | ||
329 | if (GNUNET_NO == nat_res) | ||
330 | { | ||
331 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n", | ||
332 | "gnunet-nat-server", "SUID not set"); | ||
333 | return 0; | ||
334 | } | ||
335 | if (GNUNET_SYSERR == nat_res) | ||
336 | { | ||
337 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n", | ||
338 | "gnunet-nat-server", "file not found"); | ||
339 | return 0; | ||
340 | } | ||
341 | } | ||
342 | |||
343 | #if !HAVE_SETRLIMIT | 323 | #if !HAVE_SETRLIMIT |
344 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Cannot run test on this system\n"); | 324 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Cannot run test on this system\n"); |
345 | 325 | ||
diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c index 521126885..f719a42af 100644 --- a/src/transport/test_transport_api_reliability.c +++ b/src/transport/test_transport_api_reliability.c | |||
@@ -502,7 +502,6 @@ int | |||
502 | main (int argc, char *argv[]) | 502 | main (int argc, char *argv[]) |
503 | { | 503 | { |
504 | int ret; | 504 | int ret; |
505 | int nat_res; | ||
506 | 505 | ||
507 | GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); | 506 | GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); |
508 | 507 | ||
@@ -520,24 +519,6 @@ main (int argc, char *argv[]) | |||
520 | 519 | ||
521 | tth = GNUNET_TRANSPORT_TESTING_init (); | 520 | tth = GNUNET_TRANSPORT_TESTING_init (); |
522 | 521 | ||
523 | if ((strcmp (test_plugin, "tcp_nat") == 0) || | ||
524 | (strcmp (test_plugin, "udp_nat") == 0)) | ||
525 | { | ||
526 | nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server"); | ||
527 | if (GNUNET_NO == nat_res) | ||
528 | { | ||
529 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n", | ||
530 | "gnunet-nat-server", "SUID not set"); | ||
531 | return 0; | ||
532 | } | ||
533 | if (GNUNET_SYSERR == nat_res) | ||
534 | { | ||
535 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n", | ||
536 | "gnunet-nat-server", "file not found"); | ||
537 | return 0; | ||
538 | } | ||
539 | } | ||
540 | |||
541 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1); | 522 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1); |
542 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2); | 523 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2); |
543 | 524 | ||
diff --git a/src/transport/test_transport_api_restart_1peer.c b/src/transport/test_transport_api_restart_1peer.c index c9db9da64..b414805d8 100644 --- a/src/transport/test_transport_api_restart_1peer.c +++ b/src/transport/test_transport_api_restart_1peer.c | |||
@@ -473,11 +473,9 @@ main (int argc, char *argv[]) | |||
473 | 473 | ||
474 | tth = GNUNET_TRANSPORT_TESTING_init (); | 474 | tth = GNUNET_TRANSPORT_TESTING_init (); |
475 | 475 | ||
476 | |||
477 | GNUNET_asprintf (&cfg_file_p1, "test_transport_api_tcp_peer1.conf"); | 476 | GNUNET_asprintf (&cfg_file_p1, "test_transport_api_tcp_peer1.conf"); |
478 | GNUNET_asprintf (&cfg_file_p2, "test_transport_api_tcp_peer2.conf"); | 477 | GNUNET_asprintf (&cfg_file_p2, "test_transport_api_tcp_peer2.conf"); |
479 | 478 | ||
480 | |||
481 | ret = check (); | 479 | ret = check (); |
482 | 480 | ||
483 | GNUNET_free (cfg_file_p1); | 481 | GNUNET_free (cfg_file_p1); |
diff --git a/src/transport/test_transport_api_restart_2peers.c b/src/transport/test_transport_api_restart_2peers.c index ef97911c0..86758dfe6 100644 --- a/src/transport/test_transport_api_restart_2peers.c +++ b/src/transport/test_transport_api_restart_2peers.c | |||
@@ -459,11 +459,9 @@ main (int argc, char *argv[]) | |||
459 | 459 | ||
460 | tth = GNUNET_TRANSPORT_TESTING_init (); | 460 | tth = GNUNET_TRANSPORT_TESTING_init (); |
461 | 461 | ||
462 | |||
463 | GNUNET_asprintf (&cfg_file_p1, "test_transport_api_tcp_peer1.conf"); | 462 | GNUNET_asprintf (&cfg_file_p1, "test_transport_api_tcp_peer1.conf"); |
464 | GNUNET_asprintf (&cfg_file_p2, "test_transport_api_tcp_peer2.conf"); | 463 | GNUNET_asprintf (&cfg_file_p2, "test_transport_api_tcp_peer2.conf"); |
465 | 464 | ||
466 | |||
467 | ret = check (); | 465 | ret = check (); |
468 | 466 | ||
469 | GNUNET_free (cfg_file_p1); | 467 | GNUNET_free (cfg_file_p1); |
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 | |||
319 | main (int argc, char *argv[]) | 325 | main (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 | ||
diff --git a/src/transport/test_transport_api_unreliability.c b/src/transport/test_transport_api_unreliability.c index fce8d8565..53de91ab1 100644 --- a/src/transport/test_transport_api_unreliability.c +++ b/src/transport/test_transport_api_unreliability.c | |||
@@ -549,7 +549,6 @@ int | |||
549 | main (int argc, char *argv[]) | 549 | main (int argc, char *argv[]) |
550 | { | 550 | { |
551 | int ret; | 551 | int ret; |
552 | int nat_res; | ||
553 | 552 | ||
554 | GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); | 553 | GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); |
555 | 554 | ||
@@ -567,24 +566,6 @@ main (int argc, char *argv[]) | |||
567 | 566 | ||
568 | tth = GNUNET_TRANSPORT_TESTING_init (); | 567 | tth = GNUNET_TRANSPORT_TESTING_init (); |
569 | 568 | ||
570 | if ((strcmp (test_plugin, "tcp_nat") == 0) || | ||
571 | (strcmp (test_plugin, "udp_nat") == 0)) | ||
572 | { | ||
573 | nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server"); | ||
574 | if (GNUNET_NO == nat_res) | ||
575 | { | ||
576 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n", | ||
577 | "gnunet-nat-server", "SUID not set"); | ||
578 | return 0; | ||
579 | } | ||
580 | if (GNUNET_SYSERR == nat_res) | ||
581 | { | ||
582 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n", | ||
583 | "gnunet-nat-server", "file not found"); | ||
584 | return 0; | ||
585 | } | ||
586 | } | ||
587 | |||
588 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1); | 569 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1); |
589 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2); | 570 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2); |
590 | 571 | ||
diff --git a/src/transport/test_transport_api_unreliability_constant.c b/src/transport/test_transport_api_unreliability_constant.c index a75f2953e..fb72b0f1c 100644 --- a/src/transport/test_transport_api_unreliability_constant.c +++ b/src/transport/test_transport_api_unreliability_constant.c | |||
@@ -488,7 +488,6 @@ int | |||
488 | main (int argc, char *argv[]) | 488 | main (int argc, char *argv[]) |
489 | { | 489 | { |
490 | int ret; | 490 | int ret; |
491 | int nat_res; | ||
492 | 491 | ||
493 | GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); | 492 | GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); |
494 | 493 | ||
@@ -506,24 +505,6 @@ main (int argc, char *argv[]) | |||
506 | 505 | ||
507 | tth = GNUNET_TRANSPORT_TESTING_init (); | 506 | tth = GNUNET_TRANSPORT_TESTING_init (); |
508 | 507 | ||
509 | if ((strcmp (test_plugin, "tcp_nat") == 0) || | ||
510 | (strcmp (test_plugin, "udp_nat") == 0)) | ||
511 | { | ||
512 | nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server"); | ||
513 | if (GNUNET_NO == nat_res) | ||
514 | { | ||
515 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n", | ||
516 | "gnunet-nat-server", "SUID not set"); | ||
517 | return 0; | ||
518 | } | ||
519 | if (GNUNET_SYSERR == nat_res) | ||
520 | { | ||
521 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n", | ||
522 | "gnunet-nat-server", "file not found"); | ||
523 | return 0; | ||
524 | } | ||
525 | } | ||
526 | |||
527 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1); | 508 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1); |
528 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2); | 509 | GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2); |
529 | 510 | ||