[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet-gtk] branch master updated: fix segv regression int
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet-gtk] branch master updated: fix segv regression introduced by xrs |
Date: |
Thu, 01 Aug 2019 13:45:45 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet-gtk.
The following commit(s) were added to refs/heads/master by this push:
new bd150825 fix segv regression introduced by xrs
bd150825 is described below
commit bd15082550799cbae12d8f21af561786af89f672
Author: Christian Grothoff <address@hidden>
AuthorDate: Thu Aug 1 13:44:00 2019 +0200
fix segv regression introduced by xrs
---
src/setup/gnunet-setup-options.c | 25 ++++++++++++-------------
src/setup/gnunet-setup.c | 6 +-----
2 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/src/setup/gnunet-setup-options.c b/src/setup/gnunet-setup-options.c
index 348121dc..5c4d10b7 100644
--- a/src/setup/gnunet-setup-options.c
+++ b/src/setup/gnunet-setup-options.c
@@ -404,7 +404,8 @@ static struct PortSpecification port_specifications[] =
* Find spinbutton associated with a port specification.
*
* @param i index of the respective port specification
- * @return spinbutton or NULL in case of an error or if respecitve transport
is disabled
+ * @return spinbutton or NULL in case of an error or if respecitve transport is
+ * disabled
*/
static GtkSpinButton *
get_port_spinbutton (unsigned int i)
@@ -1282,7 +1283,6 @@ const struct GNUNET_SETUP_OptionSpecification
option_specifications[] = {
gettext_noop ("Should this peer advertise its hostlist to other peers"),
"https://docs.gnunet.org/#Configuring-your-peer-to-provide-a-hostlist",
&load_option_list,
- &load_option_list,
&save_option_list,
"-a",
NULL,
@@ -1387,7 +1387,6 @@ const struct GNUNET_SETUP_OptionSpecification
option_specifications[] = {
gettext_noop ("Use a SOCKS v4 proxy"),
"https://docs.gnunet.org/#Configuration-of-the-HOSTLIST-proxy-settings",
&load_option_list /* abuse! */,
- &load_option_list /* abuse! */,
&save_option_list /* abuse! */,
"SOCKS4",
NULL,
@@ -1583,7 +1582,7 @@ const struct GNUNET_SETUP_OptionSpecification
option_specifications[] = {
"transport",
"PLUGINS",
gettext_noop ("Enable communication via DV"),
- "https://docs.gnunet.org/#Distance_002dVector-plugin",
+ "https://docs.gnunet.org/#Distance_002dVector-plugin",
&load_option_list,
&save_option_list,
"dv",
@@ -2384,7 +2383,7 @@ const struct GNUNET_SETUP_OptionSpecification
option_specifications[] = {
"TUN_IFNAME",
gettext_noop (
"Name of the virtual interface the GNUnet exit service should create for
traffic exiting the VPN to the Internet"),
- "https://docs.gnunet.org/#Configuring-the-GNUnet-VPN-Exit-Service",
+ "https://docs.gnunet.org/#Configuring-the-GNUnet-VPN-Exit-Service",
&load_text,
&save_text,
NULL,
@@ -2397,7 +2396,7 @@ const struct GNUNET_SETUP_OptionSpecification
option_specifications[] = {
"exit",
"IPV4ADDR",
gettext_noop ("IPv4 address to use for the Exit interface"),
- "https://docs.gnunet.org/#Configuring-the-GNUnet-VPN-Exit-Service",
+ "https://docs.gnunet.org/#Configuring-the-GNUnet-VPN-Exit-Service",
&load_text,
&save_text,
NULL,
@@ -2410,7 +2409,7 @@ const struct GNUNET_SETUP_OptionSpecification
option_specifications[] = {
"exit",
"IPV4MASK",
gettext_noop ("IPv4 network mask to use for the Exit interface"),
- "https://docs.gnunet.org/#Configuring-the-GNUnet-VPN-Exit-Service",
+ "https://docs.gnunet.org/#Configuring-the-GNUnet-VPN-Exit-Service",
&load_text,
&save_text,
NULL,
@@ -2423,7 +2422,7 @@ const struct GNUNET_SETUP_OptionSpecification
option_specifications[] = {
"exit",
"IPV6ADDR",
gettext_noop ("IPv6 address to use for the Exit interface"),
- "https://docs.gnunet.org/#Configuring-the-GNUnet-VPN-Exit-Service",
+ "https://docs.gnunet.org/#Configuring-the-GNUnet-VPN-Exit-Service",
&load_text,
&save_text,
NULL,
@@ -2436,7 +2435,7 @@ const struct GNUNET_SETUP_OptionSpecification
option_specifications[] = {
"exit",
"IPV6PREFIX",
gettext_noop ("IPv6 network prefix length to use for the Exit interface"),
- "https://docs.gnunet.org/#Configuring-the-GNUnet-VPN-Exit-Service",
+ "https://docs.gnunet.org/#Configuring-the-GNUnet-VPN-Exit-Service",
&load_number,
&save_number,
NULL,
@@ -2451,7 +2450,7 @@ const struct GNUNET_SETUP_OptionSpecification
option_specifications[] = {
"EXIT_IPV4",
gettext_noop (
"Allow other users to use your Internet connection for UDP traffic (via
the Exit interface)"),
- "https://docs.gnunet.org/#Configuring-the-GNUnet-VPN-Exit-Service",
+ "https://docs.gnunet.org/#Configuring-the-GNUnet-VPN-Exit-Service",
&load_yes_no,
&save_yes_no,
NULL,
@@ -2465,7 +2464,7 @@ const struct GNUNET_SETUP_OptionSpecification
option_specifications[] = {
"EXIT_IPV6",
gettext_noop (
"Allow other users to use your Internet connection for TCP traffic (via
the Exit interface)"),
- "https://docs.gnunet.org/#Configuring-the-GNUnet-VPN-Exit-Service",
+ "https://docs.gnunet.org/#Configuring-the-GNUnet-VPN-Exit-Service",
&load_yes_no,
&save_yes_no,
NULL,
@@ -2480,7 +2479,7 @@ const struct GNUNET_SETUP_OptionSpecification
option_specifications[] = {
"EXIT_RANGE_IPV4_POLICY",
gettext_noop (
"Which IPv4 addresses and ports do you allow other users to send traffic
towards (via the Exit interface)"),
- "https://docs.gnunet.org/#Configuring-the-GNUnet-VPN-Exit-Service",
+ "https://docs.gnunet.org/#Configuring-the-GNUnet-VPN-Exit-Service",
&load_text,
&save_text,
NULL,
@@ -2495,7 +2494,7 @@ const struct GNUNET_SETUP_OptionSpecification
option_specifications[] = {
"EXIT_RANGE_IPV6_POLICY",
gettext_noop (
"Which IPv6 addresses and ports do you allow other users to send traffic
towards (via the Exit interface)"),
- "https://docs.gnunet.org/#Configuring-the-GNUnet-VPN-Exit-Service",
+ "https://docs.gnunet.org/#Configuring-the-GNUnet-VPN-Exit-Service",
&load_text,
&save_text,
NULL,
diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index 84e55aaa..4e9ff6f4 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -242,7 +242,6 @@ static void
load_options ()
{
const struct GNUNET_SETUP_OptionSpecification *os;
- unsigned int i;
GObject *widget;
char *value;
@@ -250,8 +249,7 @@ load_options ()
gtk_widget_hide (GTK_WIDGET (
GNUNET_SETUP_get_object ("GNUNET_setup_gns_hijack_checkbutton")));
#endif
- i = 0;
- while (NULL != option_specifications[i].widget_name)
+ for (unsigned int i = 0; NULL != option_specifications[i].widget_name; i++)
{
os = &option_specifications[i];
widget = GNUNET_SETUP_get_object (os->widget_name);
@@ -260,7 +258,6 @@ load_options ()
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_ ("Widget `%s' not found\n"),
os->widget_name);
- i++;
continue;
}
if (NULL != os->load_function)
@@ -332,7 +329,6 @@ load_options ()
G_CALLBACK (&widget_state_change_callback),
(void *) os);
}
- i++;
}
}
--
To stop receiving notification emails like this one, please contact
address@hidden.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [gnunet-gtk] branch master updated: fix segv regression introduced by xrs,
gnunet <=