summaryrefslogtreecommitdiff
path: root/openvpn/src
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2013-09-19 18:27:43 +0200
committerArne Schwabe <arne@rfc2549.org>2013-09-19 18:27:43 +0200
commit5f6f3bd69d858db070938bc838f844fe73f5ab3e (patch)
tree5b57f48d4f1fbe917d057bf6ee0061d157b4bdfd /openvpn/src
parent2fdfb2b7f3d28667de2a20f68eb3ec46aebfec12 (diff)
Fix SOCKS5 support
Diffstat (limited to 'openvpn/src')
-rw-r--r--openvpn/src/openvpn/socket.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/openvpn/src/openvpn/socket.c b/openvpn/src/openvpn/socket.c
index f6af489e..0898babe 100644
--- a/openvpn/src/openvpn/socket.c
+++ b/openvpn/src/openvpn/socket.c
@@ -1434,7 +1434,6 @@ link_socket_init_phase1 (struct link_socket *sock,
/* or in Socks proxy mode? */
else if (sock->socks_proxy)
{
- ASSERT (sock->info.af == AF_INET);
ASSERT (!sock->inetd);
/* the proxy server */
@@ -1699,7 +1698,11 @@ phase2_socks_client (struct link_socket *sock, struct signal_info *sig_info)
addr_zero_host(&sock->info.lsa->actual.dest);
if (sock->info.lsa->remote_list)
+ {
freeaddrinfo(sock->info.lsa->remote_list);
+ sock->info.lsa->current_remote = NULL;
+ sock->info.lsa->remote_list = NULL;
+ }
resolve_remote (sock, 1, NULL, &sig_info->signal_received);