diff options
author | David Barksdale <amatus.amongus@gmail.com> | 2016-10-26 19:27:09 +0000 |
---|---|---|
committer | David Barksdale <amatus.amongus@gmail.com> | 2016-10-26 19:27:09 +0000 |
commit | fa92364741e801a83fe7bd00a90efa462b3ab076 (patch) | |
tree | 321624e92859cb12330e69662902025f8b81dcc7 /src/transport/gnunet-transport.c | |
parent | 61f388ab07724920dd03c0dd06165b4d068edc18 (diff) | |
download | gnunet-fa92364741e801a83fe7bd00a90efa462b3ab076.tar.gz gnunet-fa92364741e801a83fe7bd00a90efa462b3ab076.zip |
Use GNUNET_NAT_StatusCode and GNUNET_NAT_status2string
Diffstat (limited to 'src/transport/gnunet-transport.c')
-rw-r--r-- | src/transport/gnunet-transport.c | 70 |
1 files changed, 5 insertions, 65 deletions
diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c index aceaceb87..e928cf660 100644 --- a/src/transport/gnunet-transport.c +++ b/src/transport/gnunet-transport.c | |||
@@ -215,38 +215,6 @@ struct TestContext | |||
215 | 215 | ||
216 | 216 | ||
217 | /** | 217 | /** |
218 | * | ||
219 | */ | ||
220 | enum TestResult | ||
221 | { | ||
222 | /** | ||
223 | * NAT returned success | ||
224 | */ | ||
225 | NAT_TEST_SUCCESS = GNUNET_OK, | ||
226 | |||
227 | /** | ||
228 | * NAT returned failure | ||
229 | */ | ||
230 | NAT_TEST_FAIL = GNUNET_NO, | ||
231 | |||
232 | /** | ||
233 | * NAT returned failure while running test | ||
234 | */ | ||
235 | NAT_TEST_INTERNAL_FAIL = GNUNET_SYSERR, | ||
236 | |||
237 | /** | ||
238 | * We could not start the test | ||
239 | */ | ||
240 | NAT_TEST_FAILED_TO_START = 2, | ||
241 | |||
242 | /** | ||
243 | * We had a timeout while running the test | ||
244 | */ | ||
245 | NAT_TEST_TIMEOUT = 3 | ||
246 | }; | ||
247 | |||
248 | |||
249 | /** | ||
250 | * Benchmarking block size in KB | 218 | * Benchmarking block size in KB |
251 | */ | 219 | */ |
252 | #define BLOCKSIZE 4 | 220 | #define BLOCKSIZE 4 |
@@ -614,40 +582,12 @@ run_nat_test (void); | |||
614 | */ | 582 | */ |
615 | static void | 583 | static void |
616 | display_test_result (struct TestContext *tc, | 584 | display_test_result (struct TestContext *tc, |
617 | enum TestResult result) | 585 | enum GNUNET_NAT_StatusCode result) |
618 | { | 586 | { |
619 | switch (result) { | 587 | FPRINTF (stderr, |
620 | case NAT_TEST_FAIL: | 588 | _("NAT plugin `%s' reports: %s\n"), |
621 | FPRINTF (stderr, | 589 | tc->name, |
622 | _("Configuration for plugin `%s' did not work!\n"), | 590 | GNUNET_NAT_status2string (result)); |
623 | tc->name); | ||
624 | break; | ||
625 | case NAT_TEST_SUCCESS: | ||
626 | FPRINTF (stderr, | ||
627 | _("Configuration for plugin `%s' did work!\n"), | ||
628 | tc->name); | ||
629 | break; | ||
630 | case NAT_TEST_INTERNAL_FAIL: | ||
631 | FPRINTF (stderr, | ||
632 | _("Internal NAT error while running test for plugin `%s'\n"), | ||
633 | tc->name); | ||
634 | break; | ||
635 | case NAT_TEST_FAILED_TO_START: | ||
636 | FPRINTF (stderr, | ||
637 | _("Failed to start NAT test for plugin `%s'\n"), | ||
638 | tc->name); | ||
639 | break; | ||
640 | case NAT_TEST_TIMEOUT: | ||
641 | FPRINTF (stderr, | ||
642 | _("Timeout while waiting for result of NAT test for plugin `%s'\n"), | ||
643 | tc->name); | ||
644 | break; | ||
645 | default: | ||
646 | FPRINTF (stderr, | ||
647 | _("Configuration for plugin `%s' did not work!\n"), | ||
648 | tc->name); | ||
649 | break; | ||
650 | } | ||
651 | if (NULL != tc->tsk) | 591 | if (NULL != tc->tsk) |
652 | { | 592 | { |
653 | GNUNET_SCHEDULER_cancel (tc->tsk); | 593 | GNUNET_SCHEDULER_cancel (tc->tsk); |