allow vpn/pt to be configured individually (#3885)

1 files changed, 30 insertions, 4 deletions

diff --git a/src/setup/gnunet-setup-options.c b/src/setup/gnunet-setup-options.c
index bfa0532a..8500a9fe 100644
--- a/src/setup/gnunet-setup-options.c
+++ b/src/setup/gnunet-setup-options.c
@@ -1011,10 +1011,23 @@ static struct GNUNET_SETUP_VisibilitySpecification hide_fs_tab[] = {
 
 
 /**
- * Hide "vpn" tab if VPN not active.
+ * Hide "vpn" tab and "pt" checkbutton if VPN is not active.
  */
-static struct GNUNET_SETUP_VisibilitySpecification hide_vpn_tab[] = {
+static struct GNUNET_SETUP_VisibilitySpecification hide_vpn_options[] = {
+  {"GNUNET_setup_general_services_pt_checkbutton", "YES", NULL},
   {"GNUNET_setup_vpn_vbox", "YES", NULL},
+  {"GNUNET_setup_vpn_label", "YES", NULL},
+  {NULL, NULL, NULL}
+};
+
+
+/**
+ * Hides "vpn" option if PT is active (so that it cannot be disabled),
+ * and shows PT-specific options.
+ */
+static struct GNUNET_SETUP_VisibilitySpecification hide_pt_options[] = {
+  {"GNUNET_setup_pt_frame", "YES", NULL},
+  {"GNUNET_setup_general_services_vpn_checkbutton", "NO", NULL},
   {NULL, NULL, NULL}
 };
 
@@ -1024,6 +1037,7 @@ static struct GNUNET_SETUP_VisibilitySpecification hide_vpn_tab[] = {
  */
 static struct GNUNET_SETUP_VisibilitySpecification hide_gns_tabs[] = {
   {"GNUNET_setup_namestore_vbox", "YES", NULL},
+  {"GNUNET_setup_namestore_label", "YES", NULL},
   {NULL, NULL, NULL}
 };
 
@@ -2318,16 +2332,28 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
   /* VPN/PT service */
 
   {
+   "GNUNET_setup_general_services_vpn_checkbutton",
+   "toggled",
+   "vpn",
+   "FORCESTART",
+   gettext_noop ("Should the VPN be started automatically on startup?"),
+   "https://gnunet.org/configuration-vpn",
+   &load_yes_no,
+   &save_yes_no, NULL,
+   NULL, NULL,
+   hide_vpn_options},
+
+  {
    "GNUNET_setup_general_services_pt_checkbutton",
    "toggled",
    "pt",
    "FORCESTART",
-   gettext_noop ("Should the VPN/PT be started automatically on startup?"),
+   gettext_noop ("Should the PT be started automatically on startup?"),
    "https://gnunet.org/configuration-vpn",
    &load_yes_no,
    &save_yes_no, NULL,
    NULL, NULL,
-   hide_vpn_tab},
+   hide_pt_options},
 
 
   {