adding GNS options to gnunet-setup (#2682)

2 files changed, 34 insertions, 5 deletions

diff --git a/src/setup/gnunet-setup-options.c b/src/setup/gnunet-setup-options.c
index 681d7c45..f4c0a1f7 100644
--- a/src/setup/gnunet-setup-options.c
+++ b/src/setup/gnunet-setup-options.c
@@ -781,10 +781,10 @@ static struct GNUNET_SETUP_VisibilitySpecification hide_vpn_tab[] = {
 
 
 /**
- * Hide "gns" and "namestore" tabs if GNS not active.
+ * Hide "gads" and "namestore" tabs if GNS not active.
  */
-static struct GNUNET_SETUP_VisibilitySpecification hide_gns_tab[] = {
-  {"GNUNET_setup_gns_vbox", "(^| )gns($| )", NULL},
+static struct GNUNET_SETUP_VisibilitySpecification hide_gns_tabs[] = {
+  {"GNUNET_setup_gads_vbox", "(^| )gns($| )", NULL},
   {"GNUNET_setup_namestore_vbox", "(^| )gns($| )", NULL},
   {NULL, NULL, NULL}
 };
@@ -1965,7 +1965,8 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
    NULL, NULL,
    NULL},
 
-  /* GNS treeview */
+
+  /* GADS/GNS */
 
   {
    "GNUNET_setup_general_services_gns_checkbutton",
@@ -1977,7 +1978,32 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
    &load_option_list,
    &save_option_list, "gns",
    NULL, NULL,
-   hide_gns_tab},
+   hide_gns_tabs},
+
+
+  {
+   "GNUNET_setup_gns_hijack_checkbutton",
+   "toggled",
+   "gns",
+   "HIJACK_DNS",
+   gettext_noop ("Should DNS queries be intercepted using iptables?"),
+   "https://gnunet.org/gnunet-dns-setup",
+   &load_yes_no,
+   &save_yes_no, NULL,
+   NULL, NULL,
+   NULL},
+
+  {
+   "GNUNET_setup_gns_auto_import_checkbutton",
+   "toggled",
+   "gns",
+   "AUTO_IMPORT_PKEY",
+   gettext_noop ("Should names be automatically learned and placed into the 'shorten' Zone?"),
+   "https://gnunet.org/configuration-gns-shortening",
+   &load_yes_no,
+   &save_yes_no, NULL,
+   NULL, NULL,
+   NULL},
 
   /* END of list */
 
diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index fcf30ac0..df292fa5 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -233,6 +233,9 @@ load_options ()
   GObject *widget;
   char *value;
 
+#ifndef LINUX 
+  gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_gns_hijack_checkbutton")));
+#endif
   i = 0;
   while (NULL != option_specifications[i].widget_name)
   {