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/forward.c | |
| 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/forward.c')
| -rw-r--r-- | src/openvpn/forward.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c index 8d524ce..39f66e3 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -611,8 +611,6 @@ check_timeout_random_component (struct context *c) tv_add (&c->c2.timeval, &c->c2.timeout_random_component); } -#ifdef ENABLE_SOCKS - /* * Handle addition and removal of the 10-byte Socks5 header * in UDP packets. @@ -650,7 +648,6 @@ link_socket_write_post_size_adjust (int *size, *size = 0; } } -#endif /* * Output: c->c2.buf @@ -719,10 +716,8 @@ read_incoming_link (struct context *c) /* check recvfrom status */ check_status (status, "read", c->c2.link_socket, NULL); -#ifdef ENABLE_SOCKS /* Remove socks header if applicable */ socks_postprocess_incoming_link (c); -#endif perf_pop (); } @@ -1131,23 +1126,18 @@ process_outgoing_link (struct context *c) /* Packet send complexified by possible Socks5 usage */ { struct link_socket_actual *to_addr = c->c2.to_link_addr; -#ifdef ENABLE_SOCKS int size_delta = 0; -#endif -#ifdef ENABLE_SOCKS /* If Socks5 over UDP, prepend header */ socks_preprocess_outgoing_link (c, &to_addr, &size_delta); -#endif + /* Send packet */ size = link_socket_write (c->c2.link_socket, &c->c2.to_link, to_addr); -#ifdef ENABLE_SOCKS /* Undo effect of prepend */ link_socket_write_post_size_adjust (&size, size_delta, &c->c2.to_link); -#endif } if (size > 0) |