[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33371 - in gnunet-gtk/src: peerinfo setup
From: |
gnunet |
Subject: |
[GNUnet-SVN] r33371 - in gnunet-gtk/src: peerinfo setup |
Date: |
Fri, 23 May 2014 10:48:44 +0200 |
Author: wachs
Date: 2014-05-23 10:48:44 +0200 (Fri, 23 May 2014)
New Revision: 33371
Modified:
gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c
gnunet-gtk/src/setup/gnunet-setup-options.c
Log:
adding http-client proxy options
Modified: gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c
===================================================================
--- gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c 2014-05-23 00:38:03 UTC
(rev 33370)
+++ gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c 2014-05-23 08:48:44 UTC
(rev 33371)
@@ -784,7 +784,7 @@
* Method called whenever a given peer has a QoS status change.
*
* @param cts closure
- * @param address the address
+ * @param address the address, or NULL if service disconnected
* @param address_active is this address actively used to maintain a connection
* to a peer
* @param bandwidth_in available amount of inbound bandwidth
Modified: gnunet-gtk/src/setup/gnunet-setup-options.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-options.c 2014-05-23 00:38:03 UTC (rev
33370)
+++ gnunet-gtk/src/setup/gnunet-setup-options.c 2014-05-23 08:48:44 UTC (rev
33371)
@@ -901,6 +901,28 @@
/**
+ * Hide "http-client" proxy options if proxy is not in use.
+ */
+static struct GNUNET_SETUP_VisibilitySpecification
+ hide_http_proxy_options[] = {
+ {"GNUNET_setup_transport_http_client_proxy_hostname_hbox", NULL, "NONE"},
+ {"GNUNET_setup_transport_http_client_proxy_username_hbox", NULL, "NONE"},
+ {"GNUNET_setup_transport_http_client_proxy_password_hbox", NULL, "NONE"},
+ {NULL, NULL, NULL}
+};
+
+/**
+ * Hide "https-client" proxy options if proxy is not in use.
+ */
+static struct GNUNET_SETUP_VisibilitySpecification
+ hide_https_proxy_options[] = {
+ {"GNUNET_setup_transport_https_client_proxy_hostname_hbox", NULL, "NONE"},
+ {"GNUNET_setup_transport_https_client_proxy_username_hbox", NULL, "NONE"},
+ {"GNUNET_setup_transport_https_client_proxy_password_hbox", NULL, "NONE"},
+ {NULL, NULL, NULL}
+};
+
+/**
* Hide "fs" tab if FS not active.
*/
static struct GNUNET_SETUP_VisibilitySpecification hide_fs_tab[] = {
@@ -1706,6 +1728,263 @@
NULL, NULL,
NULL},
+ {
+ "GNUNET_setup_transport_http_client_proxy_type_none_radiobutton",
+ "toggled",
+ "transport-http_client",
+ "PROXY_TYPE",
+ gettext_noop ("Do not use a proxy to download hostlists"),
+ "https://gnunet.org/configuration-http",
+ &load_option_list /* abuse! */ ,
+ &save_option_list /* abuse! */ , "NONE",
+ NULL, NULL,
+ hide_http_proxy_options
+ },
+
+ {
+ "GNUNET_setup_transport_http_client_proxy_type_http_radiobutton",
+ "toggled",
+ "transport-http_client",
+ "PROXY_TYPE",
+ gettext_noop ("Use an HTTP proxy"),
+ "https://gnunet.org/configuration-http",
+ &load_option_list /* abuse! */ ,
+ &save_option_list /* abuse! */ , "HTTP",
+ NULL, NULL,
+ hide_http_proxy_options
+ },
+
+ {
+ "GNUNET_setup_transport_http_client_proxy_type_http_10_radiobutton",
+ "toggled",
+ "transport-http_client",
+ "PROXY_TYPE",
+ gettext_noop ("Use an HTTP v1.0 (only) proxy"),
+ "https://gnunet.org/configuration-http",
+ &load_option_list /* abuse! */ ,
+ &save_option_list /* abuse! */ , "HTTP_1_0",
+ NULL, NULL,
+ hide_http_proxy_options
+ },
+
+ {
+ "GNUNET_setup_transport_http_client_proxy_type_socks4_radiobutton",
+ "toggled",
+ "transport-http_client",
+ "PROXY_TYPE",
+ gettext_noop ("Use a SOCKS v4 proxy"),
+ "https://gnunet.org/configuration-http",
+ &load_option_list /* abuse! */ ,
+ &save_option_list /* abuse! */ , "SOCKS4",
+ NULL, NULL,
+ hide_http_proxy_options
+ },
+
+ {
+ "GNUNET_setup_transport_http_client_proxy_type_socks4a_radiobutton",
+ "toggled",
+ "transport-http_client",
+ "PROXY_TYPE",
+ gettext_noop ("Use a SOCKS v4a proxy"),
+ "https://gnunet.org/configuration-http",
+ &load_option_list /* abuse! */ ,
+ &save_option_list /* abuse! */ , "SOCKS4a",
+ NULL, NULL,
+ hide_http_proxy_options
+ },
+
+ {
+ "GNUNET_setup_transport_http_client_proxy_type_socks5_radiobutton",
+ "toggled",
+ "transport-http_client",
+ "PROXY_TYPE",
+ gettext_noop ("Use a SOCKS v5 proxy"),
+ "https://gnunet.org/configuration-http",
+ &load_option_list /* abuse! */ ,
+ &save_option_list /* abuse! */ , "SOCKS5",
+ NULL, NULL,
+ hide_http_proxy_options
+ },
+
+ {
+ "GNUNET_setup_transport_http_client_proxy_type_socks5_hostname_radiobutton",
+ "toggled",
+ "transport-http_client",
+ "PROXY_TYPE",
+ gettext_noop ("Use a SOCKS v5 proxy with hostname"),
+ "https://gnunet.org/configuration-http",
+ &load_option_list /* abuse! */ ,
+ &save_option_list /* abuse! */ , "SOCKS5_HOSTNAME",
+ NULL, NULL,
+ hide_http_proxy_options
+ },
+
+ {
+ "GNUNET_setup_transport_http_client_proxy_hostname_entry",
+ "changed",
+ "transport-http_client",
+ "PROXY",
+ gettext_noop ("Specify hostname or IP (and optionally) port of the proxy"),
+ "https://gnunet.org/configuration-http",
+ &load_text,
+ &save_text, NULL,
+ NULL, NULL,
+ NULL},
+
+ {
+ "GNUNET_setup_transport_http_client_proxy_username_entry",
+ "changed",
+ "transport-http_client",
+ "PROXY_USERNAME",
+ gettext_noop ("Specify username for the proxy (if needed)"),
+ "https://gnunet.org/configuration-http",
+ &load_text,
+ &save_text, NULL,
+ NULL, NULL,
+ NULL},
+
+ {
+ "GNUNET_setup_transport_http_client_proxy_password_entry",
+ "changed",
+ "transport-http_client",
+ "PROXY_PASSWORD",
+ gettext_noop ("Specify password for the proxy (if needed)"),
+ "https://gnunet.org/configuration-http",
+ &load_text,
+ &save_text, NULL,
+ NULL, NULL,
+ NULL},
+
+ /* HTTPS client */
+
+ {
+ "GNUNET_setup_transport_http_client_proxy_type_none_radiobutton",
+ "toggled",
+ "transport-https_client",
+ "PROXY_TYPE",
+ gettext_noop ("Do not use a proxy to download hostlists"),
+ "https://gnunet.org/configuration-http",
+ &load_option_list /* abuse! */ ,
+ &save_option_list /* abuse! */ , "NONE",
+ NULL, NULL,
+ hide_https_proxy_options
+ },
+
+ {
+ "GNUNET_setup_transport_http_client_proxy_type_http_radiobutton",
+ "toggled",
+ "transport-https_client",
+ "PROXY_TYPE",
+ gettext_noop ("Use an HTTP proxy"),
+ "https://gnunet.org/configuration-http",
+ &load_option_list /* abuse! */ ,
+ &save_option_list /* abuse! */ , "HTTP",
+ NULL, NULL,
+ hide_https_proxy_options
+ },
+
+ {
+ "GNUNET_setup_transport_http_client_proxy_type_http_10_radiobutton",
+ "toggled",
+ "transport-https_client",
+ "PROXY_TYPE",
+ gettext_noop ("Use an HTTP v1.0 (only) proxy"),
+ "https://gnunet.org/configuration-http",
+ &load_option_list /* abuse! */ ,
+ &save_option_list /* abuse! */ , "HTTP_1_0",
+ NULL, NULL,
+ hide_https_proxy_options
+ },
+
+ {
+ "GNUNET_setup_transport_http_client_proxy_type_socks4_radiobutton",
+ "toggled",
+ "transport-https_client",
+ "PROXY_TYPE",
+ gettext_noop ("Use a SOCKS v4 proxy"),
+ "https://gnunet.org/configuration-http",
+ &load_option_list /* abuse! */ ,
+ &save_option_list /* abuse! */ , "SOCKS4",
+ NULL, NULL,
+ hide_https_proxy_options
+ },
+
+ {
+ "GNUNET_setup_transport_http_client_proxy_type_socks4a_radiobutton",
+ "toggled",
+ "transport-https_client",
+ "PROXY_TYPE",
+ gettext_noop ("Use a SOCKS v4a proxy"),
+ "https://gnunet.org/configuration-http",
+ &load_option_list /* abuse! */ ,
+ &save_option_list /* abuse! */ , "SOCKS4a",
+ NULL, NULL,
+ hide_https_proxy_options
+ },
+
+ {
+ "GNUNET_setup_transport_http_client_proxy_type_socks5_radiobutton",
+ "toggled",
+ "transport-https_client",
+ "PROXY_TYPE",
+ gettext_noop ("Use a SOCKS v5 proxy"),
+ "https://gnunet.org/configuration-http",
+ &load_option_list /* abuse! */ ,
+ &save_option_list /* abuse! */ , "SOCKS5",
+ NULL, NULL,
+ hide_https_proxy_options
+ },
+
+ {
+ "GNUNET_setup_transport_http_client_proxy_type_socks5_hostname_radiobutton",
+ "toggled",
+ "transport-https_client",
+ "PROXY_TYPE",
+ gettext_noop ("Use a SOCKS v5 proxy with hostname"),
+ "https://gnunet.org/configuration-http",
+ &load_option_list /* abuse! */ ,
+ &save_option_list /* abuse! */ , "SOCKS5_HOSTNAME",
+ NULL, NULL,
+ hide_https_proxy_options
+ },
+
+ {
+ "GNUNET_setup_transport_http_client_proxy_hostname_entry",
+ "changed",
+ "transport-https_client",
+ "PROXY",
+ gettext_noop ("Specify hostname or IP (and optionally) port of the proxy"),
+ "https://gnunet.org/configuration-http",
+ &load_text,
+ &save_text, NULL,
+ NULL, NULL,
+ NULL},
+
+ {
+ "GNUNET_setup_transport_http_client_proxy_username_entry",
+ "changed",
+ "transport-https_client",
+ "PROXY_USERNAME",
+ gettext_noop ("Specify username for the proxy (if needed)"),
+ "https://gnunet.org/configuration-http",
+ &load_text,
+ &save_text, NULL,
+ NULL, NULL,
+ NULL},
+
+ {
+ "GNUNET_setup_transport_http_client_proxy_password_entry",
+ "changed",
+ "transport-https_client",
+ "PROXY_PASSWORD",
+ gettext_noop ("Specify password for the proxy (if needed)"),
+ "https://gnunet.org/configuration-http",
+ &load_text,
+ &save_text, NULL,
+ NULL, NULL,
+ NULL},
+
+
/* FS TAB */
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33371 - in gnunet-gtk/src: peerinfo setup,
gnunet <=