[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r15467 - in gnunet-setup: contrib src
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r15467 - in gnunet-setup: contrib src |
|
Date: |
Wed, 8 Jun 2011 15:32:51 +0200 |
Author: grothoff
Date: 2011-06-08 15:32:51 +0200 (Wed, 08 Jun 2011)
New Revision: 15467
Modified:
gnunet-setup/contrib/gnunet-setup.glade
gnunet-setup/src/gnunet-setup-options.c
Log:
towards VPN configuration
Modified: gnunet-setup/contrib/gnunet-setup.glade
===================================================================
--- gnunet-setup/contrib/gnunet-setup.glade 2011-06-08 10:25:31 UTC (rev
15466)
+++ gnunet-setup/contrib/gnunet-setup.glade 2011-06-08 13:32:51 UTC (rev
15467)
@@ -25,7 +25,7 @@
<property name="icon_name">preferences-system</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
@@ -1103,6 +1103,18 @@
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="GtkComboBox"
id="GNUNET_setup_transport_tcp_internal_ip_comboboxentry">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="model">GNUNET_setup_transport_tcp_internal_ip_liststore</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">True</property>
@@ -2758,6 +2770,676 @@
<property name="tab_fill">False</property>
</packing>
</child>
+ <child>
+ <object class="GtkScrolledWindow"
id="GNUNET_setup_vpn_scrolledwindow">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkViewport" id="GNUNET_setup_vpn_viewport">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <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="frame1">
+ <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="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="box5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkHBox" id="box6">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel"
id="label18">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="label"
translatable="yes">Master _interface name:</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <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="GtkEntry"
id="GNUNET_setup_vpn_master_interface_entry">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="invisible_char">●</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="box7">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel"
id="label15">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="label"
translatable="yes">IPv4 address for Master interface:</property>
+ </object>
+ <packing>
+ <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="GtkEntry"
id="GNUNET_setup_vpn_master_interface_v4_ip_entry">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="invisible_char">●</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="GNUNET_setup_vpn_master_interface_slash_label">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="label"
translatable="yes">/</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry"
id="GNUNET_setup_vpn_master_interface_v4_mask_entry">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="invisible_char">●</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="box8">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel"
id="label14">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="label"
translatable="yes">IPv6 address for Master interface: </property>
+ </object>
+ <packing>
+ <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="GtkEntry"
id="GNUNET_setup_vpn_master_interface_v6_ip_entry">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="invisible_char">●</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="label16">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="label"
translatable="yes">/</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton"
id="GNUNET_setup_vpn_master_interface_v6_mask_spinbutton">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="invisible_char">●</property>
+ <property
name="adjustment">GNUNET_vpn_master_interface_mask_adjustment</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="box9">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel"
id="label13">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="label"
translatable="yes">Virtual DNS Server:</property>
+ </object>
+ <packing>
+ <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="GtkEntry"
id="GNUNET_setup_vpn_master_vdns_server_entry">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="invisible_char">●</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes"><b>Master Interface Configuration</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <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="GtkHBox"
id="GNUNET_setup_vpn_master_hbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkCheckButton"
id="GNUNET_setup_vpn_enable_vpn_exit_checkbutton">
+ <property name="label"
translatable="yes">Enable VPN Exit</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="use_action_appearance">False</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">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton"
id="GNUNET_setup_vpn_enable_dns_exit_checkbutton">
+ <property name="label"
translatable="yes">Enable DNS Exit</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="use_action_appearance">False</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="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame"
id="GNUNET_setup_vpn_exit_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="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkHBox" id="box2">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="label"
translatable="yes">Exit interface name: </property>
+ </object>
+ <packing>
+ <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="GtkEntry"
id="GNUNET_setup_vpn_exit_interface_name_entry">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="invisible_char">●</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkCheckButton"
id="GNUNET_setup_vpn_exit_enable_udp_checkbutton">
+ <property name="label"
translatable="yes">Enable UDP Exit</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="use_action_appearance">False</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="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton"
id="checkbutton">
+ <property name="label"
translatable="yes">Enable TCP exit</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="use_action_appearance">False</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="position">4</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="box3">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label8">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="label"
translatable="yes">IPv4 address for Exit interface: </property>
+ </object>
+ <packing>
+ <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="GtkEntry"
id="GNUNET_setup_vpn_exit_interface_v4_ip_entry">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="invisible_char">●</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="label11">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="label"
translatable="yes">/</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry"
id="GNUNET_setup_vpn_exit_interface_v4_mask_entry">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="invisible_char">●</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="box4">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label9">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="label"
translatable="yes">IPv6 address for Exit interface: </property>
+ </object>
+ <packing>
+ <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="GtkEntry"
id="GNUNET_setup_vpn_exit_interface_v6_ip_entry">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="invisible_char">●</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="label10">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="label"
translatable="yes">/</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton"
id="GNUNET_setup_vpn_exit_interface_v6_mask_spinbutton">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="invisible_char">●</property>
+ <property
name="adjustment">GNUNET_vpn_exit_interface_mask_adjustment</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel"
id="GNUNET_setup_vpn_exit_frame_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes"><b>GNUnet VPN Exit Interface</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame"
id="GNUNET_setup_vpn_service_configuration_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="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkTreeView"
id="GNUNET_setup_vpn_dns_service_treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="model">vpn_dns_config_liststore</property>
+ <property name="search_column">0</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection"/>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn"
id="treeviewcolumn1">
+ <property
name="sizing">autosize</property>
+ <property name="title"
translatable="yes">DNS name</property>
+ <property
name="clickable">True</property>
+ <property
name="reorderable">True</property>
+ <property
name="sort_indicator">True</property>
+ <property
name="sort_column_id">0</property>
+ <child>
+ <object class="GtkCellRendererText"
id="cellrenderertext1">
+ <property
name="editable">True</property>
+ </object>
+ <attributes>
+ <attribute
name="text">0</attribute>
+ </attributes>
+ </child>
+ <child>
+ <object
class="GtkCellRendererToggle" id="cellrenderertoggle1"/>
+ <attributes>
+ <attribute
name="active">6</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn"
id="treeviewcolumn2">
+ <property
name="sizing">autosize</property>
+ <property name="title"
translatable="yes">Source Port</property>
+ <child>
+ <object class="GtkCellRendererText"
id="cellrendererspin1">
+ <property
name="editable">True</property>
+ </object>
+ <attributes>
+ <attribute
name="text">1</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn"
id="treeviewcolumn3">
+ <property name="title"
translatable="yes">Destination</property>
+ <property
name="reorderable">True</property>
+ <property
name="sort_indicator">True</property>
+ <property
name="sort_column_id">2</property>
+ <child>
+ <object class="GtkCellRendererText"
id="cellrenderertext2">
+ <property
name="editable">True</property>
+ </object>
+ <attributes>
+ <attribute
name="text">3</attribute>
+ </attributes>
+ </child>
+ <child>
+ <object class="GtkCellRendererText"
id="cellrenderertext4">
+ <property name="text">:</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCellRendererText"
id="cellrendererspin2">
+ <property
name="editable">True</property>
+ </object>
+ <attributes>
+ <attribute
name="text">2</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn"
id="treeviewcolumn4">
+ <property
name="sizing">autosize</property>
+ <property name="title"
translatable="yes">TTL</property>
+ <child>
+ <object class="GtkCellRendererText"
id="cellrendererspin3">
+ <property
name="editable">True</property>
+ </object>
+ <attributes>
+ <attribute
name="text">4</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn"
id="treeviewcolumn5">
+ <property
name="sizing">autosize</property>
+ <property name="title"
translatable="yes">Alt. Names</property>
+ <child>
+ <object class="GtkCellRendererText"
id="cellrenderertext3">
+ <property
name="editable">True</property>
+ <property
name="wrap_mode">word</property>
+ </object>
+ <attributes>
+ <attribute
name="text">5</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label19">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes"><b>DNS Services Configuration</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </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="label" translatable="yes">_VPN</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">True</property>
@@ -2878,6 +3560,20 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkAdjustment" id="GNUNET_vpn_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_vpn_master_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="adjustment1">
<property name="upper">100</property>
<property name="step_increment">1</property>
@@ -2926,4 +3622,22 @@
<property name="page_increment">10</property>
<property name="page_size">10</property>
</object>
+ <object class="GtkListStore" id="vpn_dns_config_liststore">
+ <columns>
+ <!-- column-name hostname -->
+ <column type="gchararray"/>
+ <!-- column-name sourceport -->
+ <column type="guint"/>
+ <!-- column-name targetport -->
+ <column type="guint"/>
+ <!-- column-name targethostname -->
+ <column type="gchararray"/>
+ <!-- column-name ttl -->
+ <column type="guint"/>
+ <!-- column-name altnames -->
+ <column type="gchararray"/>
+ <!-- column-name isudp -->
+ <column type="gboolean"/>
+ </columns>
+ </object>
</interface>
Modified: gnunet-setup/src/gnunet-setup-options.c
===================================================================
--- gnunet-setup/src/gnunet-setup-options.c 2011-06-08 10:25:31 UTC (rev
15466)
+++ gnunet-setup/src/gnunet-setup-options.c 2011-06-08 13:32:51 UTC (rev
15467)
@@ -631,6 +631,17 @@
/**
+ * Hide "exit" options if VPN exit is not in use.
+ */
+static struct GNUNET_SETUP_VisibilitySpecification hide_exit_options[] =
+{
+ { "GNUNET_setup_vpn_exit_frame", "(^| )exit($| )", NULL },
+ { "GNUNET_setup_vpn_service_configuration_frame", "(^| )exit($| )", NULL },
+ { NULL, NULL, NULL }
+};
+
+
+/**
* Hide "hostlist" server options if hostlist server is not in use.
*/
static struct GNUNET_SETUP_VisibilitySpecification
hide_hostlist_server_options[] =
@@ -655,6 +666,17 @@
/**
+ * Hide "vpn tab" if VPN not active.
+ */
+static struct GNUNET_SETUP_VisibilitySpecification hide_vpn_tab[] =
+{
+ { "GNUNET_setup_vpn_scrolledwindow", "(^| )vpn($| )", NULL },
+ { NULL, NULL, NULL }
+};
+
+
+
+/**
* Hide "tcp tab" if TCP not active.
*/
static struct GNUNET_SETUP_VisibilitySpecification hide_tcp_tab[] =
@@ -910,7 +932,7 @@
"https://gnunet.org/configuration-vpn";,
&load_option_list,
&save_option_list, "vpn",
- NULL /* hide_vpn_tab */
+ hide_vpn_tab
},
{
@@ -986,10 +1008,10 @@
{
"GNUNET_setup_hostlist_url_treeview",
- NULL, NULL, NULL,
+ NULL, NULL, NULL, /* FIXME */
gettext_noop ("Known hostlist URLs"),
"https://gnunet.org/configuration-hostlist";,
- NULL, NULL, NULL,
+ NULL, NULL, NULL, /* FIXME */
NULL
},
@@ -1526,6 +1548,199 @@
NULL
},
+ {
+ "GNUNET_setup_vpn_master_interface_entry",
+ "changed",
+ "vpn",
+ "IFNAME",
+ gettext_noop ("Name of the virtual interface the GNUnet VPN should
create"),
+ "https://gnunet.org/configuration-vpn";,
+ &load_text,
+ &save_text, NULL,
+ NULL
+ },
+
+ {
+ "GNUNET_setup_vpn_master_interface_v4_ip_entry",
+ "changed",
+ "vpn",
+ "IPV4ADDR",
+ gettext_noop ("IPv4 address to use for the VPN interface"),
+ "https://gnunet.org/configuration-vpn";,
+ &load_text,
+ &save_text, NULL,
+ NULL
+ },
+
+ {
+ "GNUNET_setup_vpn_master_interface_v4_mask_entry",
+ "changed",
+ "vpn",
+ "IPV4MASK",
+ gettext_noop ("IPv4 network mask to use for the VPN interface"),
+ "https://gnunet.org/configuration-vpn";,
+ &load_text,
+ &save_text, NULL,
+ NULL
+ },
+
+ {
+ "GNUNET_setup_vpn_master_interface_v6_ip_entry",
+ "changed",
+ "vpn",
+ "IPV6ADDR",
+ gettext_noop ("IPv6 address to use for the VPN interface"),
+ "https://gnunet.org/configuration-vpn";,
+ &load_text,
+ &save_text, NULL,
+ NULL
+ },
+
+ {
+ "GNUNET_setup_vpn_master_interface_v6_mask_spinbutton",
+ "value-changed",
+ "vpn",
+ "IPV6MASK",
+ gettext_noop ("IPv6 network prefix length to use for the VPN interface"),
+ "https://gnunet.org/configuration-vpn";,
+ &load_number,
+ &save_number, NULL,
+ NULL
+ },
+
+ {
+ "GNUNET_setup_vpn_master_vdns_server_entry",
+ "changed",
+ "vpn",
+ "VIRTDNS",
+ gettext_noop ("IP address of the virtual DNS server that resolves
through GNUnet (use in resolve.conf if you want to resolve through some GNUnet
DNS Exit)"),
+ "https://gnunet.org/configuration-vpn";,
+ &load_text,
+ &save_text, NULL,
+ NULL
+ },
+
+ {
+ "GNUNET_setup_vpn_enable_vpn_exit_checkbutton",
+ "toggled",
+ "arm",
+ "DEFAULTSERVICES",
+ gettext_noop ("Activate the VPN exit to provide services and/or to
enable others to use your Internet connection"),
+ "https://gnunet.org/configuration-exit";,
+ &load_option_list,
+ &save_option_list, "exit",
+ hide_exit_options
+ },
+
+ {
+ "GNUNET_setup_vpn_enable_dns_exit_checkbutton",
+ "toggled",
+ "dns",
+ "PROVIDE_EXIT",
+ gettext_noop ("Allow other peers to perform DNS resolutions using your
Internet connection"),
+ "https://gnunet.org/configuration-dns";,
+ &load_yes_no,
+ &save_yes_no, NULL,
+ NULL
+ },
+
+ {
+ "GNUNET_setup_vpn_exit_interface_name_entry",
+ "changed",
+ "exit",
+ "IFNAME",
+ gettext_noop ("Name of the virtual interface the GNUnet exit service
should create for traffic exiting the VPN to the Internet"),
+ "https://gnunet.org/configuration-exit";,
+ &load_text,
+ &save_text, NULL,
+ NULL
+ },
+
+ {
+ "GNUNET_setup_vpn_exit_interface_v4_ip_entry",
+ "changed",
+ "exit",
+ "IPV4ADDR",
+ gettext_noop ("IPv4 address to use for the VPN Exit interface"),
+ "https://gnunet.org/configuration-exit";,
+ &load_text,
+ &save_text, NULL,
+ NULL
+ },
+
+ {
+ "GNUNET_setup_vpn_exit_interface_v4_mask_entry",
+ "changed",
+ "exit",
+ "IPV4MASK",
+ gettext_noop ("IPv4 network mask to use for the VPN Exit interface"),
+ "https://gnunet.org/configuration-exit";,
+ &load_text,
+ &save_text, NULL,
+ NULL
+ },
+
+ {
+ "GNUNET_setup_vpn_exit_interface_v6_ip_entry",
+ "changed",
+ "exit",
+ "IPV6ADDR",
+ gettext_noop ("IPv6 address to use for the VPN Exit interface"),
+ "https://gnunet.org/configuration-exit";,
+ &load_text,
+ &save_text, NULL,
+ NULL
+ },
+
+ {
+ "GNUNET_setup_vpn_exit_interface_v6_mask_spinbutton",
+ "value-changed",
+ "exit",
+ "IPV6MASK",
+ gettext_noop ("IPv6 network prefix length to use for the VPN Exit
interface"),
+ "https://gnunet.org/configuration-exit";,
+ &load_number,
+ &save_number, NULL,
+ NULL
+ },
+
+
+ {
+ "GNUNET_setup_vpn_exit_enable_udp_checkbutton",
+ "toggled",
+ "exit",
+ "ENABLE_UDP",
+ gettext_noop ("Allow other users to use your Internet connection for UDP
traffic (via the Exit interface)"),
+ "https://gnunet.org/configuration-exit";,
+ &load_yes_no,
+ &save_yes_no, NULL,
+ NULL
+ },
+
+ {
+ "GNUNET_setup_vpn_exit_enable_tcp_checkbutton",
+ "toggled",
+ "exit",
+ "ENABLE_TCP",
+ gettext_noop ("Allow other users to use your Internet connection for TCP
traffic (via the Exit interface)"),
+ "https://gnunet.org/configuration-exit";,
+ &load_yes_no,
+ &save_yes_no, NULL,
+ NULL
+ },
+
+ {
+ "GNUNET_setup_vpn_dns_service_treeview",
+ "Xchanged",
+ "vpn",
+ "IFNAME",
+ gettext_noop ("Specification of .gnunet hostnames and services offered
by this peer"),
+ "https://gnunet.org/configuration-dns";,
+ &load_text,
+ &save_text, NULL,
+ NULL
+ },
+
/* END of list */
{ NULL, NULL, NULL, NULL, NULL,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r15467 - in gnunet-setup: contrib src,
gnunet <=