diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-12-17 11:11:33 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-12-17 11:11:33 +0100 |
| commit | 6357409007903150c559458e8a33dc19b7a086bd (patch) | |
| tree | 81498197d59fd3da0dbbf9292e7e4fe848b0f0e1 /openvpn/src | |
| parent | 5f5d17bdc6f73fe66fb883b71c7595a67cb88d58 (diff) | |
Fix proxy support
Diffstat (limited to 'openvpn/src')
| -rw-r--r-- | openvpn/src/openvpn/init.c | 2 | ||||
| -rw-r--r-- | openvpn/src/openvpn/socket.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/openvpn/src/openvpn/init.c b/openvpn/src/openvpn/init.c index fe70dd57..6a1ed02d 100644 --- a/openvpn/src/openvpn/init.c +++ b/openvpn/src/openvpn/init.c @@ -137,7 +137,7 @@ management_callback_proxy_cmd (void *arg, const char **p) } ho = init_http_proxy_options_once (&ce->http_proxy_options, gc); ho->server = string_alloc (p[2], gc); - ho->port = p[3]; + ho->port = string_alloc (p[3], gc); ho->retry = true; ho->auth_retry = (p[4] && streq (p[4], "nct") ? PAR_NCT : PAR_ALL); ret = true; diff --git a/openvpn/src/openvpn/socket.c b/openvpn/src/openvpn/socket.c index 2f929ef6..04a21357 100644 --- a/openvpn/src/openvpn/socket.c +++ b/openvpn/src/openvpn/socket.c @@ -1386,7 +1386,7 @@ link_socket_init_phase1 (struct link_socket *sock, /* are we running in HTTP proxy mode? */ else if (sock->http_proxy) { - ASSERT (sock->info.proto == PROTO_TCP_CLIENT && sock->info.af == AF_INET); + ASSERT (sock->info.proto == PROTO_TCP_CLIENT); ASSERT (!sock->inetd); /* the proxy server */ |