diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2014-04-15 08:57:15 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2014-04-15 08:57:15 +0000 |
commit | 5d741a7249070bece8b132be2579adf8e1b9be15 (patch) | |
tree | 14ea93d8e2c8626c8f4b3a5bcfe76b0f309064ad /src/hostlist | |
parent | aee75330d485073f7c431b3a832df780fd2ab7a5 (diff) | |
download | gnunet-5d741a7249070bece8b132be2579adf8e1b9be15.tar.gz gnunet-5d741a7249070bece8b132be2579adf8e1b9be15.zip |
using proxy settings
Diffstat (limited to 'src/hostlist')
-rw-r--r-- | src/hostlist/hostlist-client.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/hostlist/hostlist-client.c b/src/hostlist/hostlist-client.c index d556c846f..d4096abc0 100644 --- a/src/hostlist/hostlist-client.c +++ b/src/hostlist/hostlist-client.c | |||
@@ -926,7 +926,14 @@ download_hostlist () | |||
926 | gettext_noop ("# hostlist downloads initiated"), 1, | 926 | gettext_noop ("# hostlist downloads initiated"), 1, |
927 | GNUNET_NO); | 927 | GNUNET_NO); |
928 | if (proxy != NULL) | 928 | if (proxy != NULL) |
929 | { | ||
929 | CURL_EASY_SETOPT (curl, CURLOPT_PROXY, proxy); | 930 | CURL_EASY_SETOPT (curl, CURLOPT_PROXY, proxy); |
931 | CURL_EASY_SETOPT (curl, CURLOPT_PROXYTYPE, proxy_type); | ||
932 | if (NULL != proxy_username) | ||
933 | CURL_EASY_SETOPT (curl, CURLOPT_PROXYUSERNAME, proxy_username); | ||
934 | if (NULL != proxy_password) | ||
935 | CURL_EASY_SETOPT (curl, CURLOPT_PROXYPASSWORD, proxy_password); | ||
936 | } | ||
930 | download_pos = 0; | 937 | download_pos = 0; |
931 | stat_bogus_url = 0; | 938 | stat_bogus_url = 0; |
932 | CURL_EASY_SETOPT (curl, CURLOPT_WRITEFUNCTION, &callback_download); | 939 | CURL_EASY_SETOPT (curl, CURLOPT_WRITEFUNCTION, &callback_download); |
@@ -1499,6 +1506,7 @@ GNUNET_HOSTLIST_client_start (const struct GNUNET_CONFIGURATION_Handle *c, | |||
1499 | { | 1506 | { |
1500 | GNUNET_STRINGS_utf8_toupper (proxytype_str, proxytype_str); | 1507 | GNUNET_STRINGS_utf8_toupper (proxytype_str, proxytype_str); |
1501 | 1508 | ||
1509 | proxy_type = CURLPROXY_HTTP; | ||
1502 | if (0 == strcmp(proxytype_str, "HTTP")) | 1510 | if (0 == strcmp(proxytype_str, "HTTP")) |
1503 | proxy_type = CURLPROXY_HTTP; | 1511 | proxy_type = CURLPROXY_HTTP; |
1504 | else if (0 == strcmp(proxytype_str, "HTTP_1_0")) | 1512 | else if (0 == strcmp(proxytype_str, "HTTP_1_0")) |
@@ -1509,7 +1517,7 @@ GNUNET_HOSTLIST_client_start (const struct GNUNET_CONFIGURATION_Handle *c, | |||
1509 | proxy_type = CURLPROXY_SOCKS5; | 1517 | proxy_type = CURLPROXY_SOCKS5; |
1510 | else if (0 == strcmp(proxytype_str, "SOCKS4A")) | 1518 | else if (0 == strcmp(proxytype_str, "SOCKS4A")) |
1511 | proxy_type = CURLPROXY_SOCKS4A; | 1519 | proxy_type = CURLPROXY_SOCKS4A; |
1512 | else if (0 == strcmp(proxytype_str, "SOCKS5_HOSTNAME ")) | 1520 | else if (0 == strcmp(proxytype_str, "SOCKS5_HOSTNAME")) |
1513 | proxy_type = CURLPROXY_SOCKS5_HOSTNAME ; | 1521 | proxy_type = CURLPROXY_SOCKS5_HOSTNAME ; |
1514 | else | 1522 | else |
1515 | { | 1523 | { |
@@ -1527,9 +1535,6 @@ GNUNET_HOSTLIST_client_start (const struct GNUNET_CONFIGURATION_Handle *c, | |||
1527 | 1535 | ||
1528 | return GNUNET_SYSERR; | 1536 | return GNUNET_SYSERR; |
1529 | } | 1537 | } |
1530 | |||
1531 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
1532 | "Found proxy type: `%s'\n", proxy_type); | ||
1533 | } | 1538 | } |
1534 | GNUNET_free_non_null (proxytype_str); | 1539 | GNUNET_free_non_null (proxytype_str); |
1535 | } | 1540 | } |