8 files changed, 23 insertions, 47 deletions

diff --git a/src/setup/Makefile.am b/src/setup/Makefile.am
index b06071d5..ae658ab7 100644
--- a/src/setup/Makefile.am
+++ b/src/setup/Makefile.am
@@ -33,7 +33,7 @@ gnunet_setup_LDADD = \
   $(top_builddir)/src/lib/libgnunetgtk.la \
   @GTK_LIBS@ @GNUNET_LIBS@ @GLADE_LIBS@ \
   $(WINLIBS) \
-  -lgnunetutil -lgnunetnat -lgnunettun \
+  -lgnunetutil -lgnunetnatauto -lgnunettun \
   $(INTLLIBS)
 gnunet_setup_CFLAGS = \
   @GTK_CFLAGS@ \
diff --git a/src/setup/gnunet-setup-options.c b/src/setup/gnunet-setup-options.c
index d6ab22c4..996a45be 100644
--- a/src/setup/gnunet-setup-options.c
+++ b/src/setup/gnunet-setup-options.c
@@ -1271,15 +1271,6 @@ static struct GNUNET_SETUP_VisibilitySpecification hide_all_tcp_options[] = {
 
 
 /**
- * Hide internal IP options.
- */
-static struct GNUNET_SETUP_VisibilitySpecification toggle_internal_ip[] = {
-  {"GNUNET_setup_transport_internal_ip_hbox", "^YES$", NULL},
-  {NULL, NULL, NULL}
-};
-
-
-/**
  * Option specification data.
  */
 const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
diff --git a/src/setup/gnunet-setup-transport-http.c b/src/setup/gnunet-setup-transport-http.c
index 17c0f2d3..ccbf7eb9 100644
--- a/src/setup/gnunet-setup-transport-http.c
+++ b/src/setup/gnunet-setup-transport-http.c
@@ -24,8 +24,6 @@
  * @author Christian Grothoff
  */
 #include "gnunet-setup.h"
-#include <gnunet/gnunet_resolver_service.h>
-#include <gnunet/gnunet_nat_lib.h>
 #include "gnunet-setup-transport-test.h"
 
 
@@ -36,7 +34,8 @@
 void
 GNUNET_setup_transport_http_test_button_clicked_cb ()
 {
-  GNUNET_setup_transport_test ("transport-http_server", GNUNET_YES,
+  GNUNET_setup_transport_test ("transport-http_server",
+                               IPPROTO_TCP,
                                "GNUNET_setup_transport_http_test_success_image",
                                "GNUNET_setup_transport_http_test_fail_image");
 }
diff --git a/src/setup/gnunet-setup-transport-https.c b/src/setup/gnunet-setup-transport-https.c
index fe610c2e..411c01de 100644
--- a/src/setup/gnunet-setup-transport-https.c
+++ b/src/setup/gnunet-setup-transport-https.c
@@ -24,8 +24,6 @@
  * @author Christian Grothoff
  */
 #include "gnunet-setup.h"
-#include <gnunet/gnunet_resolver_service.h>
-#include <gnunet/gnunet_nat_lib.h>
 #include "gnunet-setup-transport-test.h"
 
 
@@ -36,7 +34,8 @@
 void
 GNUNET_setup_transport_https_test_button_clicked_cb ()
 {
-  GNUNET_setup_transport_test ("transport-https_server", GNUNET_YES,
+  GNUNET_setup_transport_test ("transport-https_server",
+                               IPPROTO_TCP,
                                "GNUNET_setup_transport_https_test_success_image",
                                "GNUNET_setup_transport_https_test_fail_image");
 }
diff --git a/src/setup/gnunet-setup-transport-tcp.c b/src/setup/gnunet-setup-transport-tcp.c
index 145bcc32..178f16aa 100644
--- a/src/setup/gnunet-setup-transport-tcp.c
+++ b/src/setup/gnunet-setup-transport-tcp.c
@@ -24,8 +24,6 @@
  * @author Christian Grothoff
  */
 #include "gnunet-setup.h"
-#include <gnunet/gnunet_resolver_service.h>
-#include <gnunet/gnunet_nat_lib.h>
 #include "gnunet-setup-transport-test.h"
 
 
@@ -36,7 +34,8 @@
 void
 GNUNET_setup_transport_tcp_test_button_clicked_cb ()
 {
-  GNUNET_setup_transport_test ("transport-tcp", GNUNET_YES,
+  GNUNET_setup_transport_test ("transport-tcp",
+                               IPPROTO_TCP,
                                "GNUNET_setup_transport_tcp_test_success_image",
                                "GNUNET_setup_transport_tcp_test_fail_image");
 }
diff --git a/src/setup/gnunet-setup-transport-test.c b/src/setup/gnunet-setup-transport-test.c
index 6c21777e..f351ddf5 100644
--- a/src/setup/gnunet-setup-transport-test.c
+++ b/src/setup/gnunet-setup-transport-test.c
@@ -25,7 +25,7 @@
  */
 #include "gnunet-setup.h"
 #include <gnunet/gnunet_resolver_service.h>
-#include <gnunet/gnunet_nat_lib.h>
+#include <gnunet/gnunet_nat_auto_service.h>
 
 /**
  * How long do we wait for the NAT test to report success?
@@ -39,7 +39,7 @@ struct TestContext
   /**
    * Handle to the active NAT test.
    */
-  struct GNUNET_NAT_Test *tst;
+  struct GNUNET_NAT_AUTO_Test *tst;
 
   /**
    * Name of widget to show on success.
@@ -85,7 +85,7 @@ display_test_result (struct TestContext *tc, int result)
   }
   if (NULL != tc->tst)
   {
-    GNUNET_NAT_test_stop (tc->tst);
+    GNUNET_NAT_AUTO_test_stop (tc->tst);
     tc->tst = NULL;
   }
   GNUNET_free (tc);
@@ -117,31 +117,19 @@ result_callback (void *cls,
  * transport configuration.
  *
  * @param section_name section with the port numbers
- * @param is_tcp #GNUNET_YES for TCP, #GNUNET_NO for UDP
+ * @param proto IPPROTO_TCP or IPPROTO_UDP
  * @param success_image image to show on success
  * @param failure_image image to show on failure
  */
 void
-GNUNET_setup_transport_test (const char *section_name, int is_tcp,
+GNUNET_setup_transport_test (const char *section_name,
+                             int proto,
                              const char *success_image,
                              const char *failure_image)
 {
   struct TestContext *tc;
-  unsigned long long bnd_port;
-  unsigned long long adv_port;
   GtkWidget *w;
 
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (cfg, section_name, "PORT",
-                                             &bnd_port))
-  {
-    GNUNET_break (0);
-    return;
-  }
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (cfg, section_name,
-                                             "ADVERTISED_PORT", &adv_port))
-    adv_port = bnd_port;
   tc = GNUNET_new (struct TestContext);
   tc->success_image = success_image;
   tc->failure_image = failure_image;
@@ -149,10 +137,11 @@ GNUNET_setup_transport_test (const char *section_name, int is_tcp,
   gtk_widget_hide (w);
   GNUNET_assert (NULL != cfg);
   GNUNET_RESOLVER_connect (cfg);
-  tc->tst =
-      GNUNET_NAT_test_start (cfg, is_tcp, (uint16_t) bnd_port,
-                             (uint16_t) adv_port, TIMEOUT,
-                             &result_callback, tc);
+  tc->tst = GNUNET_NAT_AUTO_test_start (cfg,
+                                        proto,
+                                        section_name,
+                                        &result_callback,
+                                        tc);
 }
 
 /* end of gnunet-setup-transport-test.c */
diff --git a/src/setup/gnunet-setup-transport-test.h b/src/setup/gnunet-setup-transport-test.h
index 0eabf944..1d924704 100644
--- a/src/setup/gnunet-setup-transport-test.h
+++ b/src/setup/gnunet-setup-transport-test.h
@@ -31,12 +31,13 @@
  * transport configuration.
  *
  * @param section_name section with the port numbers
- * @param is_tcp GNUNET_YES for TCP, GNUNET_NO for UDP
+ * @param proto IPPROTO_TCP or IPPROTO_UDP
  * @param success_image image to show on success
  * @param failure_image image to show on failure
  */
 void
-GNUNET_setup_transport_test (const char *section_name, int is_tcp,
+GNUNET_setup_transport_test (const char *section_name,
+                             int proto,
                              const char *success_image,
                              const char *failure_image);
 
diff --git a/src/setup/gnunet-setup-transport-udp.c b/src/setup/gnunet-setup-transport-udp.c
index 5c9617bd..14bb546e 100644
--- a/src/setup/gnunet-setup-transport-udp.c
+++ b/src/setup/gnunet-setup-transport-udp.c
@@ -24,8 +24,6 @@
  * @author Christian Grothoff
  */
 #include "gnunet-setup.h"
-#include <gnunet/gnunet_resolver_service.h>
-#include <gnunet/gnunet_nat_lib.h>
 #include "gnunet-setup-transport-test.h"
 
 
@@ -36,8 +34,8 @@
 void
 GNUNET_setup_transport_udp_test_button_clicked_cb ()
 {
-
-  GNUNET_setup_transport_test ("transport-udp", GNUNET_NO,
+  GNUNET_setup_transport_test ("transport-udp",
+                               IPPROTO_UDP,
                                "GNUNET_setup_transport_udp_test_success_image",
                                "GNUNET_setup_transport_udp_test_fail_image");