[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33053 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r33053 - gnunet/src/transport |
Date: |
Mon, 14 Apr 2014 10:52:41 +0200 |
Author: wachs
Date: 2014-04-14 10:52:41 +0200 (Mon, 14 Apr 2014)
New Revision: 33053
Modified:
gnunet/src/transport/plugin_transport_http_client.c
gnunet/src/transport/transport.conf.in
Log:
adding extended proxy support for http(s) client
Modified: gnunet/src/transport/plugin_transport_http_client.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_client.c 2014-04-14 07:31:48 UTC
(rev 33052)
+++ gnunet/src/transport/plugin_transport_http_client.c 2014-04-14 08:52:41 UTC
(rev 33053)
@@ -275,6 +275,39 @@
char *protocol;
/**
+ * Proxy configuration: hostname or ip of the proxy server
+ */
+ char *proxy_hostname;
+
+ /**
+ * Username for the proxy server
+ */
+ char *proxy_username;
+
+ /**
+ * Password for the proxy server
+ */
+ char *proxy_password;
+
+ /**
+ * Type of proxy server:
+ *
+ * Valid values as supported by curl:
+ * CURLPROXY_HTTP, CURLPROXY_HTTP_1_0 CURLPROXY_SOCKS4, CURLPROXY_SOCKS5,
+ * CURLPROXY_SOCKS4A, CURLPROXY_SOCKS5_HOSTNAME
+ */
+ curl_proxytype proxytype;
+
+ /**
+ * Use proxy tunneling:
+ * Tunnel all operations through a given HTTP instead of have the proxy
+ * evaluate the HTTP request
+ *
+ * Default: GNUNET_NO, GNUNET_yes experimental
+ */
+ int proxy_use_httpproxytunnel;
+
+ /**
* My options to be included in the address
*/
uint32_t options;
@@ -1269,6 +1302,21 @@
curl_easy_setopt (s->client_get, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP);
#endif
+ if (s->plugin->proxy_hostname != NULL)
+ {
+ curl_easy_setopt (s->client_get, CURLOPT_PROXY, s->plugin->proxy_hostname);
+ curl_easy_setopt (s->client_get, CURLOPT_PROXYTYPE, s->plugin->proxytype);
+ if (NULL != s->plugin->proxy_username)
+ curl_easy_setopt (s->client_get, CURLOPT_PROXYUSERNAME,
+ s->plugin->proxy_username);
+ if (NULL != s->plugin->proxy_password)
+ curl_easy_setopt (s->client_get, CURLOPT_PROXYPASSWORD,
+ s->plugin->proxy_password);
+ if (GNUNET_YES == s->plugin->proxy_use_httpproxytunnel)
+ curl_easy_setopt (s->client_get, CURLOPT_HTTPPROXYTUNNEL,
+ s->plugin->proxy_use_httpproxytunnel);
+ }
+
curl_easy_setopt (s->client_get, CURLOPT_URL, s->url);
//curl_easy_setopt (s->client_get, CURLOPT_HEADERFUNCTION,
&curl_get_header_cb);
//curl_easy_setopt (s->client_get, CURLOPT_WRITEHEADER, ps);
@@ -1353,6 +1401,21 @@
curl_easy_setopt (s->client_get, CURLOPT_PROTOCOLS, CURLPROTO_HTTP);
curl_easy_setopt (s->client_get, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP);
#endif
+ if (s->plugin->proxy_hostname != NULL)
+ {
+ curl_easy_setopt (s->client_put, CURLOPT_PROXY, s->plugin->proxy_hostname);
+ curl_easy_setopt (s->client_put, CURLOPT_PROXYTYPE, s->plugin->proxytype);
+ if (NULL != s->plugin->proxy_username)
+ curl_easy_setopt (s->client_put, CURLOPT_PROXYUSERNAME,
+ s->plugin->proxy_username);
+ if (NULL != s->plugin->proxy_password)
+ curl_easy_setopt (s->client_put, CURLOPT_PROXYPASSWORD,
+ s->plugin->proxy_password);
+ if (GNUNET_YES == s->plugin->proxy_use_httpproxytunnel)
+ curl_easy_setopt (s->client_put, CURLOPT_HTTPPROXYTUNNEL,
+ s->plugin->proxy_use_httpproxytunnel);
+ }
+
curl_easy_setopt (s->client_put, CURLOPT_URL, s->url);
curl_easy_setopt (s->client_put, CURLOPT_UPLOAD, 1L);
//curl_easy_setopt (s->client_put, CURLOPT_HEADERFUNCTION,
&client_curl_header);
@@ -1722,6 +1785,10 @@
_("Shutdown for plugin `%s' complete\n"),
plugin->name);
+ GNUNET_free_non_null (plugin->proxy_hostname);
+ GNUNET_free_non_null (plugin->proxy_username);
+ GNUNET_free_non_null (plugin->proxy_password);
+
GNUNET_free (plugin);
GNUNET_free (api);
return NULL;
@@ -1738,7 +1805,9 @@
client_configure_plugin (struct HTTP_Client_Plugin *plugin)
{
unsigned long long max_connections;
+ char *proxy_type;
+
/* Optional parameters */
if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (plugin->env->cfg,
plugin->name,
@@ -1746,9 +1815,81 @@
max_connections = 128;
plugin->max_connections = max_connections;
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
_("Maximum number of connections is %u\n"),
plugin->max_connections);
+
+ /* Read proxy configuration */
+ if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (plugin->env->cfg,
+ plugin->name, "PROXY", &plugin->proxy_hostname))
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
+ "Found proxy host: `%s'\n",
+ plugin->proxy_hostname);
+ /* proxy username */
+ if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (plugin->env->cfg,
+ plugin->name, "PROXY_USERNAME", &plugin->proxy_username))
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
+ "Found proxy username name: `%s'\n",
+ plugin->proxy_username);
+ }
+
+ /* proxy password */
+ if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (plugin->env->cfg,
+ plugin->name, "PROXY_PASSWORD", &plugin->proxy_password))
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
+ "Found proxy password name: `%s'\n",
+ plugin->proxy_password);
+ }
+
+ /* proxy type */
+ if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (plugin->env->cfg,
+ plugin->name, "PROXY_TYPE", &proxy_type))
+ {
+ GNUNET_STRINGS_utf8_toupper (proxy_type, proxy_type);
+
+ if (0 == strcmp(proxy_type, "HTTP"))
+ plugin->proxytype = CURLPROXY_HTTP;
+ else if (0 == strcmp(proxy_type, "SOCKS4"))
+ plugin->proxytype = CURLPROXY_SOCKS4;
+ else if (0 == strcmp(proxy_type, "SOCKS5"))
+ plugin->proxytype = CURLPROXY_SOCKS5;
+ else if (0 == strcmp(proxy_type, "SOCKS4A"))
+ plugin->proxytype = CURLPROXY_SOCKS4A;
+ else if (0 == strcmp(proxy_type, "SOCKS5_HOSTNAME "))
+ plugin->proxytype = CURLPROXY_SOCKS5_HOSTNAME ;
+ else
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
+ _("Invalid proxy type: `%s', disabling proxy! Check
configuration!\n"),
+ proxy_type);
+
+ GNUNET_free (proxy_type);
+ GNUNET_free (plugin->proxy_hostname);
+ plugin->proxy_hostname = NULL;
+ GNUNET_free_non_null (plugin->proxy_username);
+ plugin->proxy_username = NULL;
+ GNUNET_free_non_null (plugin->proxy_password);
+ plugin->proxy_password = NULL;
+
+ return GNUNET_SYSERR;
+ }
+
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
+ "Found proxy type: `%s'\n", proxy_type);
+ }
+
+ /* proxy http tunneling */
+ if (GNUNET_SYSERR == (plugin->proxy_use_httpproxytunnel ==
GNUNET_CONFIGURATION_get_value_yesno (plugin->env->cfg,
+ plugin->name, "PROXY_HTTP_TUNNELING")))
+ plugin->proxy_use_httpproxytunnel = GNUNET_NO;
+
+ GNUNET_free_non_null (proxy_type);
+ }
+
+
return GNUNET_OK;
}
Modified: gnunet/src/transport/transport.conf.in
===================================================================
--- gnunet/src/transport/transport.conf.in 2014-04-14 07:31:48 UTC (rev
33052)
+++ gnunet/src/transport/transport.conf.in 2014-04-14 08:52:41 UTC (rev
33053)
@@ -64,7 +64,23 @@
[transport-http_client]
MAX_CONNECTIONS = 128
TESTING_IGNORE_KEYS = ACCEPT_FROM;
+# Hostname or IP of proxy server
+# PROXY =
+# User name for proxy server
+# PROXY_USERNAME =
+# User password for proxy server
+# PROXY_PASSWORD =
+
+# Type of proxy server,
+# Valid values: HTTP, SOCKS4, SOCKS5, SOCKS4A, SOCKS5_HOSTNAME
+# Default: HTTP
+# PROXY_TYPE = HTTP
+
+# Enable tunneling proxy request instead of having proxy server evaluate it
+# Experimental, default: NO
+# PROXY_HTTP_TUNNELING = NO
+
[transport-http_server]
#EXTERNAL_HOSTNAME = <your hostname/path>
PORT = 1080
@@ -75,7 +91,25 @@
[transport-https_client]
MAX_CONNECTIONS = 128
TESTING_IGNORE_KEYS = ACCEPT_FROM;
+# Hostname or IP of proxy server
+# PROXY =
+# User name for proxy server
+# PROXY_USERNAME =
+# User password for proxy server
+# PROXY_PASSWORD =
+
+# Type of proxy server,
+# Valid values: HTTP, SOCKS4, SOCKS5, SOCKS4A, SOCKS5_HOSTNAME
+# Default: HTTP
+# PROXY_TYPE = HTTP
+
+# Enable tunneling proxy request instead of having proxy server evaluate it
+# Experimental, default: NO
+# PROXY_HTTP_TUNNELING = NO
+
+
+
[transport-https_server]
# EXTERNAL_HOSTNAME = <your hostname/path>
# EXTERNAL_HOSTNAME_ONLY = YES
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33053 - gnunet/src/transport,
gnunet <=