[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet-gtk] 01/03: removing obsoleted NAT configuration op
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [gnunet-gtk] 01/03: removing obsoleted NAT configuration options from gnunet-setup |
|
Date: |
Tue, 10 Jan 2017 00:00:19 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet-gtk.
commit 1457d002e1d256eee8dd086caf9a0454564ba91b
Author: Christian Grothoff <address@hidden>
AuthorDate: Mon Jan 9 09:20:32 2017 +0100
removing obsoleted NAT configuration options from gnunet-setup
---
.gitignore | 37 ++
contrib/gnunet_setup_main_window.glade | 385 +++------------------
doc/gnunet-setup.1 | 3 -
src/setup/Makefile.am | 1 -
src/setup/gnunet-setup-options.c | 108 ------
src/setup/gnunet-setup-transport.c | 604 ---------------------------------
src/setup/gnunet-setup-transport.h | 58 ----
src/setup/gnunet-setup.c | 28 --
8 files changed, 83 insertions(+), 1141 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..8f88dddb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,37 @@
+*~
+*.a
+*.la
+*.lo
+*.log
+*.o
+*.orig
+*.rej
+*.swp
+*.trs
+.deps/
+.libs/
+.svn/
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache/
+compile
+config.guess
+config.log
+config.status
+config.sub
+configure
+depcomp
+gnunet_config.h
+gnunet_config.h.in
+install-sh
+libtool
+ltmain.sh
+lynXified.*
+missing
+po/*.gmo
+pkgconfig/*.pc
+src/*/*.conf
+stamp-h1
+test-driver
+INSTALL
diff --git a/contrib/gnunet_setup_main_window.glade
b/contrib/gnunet_setup_main_window.glade
index aad7f7ac..f5cf9967 100644
--- a/contrib/gnunet_setup_main_window.glade
+++ b/contrib/gnunet_setup_main_window.glade
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.18.3 -->
<interface>
<requires lib="gtk+" version="3.4"/>
<object class="GtkAdjustment" id="GNUNET_setup_bandwidth_in_adjustment">
@@ -1289,358 +1289,66 @@
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkBox"
id="GNUNET_setup_bandwidth_vbox">
+ <object class="GtkGrid"
id="GNUNET_setup_bandwidth_grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="row_spacing">5</property>
+ <property name="column_spacing">5</property>
+ <property name="row_homogeneous">True</property>
<child>
- <object class="GtkBox"
id="GNUNET_setup_bandwidth_hbox">
+ <object class="GtkLabel"
id="GNUNET_setup_bandwidth_in_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <child>
- <object class="GtkLabel"
id="GNUNET_setup_bandwidth_in_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Max. download bandwidth (B/s):</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="GtkSpinButton"
id="GNUNET_setup_bandwidth_in_spinbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="invisible_char">•</property>
- <property
name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
- <property
name="adjustment">GNUNET_setup_bandwidth_in_adjustment</property>
- <property name="numeric">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel"
id="GNUNET_setup_bandwidth_out_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Max. upload bandwidth (B/s)</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton"
id="GNUNET_setup_bandwidth_out_spinbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="invisible_char">•</property>
- <property
name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
- <property
name="adjustment">GNUNET_setup_bandwidth_out_adjustment</property>
- <property name="numeric">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
+ <property name="label" translatable="yes">Max.
download bandwidth (B/s):</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel"
id="GNUNET_setup_bandwidth_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes"><b>Bandwidth Configuration</b></property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame"
id="GNUNET_setup_transport_nat_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_transport_nat_alignment">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkBox"
id="GNUNET_setup_transport_nat_vbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<child>
- <object class="GtkBox"
id="GNUNET_setup_transport_nat_hbox">
+ <object class="GtkLabel"
id="GNUNET_setup_bandwidth_out_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <child>
- <object class="GtkCheckButton"
id="GNUNET_setup_transport_nat_checkbutton">
- <property name="label"
translatable="yes">Peer is behind _NAT</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="tooltip_text"
translatable="yes">Check this box if your machine is behind a NAT box (router
that performs network address translation). Leave off if your machine has a
globally unique IPv4 address. NAT options only impact IPv4 addresses at this
time.</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">False</property>
- <property name="padding">5</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton"
id="GNUNET_setup_transport_autoconfig_button">
- <property name="label"
translatable="yes">Attempt automatic configuration</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">True</property>
- <signal name="clicked"
handler="GNUNET_setup_transport_autoconfig_button_clicked_cb" swapped="no"/>
- </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_transport_disable_ipv6_checkbutton">
- <property name="label"
translatable="yes">Disable IPv_6 support</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="tooltip_text"
translatable="yes">Disable advertising IPv6 addresses. Check this box if you
know that your system has no IPv6 Internet connectivity.</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">False</property>
- <property name="padding">5</property>
- <property name="position">2</property>
- </packing>
- </child>
+ <property name="label" translatable="yes">Max.
upload bandwidth (B/s):</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
- <object class="GtkBox"
id="GNUNET_setup_transport_nat_options_hbox">
+ <object class="GtkSpinButton"
id="GNUNET_setup_bandwidth_in_spinbutton">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">20</property>
- <child>
- <object class="GtkLabel"
id="GNUNET_setup_transport_nat_options_spacer_label">
- <property name="visible">True</property>
- <property name="can_focus">False</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="GtkBox"
id="GNUNET_setup_transport_nat_options_vbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="orientation">vertical</property>
- <child>
- <object class="GtkCheckButton"
id="GNUNET_setup_transport_hole_punched_checkbutton">
- <property name="label"
translatable="yes">NAT ports have been opened manually</property>
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="tooltip_text"
translatable="yes">Set this option if you have configured your NAT to forward
the ports for the various enabled GNUnet transports. If the external ports are
different, the respective values of the external port should be specified under
"advertised port" for the respective transport. You also need to specify the
"External (public) IPv4 address" of your NAT box below.</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">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton"
id="GNUNET_setup_transport_upnp_enable_checkbutton">
- <property name="label"
translatable="yes">Enable NAT traversal via UPnP or PMP</property>
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="tooltip_text"
translatable="yes">This option enables the use of upnpc from miniupnpd for NAT
traversal</property>
- <property name="xalign">0</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>
- <child>
- <object class="GtkCheckButton"
id="GNUNET_setup_transport_icmp_server_enable_checkbutton">
- <property name="label"
translatable="yes">Enable NAT traversal using ICMP method</property>
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="tooltip_text"
translatable="yes">This option enables the use of the "Autonomous NAT
Traversal" method (presented at P2P 2010). It requires
gnunet-helper-nat-server to be installed SUID on the local system.</property>
- <property name="xalign">0</property>
- <property
name="draw_indicator">True</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox"
id="GNUNET_setup_transport_external_ip_hbox">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <child>
- <object class="GtkLabel"
id="GNUNET_setup_transport_external_ip_label">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property name="tooltip_text"
translatable="yes">Globally visible IP address of your system (IP address of
the external interface of your NAT). You can also specify a hostname, in which
case GNUnet will periodically look up the hostname in DNS to determine our
external IP address (DynDNS setup).</property>
- <property name="label"
translatable="yes">External (public) IPv4 address:</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="GtkEntry"
id="GNUNET_setup_transport_external_ip_address_entry">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="max_length">255</property>
- <property
name="invisible_char">●</property>
- <property
name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
- </object>
- <packing>
- <property
name="expand">True</property>
- <property
name="fill">True</property>
- <property
name="padding">5</property>
- <property
name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton"
id="GNUNET_setup_transport_icmp_client_enable_checkbutton">
- <property name="label"
translatable="yes">Enable connecting to NATed peers using ICMP method</property>
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="tooltip_text"
translatable="yes">This method allows this peer to initiate connections to
NATed peers using the 'Autonomous NAT traversal' method (presented at P2P
2010). It requires having gnunet-helper-nat-client installed SUID on the local
system.</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property
name="draw_indicator">True</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox"
id="GNUNET_setup_transport_internal_ip_hbox">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <child>
- <object class="GtkLabel"
id="GNUNET_setup_transport_internal_ip_label">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property name="tooltip_text"
translatable="yes">Specify the IPv4 address of your computers main network
interface (typically eth0 or wlan0).</property>
- <property name="label"
translatable="yes">Internal (private) IPv4 address:</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="GtkEntry"
id="GNUNET_setup_transport_internal_ip_entry">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="max_length">15</property>
- <property
name="invisible_char">●</property>
- <property
name="width_chars">15</property>
- <property
name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</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>
- <property name="fill">True</property>
- <property name="position">5</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="text"
translatable="yes">65536</property>
+ <property
name="primary_icon_activatable">False</property>
+ <property
name="secondary_icon_activatable">False</property>
+ <property
name="adjustment">GNUNET_setup_bandwidth_in_adjustment</property>
+ <property name="numeric">True</property>
+ <property name="value">65536</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton"
id="GNUNET_setup_bandwidth_out_spinbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="text"
translatable="yes">65536</property>
+ <property
name="primary_icon_activatable">False</property>
+ <property
name="secondary_icon_activatable">False</property>
+ <property
name="adjustment">GNUNET_setup_bandwidth_out_adjustment</property>
+ <property name="numeric">True</property>
+ <property name="value">65536</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
</packing>
</child>
</object>
@@ -1648,19 +1356,18 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel"
id="GNUNET_setup_transport_nat_label">
+ <object class="GtkLabel"
id="GNUNET_setup_bandwidth_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>NAT
Traversal Configuration</b></property>
+ <property name="label"
translatable="yes"><b>Bandwidth 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">1</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
diff --git a/doc/gnunet-setup.1 b/doc/gnunet-setup.1
index 7f6a37c8..47ac94d3 100644
--- a/doc/gnunet-setup.1
+++ b/doc/gnunet-setup.1
@@ -13,9 +13,6 @@ The first time you run gnunet\-setup, the goal will typically
be to configure th
It is recommended that "/etc/gnunet.conf" should be a world\-readable copy of
the peer's GNUnet configuration. Note that GNUnet configuration files (as
generated by gnunet\-setup) only contain those values that differ from the
defaults. Also note that "gnunet\-arm" will by default look for a
configuration in "$HOME/.config/gnunet.conf" (or, "$XDG_CONFIG_DIR/gnunet.conf"
if "$XDG_CONFIG_DIR" is set); thus, if your configuration is in
"/etc/gnunet.conf", you have to pass "\-c /etc/gnunet [...]
.TP
-\fB\-a\fR, \fB\-\-autoconfig\fR
-try to automatically configure networking for the peer without starting the
interactive GUI
-.TP
\fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR
load config file (default: ~/.config/gnunet.conf)
.TP
diff --git a/src/setup/Makefile.am b/src/setup/Makefile.am
index dc0c04a0..b06071d5 100644
--- a/src/setup/Makefile.am
+++ b/src/setup/Makefile.am
@@ -20,7 +20,6 @@ gnunet_setup_SOURCES = \
gnunet-setup-transport-https.c \
gnunet-setup-transport-tcp.c \
gnunet-setup-transport-udp.c \
- gnunet-setup-transport.c gnunet-setup-transport.h \
gnunet-setup-datastore-plugins.c \
gnunet-setup-datastore-config.c \
gnunet-setup-datacache-plugins.c \
diff --git a/src/setup/gnunet-setup-options.c b/src/setup/gnunet-setup-options.c
index 34ae07a0..d6ab22c4 100644
--- a/src/setup/gnunet-setup-options.c
+++ b/src/setup/gnunet-setup-options.c
@@ -1271,28 +1271,6 @@ static struct GNUNET_SETUP_VisibilitySpecification
hide_all_tcp_options[] = {
/**
- * Hide NATed peer options.
- */
-static struct GNUNET_SETUP_VisibilitySpecification toggle_nat_options[] = {
- {"GNUNET_setup_transport_hole_punched_checkbutton", "^YES$", NULL},
- {"GNUNET_setup_transport_upnp_enable_checkbutton", "^YES$", NULL},
- {"GNUNET_setup_transport_icmp_server_enable_checkbutton", "^YES$", NULL},
- {"GNUNET_setup_transport_external_ip_hbox", "^YES$", NULL},
- {NULL, NULL, NULL}
-};
-
-/**
- * Hide hole-punched NATed peer options.
- */
-static struct GNUNET_SETUP_VisibilitySpecification toggle_nat_punched_options[]
- = {
- {"GNUNET_setup_transport_upnp_enable_checkbutton", "^NO$", NULL},
- {"GNUNET_setup_transport_icmp_server_enable_checkbutton", "^NO$", NULL},
- {NULL, NULL, NULL}
-};
-
-
-/**
* Hide internal IP options.
*/
static struct GNUNET_SETUP_VisibilitySpecification toggle_internal_ip[] = {
@@ -1746,92 +1724,6 @@ const struct GNUNET_SETUP_OptionSpecification
option_specifications[] = {
NULL },
{
- "GNUNET_setup_transport_nat_checkbutton",
- "toggled",
- "nat",
- "BEHIND_NAT",
- gettext_noop ("Check if this peer is behind a NAT"),
- "https://gnunet.org/configuration-nat";,
- &load_yes_no,
- &save_yes_no, NULL,
- NULL, NULL,
- toggle_nat_options},
-
- {
- "GNUNET_setup_transport_hole_punched_checkbutton",
- "toggled",
- "nat",
- "PUNCHED_NAT",
- gettext_noop ("Check if the NAT has been configured manually to forward
ports"),
- "https://gnunet.org/configuration-nat";,
- &load_yes_no,
- &save_yes_no, NULL,
- NULL, NULL,
- toggle_nat_punched_options},
-
- {
- "GNUNET_setup_transport_upnp_enable_checkbutton",
- "toggled",
- "nat",
- "ENABLE_UPNP",
- gettext_noop ("Enable NAT traversal with UPnP/PMP"),
- "https://gnunet.org/configuration-nat";,
- &load_yes_no,
- &save_yes_no, NULL,
- NULL, NULL,
- NULL,
- },
-
- {
- "GNUNET_setup_transport_icmp_server_enable_checkbutton",
- "toggled",
- "nat",
- "ENABLE_ICMP_SERVER",
- gettext_noop ("Enable NAT traversal with ICMP as server"),
- "https://gnunet.org/configuration-nat";,
- &load_yes_no,
- &save_yes_no, NULL,
- NULL, NULL,
- NULL,
- },
-
- {
- "GNUNET_setup_transport_external_ip_address_entry",
- "changed",
- "nat",
- "EXTERNAL_ADDRESS",
- gettext_noop ("External (public) IP address of the NAT"),
- "https://gnunet.org/configuration-nat";,
- &load_text,
- &save_text, NULL,
- NULL, NULL,
- NULL},
-
- {
- "GNUNET_setup_transport_icmp_client_enable_checkbutton",
- "toggled",
- "nat",
- "ENABLE_ICMP_CLIENT",
- gettext_noop ("Enable NAT traversal with ICMP as client"),
- "https://gnunet.org/configuration-nat";,
- &load_yes_no,
- &save_yes_no, NULL,
- NULL, NULL,
- toggle_internal_ip},
-
- {
- "GNUNET_setup_transport_internal_ip_entry",
- "changed",
- "nat",
- "INTERNAL_ADDRESS",
- gettext_noop ("Internal (private) IP address of the NAT"),
- "https://gnunet.org/configuration-nat";,
- &load_text,
- &save_text, NULL,
- NULL, NULL,
- NULL},
-
- {
"GNUNET_setup_transport_disable_ipv6_checkbutton",
"toggled",
"nat",
diff --git a/src/setup/gnunet-setup-transport.c
b/src/setup/gnunet-setup-transport.c
deleted file mode 100644
index c242c50d..00000000
--- a/src/setup/gnunet-setup-transport.c
+++ /dev/null
@@ -1,604 +0,0 @@
-/*
- This file is part of GNUnet.
- Copyright (C) 2010, 2012, 2013 GNUnet e.V.
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-/**
- * @file src/setup/gnunet-setup-transport.c
- * @brief support for transport (NAT) configuration
- * @author Christian Grothoff
- *
- * TODO:
- * - cummulate collected information in the context
- * - implement and refine existing network setup tests
- * - if NAT detected and all traversal methods fail and no IPv6,
- * set transport plugin ports to 0
- */
-#include "gnunet-setup.h"
-#include "gnunet-setup-transport.h"
-#include <gnunet/gnunet_util_lib.h>
-#include <gnunet/gnunet_resolver_service.h>
-#include <gnunet/gnunet_nat_lib.h>
-
-/**
- * How long do we wait for the NAT test to report success?
- */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
-
-/**
- * Phases of the auto configuration.
- */
-enum AutoPhase
-{
- /**
- * Initial start value.
- */
- AUTO_INIT = 0,
-
- /**
- * Test if we are online.
- */
- AUTO_ONLINE = 1,
-
- /**
- * Test our external IP.
- */
- AUTO_EXTERNAL_IP,
-
- /**
- * Test our internal IP.
- */
- AUTO_LOCAL_IP,
-
- /**
- * Test if NAT was punched.
- */
- AUTO_NAT_PUNCHED,
-
- /**
- * Test if UPnP is working.
- */
- AUTO_UPNPC,
-
- /**
- * Test if ICMP server works.
- */
- AUTO_ICMP_SERVER,
-
- /**
- * Test if ICMP client works.
- */
- AUTO_ICMP_CLIENT,
-
- /**
- * Last phase, we're done.
- */
- AUTO_DONE
-
-};
-
-
-/**
- * Context for the autoconfig test.
- */
-struct GNUNET_SetupAutoContext
-{
-
- /**
- * Handle to the active NAT test.
- */
- struct GNUNET_NAT_Test *tst;
-
- /**
- * Function to call when done.
- */
- GNUNET_SetupAutoConfigFinished fin_cb;
-
- /**
- * Closure for 'fin_cb'.
- */
- void *fin_cb_cls;
-
- /**
- * Handle for active 'GNUNET_NAT_mini_get_external_ipv4'-operation.
- */
- struct GNUNET_NAT_ExternalHandle *eh;
-
- /**
- * Task identifier for the timeout.
- */
- struct GNUNET_SCHEDULER_Task * tsk;
-
- /**
- * Where are we in the test?
- */
- enum AutoPhase phase;
-
-};
-
-
-/**
- * Run the next phase of the auto test.
- */
-static void
-next_phase (struct GNUNET_SetupAutoContext *ac);
-
-
-/**
- * Update the ICMP server button based on the result.
- *
- * @param on #GNUNET_YES to enable, #GNUNET_NO to disable
- */
-static void
-update_icmp_server_enable_button (int on)
-{
- GtkToggleButton *button;
-
- button =
- GTK_TOGGLE_BUTTON (GNUNET_SETUP_get_object
-
("GNUNET_setup_transport_icmp_server_enable_checkbutton"));
- if (button == NULL)
- {
- GNUNET_break (0);
- return;
- }
- gtk_toggle_button_set_active (button, on ? TRUE : FALSE);
-}
-
-
-/**
- * Function called by NAT on success.
- * Clean up and update GUI (with success).
- *
- * @param cls closure (unused)
- * @param result error status
- */
-static void
-result_callback (void *cls,
- enum GNUNET_NAT_StatusCode result)
-{
- struct GNUNET_SetupAutoContext *ac = cls;
-
- GNUNET_SCHEDULER_cancel (ac->tsk);
- ac->tsk = NULL;
- GNUNET_NAT_test_stop (ac->tst);
- ac->tst = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- (GNUNET_NAT_ERROR_SUCCESS == result)
- ? _("NAT traversal with ICMP Server succeeded.\n")
- : _("NAT traversal with ICMP Server failed.\n"));
- update_icmp_server_enable_button ((GNUNET_NAT_ERROR_SUCCESS == result));
- if (NULL != cfg)
- GNUNET_CONFIGURATION_set_value_string (cfg,
- "nat",
- "ENABLE_ICMP_SERVER",
- (GNUNET_NAT_ERROR_SUCCESS == result)
- ? "YES": "NO");
- next_phase (ac);
-}
-
-
-/**
- * Main function for the connection reversal test.
- *
- * @param cls the 'int*' for the result
- */
-static void
-reversal_test (void *cls)
-{
- struct GNUNET_SetupAutoContext *ac = cls;
-
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Testing connection reversal with ICMP server.\n"));
- GNUNET_assert (NULL != cfg);
- GNUNET_RESOLVER_connect (cfg);
- ac->tst = GNUNET_NAT_test_start (cfg,
- GNUNET_YES,
- 0, 0, TIMEOUT,
- &result_callback, ac);
- if (NULL == ac->tst)
- {
- next_phase (ac);
- return;
- }
-}
-
-
-/**
- * Test if we are online at all.
- *
- * @param ac auto setup context
- */
-static void
-test_online (struct GNUNET_SetupAutoContext *ac)
-{
- // FIXME: not implemented
- next_phase (ac);
-}
-
-
-/**
- * Set our external IPv4 address.
- *
- * @param cls closure with our setup context
- * @param addr the address, NULL on errors
- * @param result error code
- */
-static void
-set_external_ipv4 (void *cls,
- const struct in_addr *addr,
- enum GNUNET_NAT_StatusCode result)
-{
- struct GNUNET_SetupAutoContext *ac = cls;
- char buf[INET_ADDRSTRLEN];
- GObject *o;
-
- ac->eh = NULL;
- if (NULL == addr)
- {
- next_phase (ac);
- return;
- }
- /* enable 'behind nat' */
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Detected external IP `%s'\n"),
- inet_ntop (AF_INET,
- addr,
- buf,
- sizeof (buf)));
- if (NULL != cfg)
- GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "BEHIND_NAT", "YES");
- o = GNUNET_SETUP_get_object ("GNUNET_setup_transport_nat_checkbutton");
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (o), TRUE);
-
- /* set external IP address */
- if (NULL == inet_ntop (AF_INET, addr, buf, sizeof (buf)))
- {
- GNUNET_break (0);
- next_phase (ac);
- return;
- }
- if (NULL != cfg)
- GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "EXTERNAL_ADDRESS",
- buf);
- o = GNUNET_SETUP_get_object
("GNUNET_setup_transport_external_ip_address_entry");
- gtk_entry_set_text (GTK_ENTRY (o), buf);
- next_phase (ac);
-}
-
-
-/**
- * Determine our external IPv4 address.
- *
- * @param ac auto setup context
- */
-static void
-test_external_ip (struct GNUNET_SetupAutoContext *ac)
-{
- // FIXME: CPS?
- /* try to detect external IP */
- ac->eh = GNUNET_NAT_mini_get_external_ipv4 (TIMEOUT,
- &set_external_ipv4, ac);
-}
-
-
-/**
- * Process list of local IP addresses. Find and set the
- * one of the default interface.
- *
- * @param cls pointer to int to store if we have a non-local IPv6 address
- * @param name name of the interface (can be NULL for unknown)
- * @param isDefault is this presumably the default interface
- * @param addr address of this interface (can be NULL for unknown or
unassigned)
- * @param broadcast_addr the broadcast address (can be NULL for unknown or
unassigned)
- * @param netmask the network mask (can be NULL for unknown or unassigned))
- * @param addrlen length of the address
- * @return #GNUNET_OK to continue iteration, #GNUNET_SYSERR to abort
- */
-static int
-nipo (void *cls, const char *name, int isDefault, const struct sockaddr *addr,
- const struct sockaddr *broadcast_addr, const struct sockaddr *netmask,
- socklen_t addrlen)
-{
- int *have_v6 = cls;
- const struct sockaddr_in *in;
- char buf[INET_ADDRSTRLEN];
- GtkEntry *entry;
-
- if (!isDefault)
- return GNUNET_OK;
- if ( (sizeof (struct sockaddr_in6) == addrlen) &&
- (0 != memcmp (&in6addr_loopback,
- &((struct sockaddr_in6 *)addr)->sin6_addr,
- sizeof (struct in6_addr))) &&
- (! IN6_IS_ADDR_LINKLOCAL (&((const struct sockaddr_in6*)
addr)->sin6_addr)))
- {
- *have_v6 = GNUNET_YES;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("This system has a global IPv6 address, setting IPv6 to
supported.\n"));
- return GNUNET_OK;
- }
- if (addrlen != sizeof (struct sockaddr_in))
- return GNUNET_OK;
- in = (const struct sockaddr_in *) addr;
-
- /* set internal IP address */
- if (NULL == inet_ntop (AF_INET, &in->sin_addr, buf, sizeof (buf)))
- {
- GNUNET_break (0);
- return GNUNET_OK;
- }
- GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "INTERNAL_ADDRESS", buf);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Detected internal network address `%s'.\n"),
- buf);
- entry =
- GTK_ENTRY (GNUNET_SETUP_get_object
- ("GNUNET_setup_transport_internal_ip_entry"));
- gtk_entry_set_text (entry, buf);
- /* no need to continue iteration */
- return GNUNET_SYSERR;
-}
-
-
-/**
- * Determine our local IP addresses; detect internal IP & IPv6-support
- *
- * @param ac auto setup context
- */
-static void
-test_local_ip (struct GNUNET_SetupAutoContext *ac)
-{
- GtkToggleButton *button;
- int have_v6;
-
- have_v6 = GNUNET_NO;
- GNUNET_OS_network_interfaces_list (&nipo, &have_v6);
- button = GTK_TOGGLE_BUTTON (GNUNET_SETUP_get_object
("GNUNET_setup_transport_disable_ipv6_checkbutton"));
- gtk_toggle_button_set_active (button,
- (GNUNET_YES == have_v6) ? FALSE : TRUE);
- if (NULL != cfg)
- GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "DISABLEV6",
- (GNUNET_YES == have_v6) ? "NO" :
"YES");
- next_phase (ac);
-}
-
-
-/**
- * Test if NAT has been punched
- *
- * @param ac auto setup context
- */
-static void
-test_nat_punched (struct GNUNET_SetupAutoContext *ac)
-{
- // FIXME: not implemented
- next_phase (ac);
-}
-
-
-/**
- * Test if UPnPC works.
- *
- * @param ac auto setup context
- */
-static void
-test_upnpc (struct GNUNET_SetupAutoContext *ac)
-{
- int have_upnpc;
- GtkToggleButton *button;
-
- /* test if upnpc is available */
- button = GTK_TOGGLE_BUTTON (GNUNET_SETUP_get_object
("GNUNET_setup_transport_upnp_enable_checkbutton"));
- have_upnpc = (GNUNET_SYSERR !=
- GNUNET_OS_check_helper_binary ("upnpc",GNUNET_NO, NULL));
- /* FIXME: test if upnpc is actually working, that is, if transports
- start to work once we use UPnP */
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- (have_upnpc)
- ? _("upnpc found, enabling its use\n")
- : _("upnpc not found\n"));
- gtk_toggle_button_set_active (button,
- have_upnpc
- ? TRUE
- : FALSE);
- if (NULL != cfg)
- GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "ENABLE_UPNP",
- (GNUNET_YES == have_upnpc) ? "YES" :
"NO");
- next_phase (ac);
-}
-
-
-/**
- * Test if ICMP server is working
- *
- * @param ac auto setup context
- */
-static void
-test_icmp_server (struct GNUNET_SetupAutoContext *ac)
-{
- int hns;
- char *tmp;
- char *binary;
-
- tmp = NULL;
- binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-nat-server");
- hns =
- ((GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (cfg, "nat", "EXTERNAL_ADDRESS",
- &tmp)) && (0 < strlen (tmp)) &&
- (GNUNET_YES ==
- GNUNET_CONFIGURATION_get_value_yesno (cfg, "nat", "BEHIND_NAT")) &&
- (GNUNET_YES ==
- GNUNET_OS_check_helper_binary (binary,GNUNET_NO, NULL)));
- GNUNET_free_non_null (tmp);
- GNUNET_free (binary);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- (hns)
- ? _("gnunet-helper-nat-server found, testing it\n")
- : _("No working gnunet-helper-nat-server found\n"));
- if (hns)
- GNUNET_SCHEDULER_add_now (&reversal_test, ac);
- else
- next_phase (ac);
-}
-
-
-/**
- * Test if ICMP client is working
- *
- * @param ac auto setup context
- */
-static void
-test_icmp_client (struct GNUNET_SetupAutoContext *ac)
-{
- GtkToggleButton *button;
- int hnc;
- char *tmp;
- char *binary;
-
- tmp = NULL;
- binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-nat-client");
- hnc =
- ((GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (cfg, "nat", "INTERNAL_ADDRESS",
- &tmp)) && (0 < strlen (tmp)) &&
- (GNUNET_YES !=
- GNUNET_CONFIGURATION_get_value_yesno (cfg, "nat", "BEHIND_NAT")) &&
- (GNUNET_YES ==
- GNUNET_OS_check_helper_binary (binary,GNUNET_NO, NULL)));
- GNUNET_free_non_null (tmp);
- GNUNET_free (binary);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- (hnc)
- ? _("gnunet-helper-nat-client found, enabling it\n")
- : _("gnunet-helper-nat-client not found or behind NAT, disabling
it\n"));
- button =
- GTK_TOGGLE_BUTTON (GNUNET_SETUP_get_object
-
("GNUNET_setup_transport_icmp_client_enable_checkbutton"));
- gtk_toggle_button_set_active (button, hnc ? TRUE : FALSE);
- next_phase (ac);
-}
-
-
-/**
- * User asked for autoconfiguration. Try the full program.
- *
- * @param fin_cb function to call when done
- * @param fin_cb_cls closure for 'fin_cb'
- * @return handle for the operation
- */
-struct GNUNET_SetupAutoContext *
-GNUNET_setup_transport_autoconfig_start (GNUNET_SetupAutoConfigFinished fin_cb,
- void *fin_cb_cls)
-{
- struct GNUNET_SetupAutoContext *ac;
-
- ac = GNUNET_new (struct GNUNET_SetupAutoContext);
- ac->fin_cb = fin_cb;
- ac->fin_cb_cls = fin_cb_cls;
-
- /* never use loopback addresses if user wanted autoconfiguration */
- GNUNET_CONFIGURATION_set_value_string (cfg, "nat",
- "USE_LOCALADDR",
- "NO");
- next_phase (ac);
- return ac;
-}
-
-
-/**
- * Run the next phase of the auto test.
- */
-static void
-next_phase (struct GNUNET_SetupAutoContext *ac)
-{
- ac->phase++;
- switch (ac->phase)
- {
- case AUTO_INIT:
- GNUNET_assert (0);
- break;
- case AUTO_ONLINE:
- test_online (ac);
- break;
- case AUTO_EXTERNAL_IP:
- test_external_ip (ac);
- break;
- case AUTO_LOCAL_IP:
- test_local_ip (ac);
- break;
- case AUTO_NAT_PUNCHED:
- test_nat_punched (ac);
- break;
- case AUTO_UPNPC:
- test_upnpc (ac);
- break;
- case AUTO_ICMP_SERVER:
- test_icmp_server (ac);
- break;
- case AUTO_ICMP_CLIENT:
- test_icmp_client (ac);
- break;
- case AUTO_DONE:
- ac->fin_cb (ac->fin_cb_cls);
- GNUNET_free (ac);
- return;
- }
-}
-
-
-/**
- * Autoconfiguration test is finished, clear the block so
- * that it can be run again.
- *
- * @param cls pointer to the location that needs to be NULLed
- */
-static void
-clear_ac (void *cls)
-{
- struct GNUNET_SetupAutoContext **acp = cls;
-
- *acp = NULL;
- gtk_widget_set_sensitive (GTK_WIDGET (GNUNET_SETUP_get_object
("GNUNET_setup_transport_autoconfig_button")),
- TRUE);
-}
-
-
-/**
- * User asked for autoconfiguration. Try the full program
- */
-void
-GNUNET_setup_transport_autoconfig_button_clicked_cb ()
-{
- static struct GNUNET_SetupAutoContext *ac;
-
- /* make sure only one test is running at a time */
- if (NULL != ac)
- {
- GNUNET_break (0);
- return;
- }
- gtk_widget_set_sensitive (GTK_WIDGET (GNUNET_SETUP_get_object
("GNUNET_setup_transport_autoconfig_button")),
- FALSE);
- ac = GNUNET_setup_transport_autoconfig_start (&clear_ac,
- &ac);
-}
-
-
-/* end of gnunet-setup-transport.c */
diff --git a/src/setup/gnunet-setup-transport.h
b/src/setup/gnunet-setup-transport.h
deleted file mode 100644
index fbef4faa..00000000
--- a/src/setup/gnunet-setup-transport.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- This file is part of GNUnet.
- Copyright (C) 2010, 2012 GNUnet e.V.
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-/**
- * @file src/setup/gnunet-setup-transport.h
- * @brief support for transport (NAT) configuration
- * @author Christian Grothoff
- */
-#ifndef GNUNET_SETUP_TRANSPORT_H
-#define GNUNET_SETUP_TRANSPORT_H
-#include "gnunet-setup.h"
-#include <gnunet/gnunet_util_lib.h>
-#include <gnunet/gnunet_resolver_service.h>
-#include <gnunet/gnunet_nat_lib.h>
-
-/**
- * Handle for the autoconfig operation.
- */
-struct GNUNET_SetupAutoContext;
-
-/**
- * Function called upon completion of the operation.
- *
- * @param cls closure
- */
-typedef void (*GNUNET_SetupAutoConfigFinished)(void *cls);
-
-
-/**
- * User asked for autoconfiguration. Try the full program.
- *
- * @param fin_cb function to call when done
- * @param fin_cb_cls closure for 'fin_cb'
- * @return handle for the operation
- */
-struct GNUNET_SetupAutoContext *
-GNUNET_setup_transport_autoconfig_start (GNUNET_SetupAutoConfigFinished fin_cb,
- void *fin_cb_cls);
-
-
-#endif
diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index d4da0554..f1bc7c23 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -24,7 +24,6 @@
* @author Christian Grothoff
*/
#include "gnunet-setup.h"
-#include "gnunet-setup-transport.h"
#include "gnunet-setup-options.h"
#include <gnunet/gnunet_constants.h>
#include <regex.h>
@@ -53,11 +52,6 @@ struct GNUNET_CONFIGURATION_Handle *cfg;
*/
static int gret;
-/**
- * Run autoconfig-only and then exit immediately.
- */
-static int do_autoconfig;
-
#ifndef MINGW
/**
* Flag to enable privilege escalation.
@@ -433,18 +427,6 @@ GNUNET_setup_launch_edit_friends_button_clicked_cb
(GtkButton *button,
/**
- * Called once the autoconfiguration is done. Triggers shutdown.
- *
- * @param cls unused
- */
-static void
-autoconfig_finished_cb (void *cls)
-{
- GNUNET_SCHEDULER_shutdown ();
-}
-
-
-/**
* Actual main method that sets up the configuration window.
*
* @param cls the main loop handle
@@ -519,13 +501,6 @@ run (void *cls)
main_window);
load_options ();
GNUNET_SCHEDULER_add_shutdown (&cleanup_task, NULL);
- if (do_autoconfig)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Attempting fully-automatic, non-interactive network
configuration\n"));
- GNUNET_setup_transport_autoconfig_start (&autoconfig_finished_cb, NULL);
- return;
- }
gtk_widget_show (main_window);
gtk_window_present (GTK_WINDOW (main_window));
}
@@ -542,9 +517,6 @@ int
main (int argc, char *const *argv)
{
struct GNUNET_GETOPT_CommandLineOption options[] = {
- { 'a', "autoconfig", NULL,
- gettext_noop ("attempt automatic configuration of the network and
instantly exit"),
- 0, &GNUNET_GETOPT_set_one, &do_autoconfig },
#ifndef MINGW
{ 'e', "elevate-priviledges", NULL,
gettext_noop ("run as user 'gnunet', if necessary by executing gksu to
elevate rights"),
--
To stop receiving notification emails like this one, please contact
address@hidden