diff options
author | arne@gaia.fritz.box <arne@gaia.fritz.box> | 2012-12-25 23:22:13 +0100 |
---|---|---|
committer | arne@gaia.fritz.box <arne@gaia.fritz.box> | 2012-12-25 23:22:13 +0100 |
commit | 3018f292ff635d7ec61b3cd02a1e13659819683f (patch) | |
tree | 32de630e310e6055124ee92a0d5788a76f6cd94d /openvpn/src/openvpn/proxy.c | |
parent | 83dfeaa842bd42840698bdce9a91207a75395b3e (diff) | |
parent | 80d073d5fd79e0c57e33e708e6917e9f36c9bebc (diff) |
Merge local changes with repository
Diffstat (limited to 'openvpn/src/openvpn/proxy.c')
-rw-r--r-- | openvpn/src/openvpn/proxy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/openvpn/src/openvpn/proxy.c b/openvpn/src/openvpn/proxy.c index 363d8a73..17748504 100644 --- a/openvpn/src/openvpn/proxy.c +++ b/openvpn/src/openvpn/proxy.c @@ -444,7 +444,7 @@ http_proxy_new (const struct http_proxy_options *o) if (!o || !o->server) msg (M_FATAL, "HTTP_PROXY: server not specified"); - ASSERT (legal_ipv4_port (o->port)); + ASSERT ( o->port); ALLOC_OBJ_CLEAR (p, struct http_proxy_info); p->options = *o; @@ -493,7 +493,7 @@ bool establish_http_proxy_passthru (struct http_proxy_info *p, socket_descriptor_t sd, /* already open to proxy */ const char *host, /* openvpn server remote */ - const int port, /* openvpn server port */ + const char *port, /* openvpn server port */ struct buffer *lookahead, volatile int *signal_received) { @@ -521,7 +521,7 @@ establish_http_proxy_passthru (struct http_proxy_info *p, else { /* format HTTP CONNECT message */ - openvpn_snprintf (buf, sizeof(buf), "CONNECT %s:%d HTTP/%s", + openvpn_snprintf (buf, sizeof(buf), "CONNECT %s:%s HTTP/%s", host, port, p->options.http_version); @@ -642,7 +642,7 @@ establish_http_proxy_passthru (struct http_proxy_info *p, /* now send the phase 3 reply */ /* format HTTP CONNECT message */ - openvpn_snprintf (buf, sizeof(buf), "CONNECT %s:%d HTTP/%s", + openvpn_snprintf (buf, sizeof(buf), "CONNECT %s:%s HTTP/%s", host, port, p->options.http_version); @@ -730,7 +730,7 @@ establish_http_proxy_passthru (struct http_proxy_info *p, /* build the digest response */ - openvpn_snprintf (uri, sizeof(uri), "%s:%d", + openvpn_snprintf (uri, sizeof(uri), "%s:%s", host, port); |