[GNUnet-SVN] r38221 - gnunet/src/transport

[gnunet]

Author: amatus
Date: 2016-10-26 21:27:09 +0200 (Wed, 26 Oct 2016)
New Revision: 38221

Modified:
   gnunet/src/transport/gnunet-transport.c
Log:
Use GNUNET_NAT_StatusCode and GNUNET_NAT_status2string


Modified: gnunet/src/transport/gnunet-transport.c
===================================================================
--- gnunet/src/transport/gnunet-transport.c     2016-10-26 18:55:25 UTC (rev 
38220)
+++ gnunet/src/transport/gnunet-transport.c     2016-10-26 19:27:09 UTC (rev 
38221)
@@ -215,38 +215,6 @@
 
 
 /**
- *
- */
-enum TestResult
-{
-  /**
-   * NAT returned success
-   */
-  NAT_TEST_SUCCESS = GNUNET_OK,
-
-  /**
-   * NAT returned failure
-   */
-  NAT_TEST_FAIL = GNUNET_NO,
-
-  /**
-   * NAT returned failure while running test
-   */
-  NAT_TEST_INTERNAL_FAIL = GNUNET_SYSERR,
-
-  /**
-   * We could not start the test
-   */
-  NAT_TEST_FAILED_TO_START = 2,
-
-  /**
-   * We had a timeout while running the test
-   */
-  NAT_TEST_TIMEOUT = 3
-};
-
-
-/**
  * Benchmarking block size in KB
  */
 #define BLOCKSIZE 4
@@ -614,40 +582,12 @@
  */
 static void
 display_test_result (struct TestContext *tc,
-                     enum TestResult result)
+                     enum GNUNET_NAT_StatusCode result)
 {
-  switch (result) {
-    case NAT_TEST_FAIL:
-      FPRINTF (stderr,
-               _("Configuration for plugin `%s' did not work!\n"),
-               tc->name);
-      break;
-    case NAT_TEST_SUCCESS:
-      FPRINTF (stderr,
-               _("Configuration for plugin `%s' did work!\n"),
-               tc->name);
-      break;
-    case NAT_TEST_INTERNAL_FAIL:
-      FPRINTF (stderr,
-               _("Internal NAT error while running test for plugin `%s'\n"),
-               tc->name);
-      break;
-    case NAT_TEST_FAILED_TO_START:
-      FPRINTF (stderr,
-               _("Failed to start NAT test for plugin `%s'\n"),
-               tc->name);
-      break;
-    case NAT_TEST_TIMEOUT:
-      FPRINTF (stderr,
-               _("Timeout while waiting for result of NAT test for plugin 
`%s'\n"),
-               tc->name);
-      break;
-    default:
-      FPRINTF (stderr,
-               _("Configuration for plugin `%s' did not work!\n"),
-               tc->name);
-      break;
-  }
+  FPRINTF (stderr,
+           _("NAT plugin `%s' reports: %s\n"),
+           tc->name,
+           GNUNET_NAT_status2string (result));
   if (NULL != tc->tsk)
   {
     GNUNET_SCHEDULER_cancel (tc->tsk);