3 files changed, 122 insertions, 27 deletions

diff --git a/contrib/gnunet_setup_gtk_main_window.glade b/contrib/gnunet_setup_gtk_main_window.glade
index cacb128b..62bd1377 100644
--- a/contrib/gnunet_setup_gtk_main_window.glade
+++ b/contrib/gnunet_setup_gtk_main_window.glade
@@ -16,13 +16,6 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkAdjustment" id="GNUNET_setup_exit_interface_mask_adjustment">
-    <property name="lower">1</property>
-    <property name="upper">127</property>
-    <property name="value">48</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
   <object class="GtkDialog" id="GNUNET_setup_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -4158,6 +4151,72 @@
                     <property name="position">0</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkFrame" id="GNUNET_setup_gns_frame">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <object class="GtkAlignment" id="GNUNET_setup_gns_alignment">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkVBox" id="GNUNET_setup_gns_option_vbox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkCheckButton" id="GNUNET_setup_gns_hijack_checkbutton">
+                                <property name="label" translatable="yes">Enable iptables-based DNS hijacking (GNU/Linux-only)</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="padding">5</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="GNUNET_setup_gns_auto_import_checkbutton">
+                                <property name="label" translatable="yes">Enable automatic shortening</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="GNUNET_setup_gns_option_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Configure GNUnet Naming System&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="padding">5</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="position">6</property>
@@ -4167,7 +4226,7 @@
               <object class="GtkLabel" id="GNUNET_setup_namestore_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">N_amestore</property>
+                <property name="label" translatable="yes">GNS &amp; N_amestore</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -4176,7 +4235,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="GNUNET_setup_gns_vbox">
+              <object class="GtkVBox" id="GNUNET_setup_gads_vbox">
                 <property name="can_focus">False</property>
                 <child>
                   <object class="GtkHBox" id="GNUNET_setup_gns_top_hbox">
@@ -4542,10 +4601,10 @@
               </packing>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="GNUNET_setup_gns_label">
+              <object class="GtkLabel" id="GNUNET_setup_gads_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">GN_S</property>
+                <property name="label" translatable="yes">GAD_S</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -4585,6 +4644,13 @@
       <action-widget response="-3">GNUNET_setup_save_button</action-widget>
     </action-widgets>
   </object>
+  <object class="GtkAdjustment" id="GNUNET_setup_exit_interface_mask_adjustment">
+    <property name="lower">1</property>
+    <property name="upper">127</property>
+    <property name="value">48</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkAdjustment" id="GNUNET_setup_fs_datacache_mysql_port_adjustment">
     <property name="lower">1</property>
     <property name="upper">65535</property>
@@ -4685,47 +4751,47 @@
     <data>
       <row>
         <col id="0">1</col>
-        <col id="1" translatable="no">A</col>
+        <col id="1">A</col>
       </row>
       <row>
         <col id="0">2</col>
-        <col id="1" translatable="no">NS</col>
+        <col id="1">NS</col>
       </row>
       <row>
         <col id="0">5</col>
-        <col id="1" translatable="no">CNAME</col>
+        <col id="1">CNAME</col>
       </row>
       <row>
         <col id="0">6</col>
-        <col id="1" translatable="no">SOA</col>
+        <col id="1">SOA</col>
       </row>
       <row>
         <col id="0">12</col>
-        <col id="1" translatable="no">PTR</col>
+        <col id="1">PTR</col>
       </row>
       <row>
         <col id="0">15</col>
-        <col id="1" translatable="no">MX</col>
+        <col id="1">MX</col>
       </row>
       <row>
         <col id="0">16</col>
-        <col id="1" translatable="no">TXT</col>
+        <col id="1">TXT</col>
       </row>
       <row>
         <col id="0">28</col>
-        <col id="1" translatable="no">AAAA</col>
+        <col id="1">AAAA</col>
       </row>
       <row>
         <col id="0">65536</col>
-        <col id="1" translatable="no">PKEY</col>
+        <col id="1">PKEY</col>
       </row>
       <row>
         <col id="0">65538</col>
-        <col id="1" translatable="no">LEHO</col>
+        <col id="1">LEHO</col>
       </row>
       <row>
         <col id="0">65539</col>
-        <col id="1" translatable="no">VPN</col>
+        <col id="1">VPN</col>
       </row>
     </data>
   </object>
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)
   {