gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r36062 - in gnunet-gtk: contrib src/setup


From: gnunet
Subject: [GNUnet-SVN] r36062 - in gnunet-gtk: contrib src/setup
Date: Mon, 13 Jul 2015 15:18:04 +0200

Author: grothoff
Date: 2015-07-13 15:18:03 +0200 (Mon, 13 Jul 2015)
New Revision: 36062

Modified:
   gnunet-gtk/contrib/gnunet_setup_main_window.glade
   gnunet-gtk/src/setup/gnunet-setup-options.c
Log:
allow vpn/pt to be configured individually (#3885)

Modified: gnunet-gtk/contrib/gnunet_setup_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_setup_main_window.glade   2015-07-13 12:11:25 UTC 
(rev 36061)
+++ gnunet-gtk/contrib/gnunet_setup_main_window.glade   2015-07-13 13:18:03 UTC 
(rev 36062)
@@ -472,12 +472,12 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkCheckButton" 
id="GNUNET_setup_general_services_pt_checkbutton">
-                                <property name="label" 
translatable="yes">PT/VPN</property>
+                              <object class="GtkCheckButton" 
id="GNUNET_setup_general_services_vpn_checkbutton">
+                                <property name="label" 
translatable="yes">VPN</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
-                                <property name="tooltip_text" 
translatable="yes">Using the PT/VPN subsystems you can tunnel your Internet 
traffic over GNUnet.  This is useful if you want to access the IPv4-Internet if 
you only have IPv6-connectivity or vice versa.  Furthermore, if you are only 
connected to other peers using WLAN, you could also get Internet access in the 
first place by routing IP traffic over GNUnet.</property>
+                                <property name="tooltip_text" 
translatable="yes">Using the VPN subsystem you can tunnel your Internet traffic 
over GNUnet to a GNUnet exit. This can be used to access GNUnet-specific 
services hosted by other peer.  </property>
                                 <property name="use_underline">True</property>
                                 <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
@@ -490,6 +490,23 @@
                               </packing>
                             </child>
                             <child>
+                              <object class="GtkCheckButton" 
id="GNUNET_setup_general_services_pt_checkbutton">
+                                <property name="label" 
translatable="yes">VPN/PT</property>
+                                <property name="can_focus">True</property>
+                                <property 
name="receives_default">False</property>
+                                <property name="tooltip_text" 
translatable="yes">Using the PT/VPN subsystems you can tunnel your Internet 
traffic over GNUnet.  PT adds "protocol translation", which is useful if you 
want to access the IPv4-Internet if you only have IPv6-connectivity or vice 
versa.  </property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="padding">5</property>
+                                <property name="position">5</property>
+                              </packing>
+                            </child>
+                            <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_general_services_exit_checkbutton">
                                 <property name="label" 
translatable="yes">EXIT</property>
                                 <property name="visible">True</property>
@@ -504,7 +521,7 @@
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
                                 <property name="padding">5</property>
-                                <property name="position">5</property>
+                                <property name="position">6</property>
                               </packing>
                             </child>
                             <child>
@@ -522,7 +539,7 @@
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
                                 <property name="padding">5</property>
-                                <property name="position">6</property>
+                                <property name="position">7</property>
                               </packing>
                             </child>
                           </object>
@@ -4334,107 +4351,8 @@
             </child>
             <child>
               <object class="GtkVBox" id="GNUNET_setup_vpn_vbox">
-                <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>
-                  <object class="GtkFrame" id="GNUNET_setup_pt_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_pt_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_pt_vbox">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="GtkHBox" 
id="GNUNET_setup_pt_hbox">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="GtkCheckButton" 
id="GNUNET_setup_pt_ipv4_checkbutton">
-                                    <property name="label" 
translatable="yes">Tunnel IPv4 Traffic</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property 
name="receives_default">False</property>
-                                    <property name="tooltip_text" 
translatable="yes">By enabling this option, all of your IPv4-Internet traffic 
will be routed over GNUnet to a GNUnet exit node.  Note that this will enable 
other GNUnet peers to observe your unencrypted Internet traffic. This enables 
4over6 tunneling and 4to6 protocol translation.</property>
-                                    <property name="xalign">0.5</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_pt_ipv6_checkbutton">
-                                    <property name="label" 
translatable="yes">Tunnel IPv6 Traffic</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property 
name="receives_default">False</property>
-                                    <property name="tooltip_text" 
translatable="yes">By enabling this option, all of your IPv6-Internet traffic 
will be routed over GNUnet to a GNUnet exit node.  Note that this will enable 
other GNUnet peers to observe your unencrypted Internet traffic.  This enables 
6over4 tunneling and 6to4 protocol translation.</property>
-                                    <property name="xalign">0.5</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">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckButton" 
id="GNUNET_setup_pt_dns_checkbutton">
-                                    <property name="label" 
translatable="yes">Tunnel DNS Traffic</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property 
name="receives_default">False</property>
-                                    <property name="tooltip_text" 
translatable="yes">Enabling this option will cause your DNS traffic to be 
routed via the GNUnet network to some other peer offering DNS exit 
functionality. This is needed if you have no Internet access (and are thus 
tunnelling both IPv4 and IPv6 traffic over GNUnet).  If you have regular 
Internet access, this option only makes sense if you want to get some 'weak' 
anonymity by tunnelling all of your traffic over GNUnet (using the network as a 
1-hop proxy in the worst-case, so this does not provide you with strong 
anonymity).</property>
-                                    <property name="xalign">0.5</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">2</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="padding">5</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="GNUNET_setup_pt_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" 
translatable="yes">&lt;b&gt;Protocol Translation and Tunneling 
Configuration&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">0</property>
-                  </packing>
-                </child>
-                <child>
                   <object class="GtkFrame" 
id="GNUNET_setup_vpn_interface_configuration_frame">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -4634,6 +4552,103 @@
                     <property name="expand">False</property>
                     <property name="fill">True</property>
                     <property name="padding">5</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="GNUNET_setup_pt_frame">
+                    <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_pt_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_pt_vbox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkHBox" 
id="GNUNET_setup_pt_hbox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkCheckButton" 
id="GNUNET_setup_pt_ipv4_checkbutton">
+                                    <property name="label" 
translatable="yes">Tunnel IPv4 Traffic</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property 
name="receives_default">False</property>
+                                    <property name="tooltip_text" 
translatable="yes">By enabling this option, all of your IPv4-Internet traffic 
will be routed over GNUnet to a GNUnet exit node.  Note that this will enable 
other GNUnet peers to observe your unencrypted Internet traffic. This enables 
4over6 tunneling and 4to6 protocol translation.</property>
+                                    <property name="xalign">0.5</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_pt_ipv6_checkbutton">
+                                    <property name="label" 
translatable="yes">Tunnel IPv6 Traffic</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property 
name="receives_default">False</property>
+                                    <property name="tooltip_text" 
translatable="yes">By enabling this option, all of your IPv6-Internet traffic 
will be routed over GNUnet to a GNUnet exit node.  Note that this will enable 
other GNUnet peers to observe your unencrypted Internet traffic.  This enables 
6over4 tunneling and 6to4 protocol translation.</property>
+                                    <property name="xalign">0.5</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">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" 
id="GNUNET_setup_pt_dns_checkbutton">
+                                    <property name="label" 
translatable="yes">Tunnel DNS Traffic</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property 
name="receives_default">False</property>
+                                    <property name="tooltip_text" 
translatable="yes">Enabling this option will cause your DNS traffic to be 
routed via the GNUnet network to some other peer offering DNS exit 
functionality. This is needed if you have no Internet access (and are thus 
tunnelling both IPv4 and IPv6 traffic over GNUnet).  If you have regular 
Internet access, this option only makes sense if you want to get some 'weak' 
anonymity by tunnelling all of your traffic over GNUnet (using the network as a 
1-hop proxy in the worst-case, so this does not provide you with strong 
anonymity).</property>
+                                    <property name="xalign">0.5</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">2</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="padding">5</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="GNUNET_setup_pt_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" 
translatable="yes">&lt;b&gt;Protocol Translation and Tunneling 
Configuration&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>
@@ -4644,10 +4659,9 @@
             </child>
             <child type="tab">
               <object class="GtkLabel" id="GNUNET_setup_vpn_label">
-                <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="tooltip_text" translatable="yes">Configuration 
of the GNUnet VPN and the Protocol Translation (6to4, 4to6, 6over4, 4over6) 
facilities</property>
-                <property name="label" translatable="yes">_VPN</property>
+                <property name="label" translatable="yes">_VPN/PT</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -4657,7 +4671,6 @@
             </child>
             <child>
               <object class="GtkVBox" id="GNUNET_setup_exit_vbox">
-                <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>
                   <object class="GtkFrame" id="GNUNET_setup_exit_frame">
@@ -5192,7 +5205,6 @@
             </child>
             <child type="tab">
               <object class="GtkLabel" id="GNUNET_setup_exit_label">
-                <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_Exit</property>
                 <property name="use_underline">True</property>
@@ -5204,7 +5216,6 @@
             </child>
             <child>
               <object class="GtkVBox" id="GNUNET_setup_namestore_vbox">
-                <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>
                   <object class="GtkFrame" id="GNUNET_setup_namestore_frame">
@@ -5437,28 +5448,6 @@
                     <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 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">7</property>
@@ -5466,7 +5455,6 @@
             </child>
             <child type="tab">
               <object class="GtkLabel" id="GNUNET_setup_namestore_label">
-                <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">GNS &amp; 
N_amestore</property>
                 <property name="use_underline">True</property>

Modified: gnunet-gtk/src/setup/gnunet-setup-options.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-options.c 2015-07-13 12:11:25 UTC (rev 
36061)
+++ gnunet-gtk/src/setup/gnunet-setup-options.c 2015-07-13 13:18:03 UTC (rev 
36062)
@@ -1011,19 +1011,33 @@
 
 
 /**
- * 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}
+};
+
+
+/**
  * Hide "namestore" tab if GNS not active.
  */
 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 @@
   /* 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},
 
 
   {




reply via email to

[Prev in Thread] Current Thread [Next in Thread]