aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection_or.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-06-19 12:48:00 -0400
committerNick Mathewson <nickm@torproject.org>2009-06-19 12:48:00 -0400
commit659fc13da5f8cf7c3d7d3be238df709e8de06945 (patch)
tree9e2c7e81d628178bdb813d060a7f4497e66cf284 /src/or/connection_or.c
parent015189b5df17d3572d27e850336e9d1c9dc83c6d (diff)
downloadtor-659fc13da5f8cf7c3d7d3be238df709e8de06945.tar.gz
tor-659fc13da5f8cf7c3d7d3be238df709e8de06945.zip
Change proxy-address type to tor_addr_t to allow ipv6 proxies.
Diffstat (limited to 'src/or/connection_or.c')
-rw-r--r--src/or/connection_or.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index bbfa611c0d..8c8b5496a7 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -721,15 +721,15 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port,
/* use a proxy server if available */
if (options->HttpsProxy) {
using_proxy = 1;
- tor_addr_from_ipv4h(&addr, options->HttpsProxyAddr);
+ tor_addr_copy(&addr, &options->HttpsProxyAddr);
port = options->HttpsProxyPort;
} else if (options->Socks4Proxy) {
using_proxy = 1;
- tor_addr_from_ipv4h(&addr, options->Socks4ProxyAddr);
+ tor_addr_copy(&addr, &options->Socks4ProxyAddr);
port = options->Socks4ProxyPort;
} else if (options->Socks5Proxy) {
using_proxy = 1;
- tor_addr_from_ipv4h(&addr, options->Socks5ProxyAddr);
+ tor_addr_copy(&addr, &options->Socks5ProxyAddr);
port = options->Socks5ProxyPort;
}