[GNUnet-SVN] r33680 - gnunet-gtk/src/setup

[gnunet]

Author: cfuchs
Date: 2014-06-17 12:39:02 +0200 (Tue, 17 Jun 2014)
New Revision: 33680

Modified:
   gnunet-gtk/src/setup/gnunet-setup-transport-test.c
   gnunet-gtk/src/setup/gnunet-setup-transport.c
Log:
- renamed NAT's failure code to status code across gnunet-gtk
- timed-out nat tests not automatically stop the test itself
- setup-transport now properly cleans up nat-tests

Modified: gnunet-gtk/src/setup/gnunet-setup-transport-test.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-transport-test.c  2014-06-17 10:35:26 UTC 
(rev 33679)
+++ gnunet-gtk/src/setup/gnunet-setup-transport-test.c  2014-06-17 10:39:02 UTC 
(rev 33680)
@@ -101,9 +101,12 @@
  */
 static void
 result_callback (void *cls,
-                 enum GNUNET_NAT_FailureCode result)
+                 enum GNUNET_NAT_StatusCode result)
 {
   struct TestContext *tc = cls;
+  
+  if (GNUNET_NAT_ERROR_SUCCESS == result)
+    GNUNET_NAT_test_stop (tc->tst);
 
   display_test_result (tc,
                        (GNUNET_NAT_ERROR_SUCCESS == result)
@@ -153,11 +156,6 @@
       GNUNET_NAT_test_start (cfg, is_tcp, (uint16_t) bnd_port,
                              (uint16_t) adv_port, TIMEOUT,
                              &result_callback, tc);
-  if (NULL == tc->tst)
-  {
-    display_test_result (tc, GNUNET_SYSERR);
-    return;
-  }
 }
 
 /* end of gnunet-setup-transport-test.c */

Modified: gnunet-gtk/src/setup/gnunet-setup-transport.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-transport.c       2014-06-17 10:35:26 UTC 
(rev 33679)
+++ gnunet-gtk/src/setup/gnunet-setup-transport.c       2014-06-17 10:39:02 UTC 
(rev 33680)
@@ -170,7 +170,7 @@
  */
 static void
 result_callback (void *cls,
-                 enum GNUNET_NAT_FailureCode result)
+                 enum GNUNET_NAT_StatusCode result)
 {
   struct GNUNET_SetupAutoContext *ac = cls;
 
@@ -244,7 +244,7 @@
 static void
 set_external_ipv4 (void *cls,
                    const struct in_addr *addr,
-                   enum GNUNET_NAT_FailureCode result)
+                   enum GNUNET_NAT_StatusCode result)
 {
   struct GNUNET_SetupAutoContext *ac = cls;
   char buf[INET_ADDRSTRLEN];