-fixes for HTTP/HTTPS configuration

3 files changed, 28 insertions, 4 deletions

diff --git a/src/setup/gnunet-setup-options.c b/src/setup/gnunet-setup-options.c
index dd1a6305..c2caa86a 100644
--- a/src/setup/gnunet-setup-options.c
+++ b/src/setup/gnunet-setup-options.c
@@ -1378,7 +1378,7 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
   {
    "GNUNET_setup_transport_http_port_spinbutton",
    "value-changed",
-   "transport-http",
+   "transport-http_server",
    "PORT",
    gettext_noop ("Port for inbound HTTP connections, use 0 if behind NAT"),
    "https://gnunet.org/configuration-http",
@@ -1388,9 +1388,21 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
    NULL},
 
   {
+   "GNUNET_setup_transport_http_advertised_port_spinbutton",
+   "value-changed",
+   "transport-http_server",
+   "ADVERTISED_PORT",
+   gettext_noop ("Port visible to other peers"),
+   "https://gnunet.org/configuration-http",
+   &load_number,
+   &save_number, NULL,
+   NULL, NULL,
+   NULL},
+
+  {
    "GNUNET_setup_transport_https_port_spinbutton",
    "value-changed",
-   "transport-https",
+   "transport-https_server",
    "PORT",
    gettext_noop ("Port for inbound HTTPS connections, use 0 if behind NAT"),
    "https://gnunet.org/configuration-https",
@@ -1399,6 +1411,18 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
    &highlight_port_collisions, NULL,
    NULL},
 
+  {
+   "GNUNET_setup_transport_https_advertised_port_spinbutton",
+   "value-changed",
+   "transport-https_server",
+   "ADVERTISED_PORT",
+   gettext_noop ("Port visible to other peers"),
+   "https://gnunet.org/configuration-https",
+   &load_number,
+   &save_number, NULL,
+   NULL, NULL,
+   NULL},
+
   /* FS TAB */
 
   {
diff --git a/src/setup/gnunet-setup-transport-http.c b/src/setup/gnunet-setup-transport-http.c
index 2820f0a1..f0b208f9 100644
--- a/src/setup/gnunet-setup-transport-http.c
+++ b/src/setup/gnunet-setup-transport-http.c
@@ -36,7 +36,7 @@
 void
 GNUNET_setup_transport_http_test_button_clicked_cb ()
 {
-  GNUNET_setup_transport_test ("transport-http", GNUNET_YES,
+  GNUNET_setup_transport_test ("transport-http_server", GNUNET_YES,
                                "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 80ae2457..9195339c 100644
--- a/src/setup/gnunet-setup-transport-https.c
+++ b/src/setup/gnunet-setup-transport-https.c
@@ -36,7 +36,7 @@
 void
 GNUNET_setup_transport_https_test_button_clicked_cb ()
 {
-  GNUNET_setup_transport_test ("transport-https", GNUNET_YES,
+  GNUNET_setup_transport_test ("transport-https_server", GNUNET_YES,
                                "GNUNET_setup_transport_https_test_success_image",
                                "GNUNET_setup_transport_https_test_fail_image");
 }