diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-07-07 14:12:20 +0200 |
|---|---|---|
| committer | Gert Doering <gert@greenie.muc.de> | 2014-07-18 20:00:17 +0200 |
| commit | a4b8f653ee5be9c2292cf92dac09d7aadcc9a487 (patch) | |
| tree | 1380401c2df704e1c3c104e5da0ecec709e729cd /src/openvpn/socket.h | |
| parent | c277757fcf7fb4c2713db154439f937d48cfae61 (diff) | |
| download | openvpn-a4b8f653ee5be9c2292cf92dac09d7aadcc9a487.tar.gz openvpn-a4b8f653ee5be9c2292cf92dac09d7aadcc9a487.tar.xz openvpn-a4b8f653ee5be9c2292cf92dac09d7aadcc9a487.zip | |
Always enable http-proxy and socks-proxy
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1404735142-31420-2-git-send-email-arne@rfc2549.org>
URL: http://article.gmane.org/gmane.network.openvpn.devel/8840
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src/openvpn/socket.h')
| -rw-r--r-- | src/openvpn/socket.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/openvpn/socket.h b/src/openvpn/socket.h index bffa039..8e157c6 100644 --- a/src/openvpn/socket.h +++ b/src/openvpn/socket.h @@ -172,10 +172,7 @@ struct link_socket struct link_socket_info info; socket_descriptor_t sd; - -#ifdef ENABLE_SOCKS socket_descriptor_t ctrl_sd; /* only used for UDP over Socks */ -#endif #ifdef WIN32 struct overlapped_io reads; @@ -228,22 +225,16 @@ struct link_socket struct buffer stream_buf_data; bool stream_reset; -#ifdef ENABLE_HTTP_PROXY /* HTTP proxy */ struct http_proxy_info *http_proxy; -#endif -#ifdef ENABLE_SOCKS /* Socks proxy */ struct socks_proxy_info *socks_proxy; struct link_socket_actual socks_relay; /* Socks UDP relay address */ -#endif -#if defined(ENABLE_HTTP_PROXY) || defined(ENABLE_SOCKS) /* The OpenVPN server we will use the proxy to connect to */ const char *proxy_dest_host; const char *proxy_dest_port; -#endif #if PASSTOS_CAPABILITY /* used to get/set TOS. */ @@ -321,12 +312,8 @@ link_socket_init_phase1 (struct link_socket *sock, bool bind_ipv6_only, int mode, const struct link_socket *accept_from, -#ifdef ENABLE_HTTP_PROXY struct http_proxy_info *http_proxy, -#endif -#ifdef ENABLE_SOCKS struct socks_proxy_info *socks_proxy, -#endif #ifdef ENABLE_DEBUG int gremlin, #endif |