commit 4473271c66d69941d19592480174ebf32ff4bf5c Author: Nick Mathewson nickm@torproject.org Date: Mon May 15 11:16:50 2017 -0400

Fix the TRPOXY typo in connection_edge.c

Also add a get_options() call so it compiles.

Fixes bug 18100; bugfix on 0.2.6.3-alpha. Patch from "d4fq0fQAgoJ". --- changes/bug18100 | 5 +++++ src/or/connection_edge.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/changes/bug18100 b/changes/bug18100 new file mode 100644 index 000000000..cd3ba2c97 --- /dev/null +++ b/changes/bug18100 @@ -0,0 +1,5 @@ + o Major bugfixes (linux TPROXY support): + - Fix a typo that had prevented TPROXY-based transparent proxying from + working under Linux. Fixes bug 18100; bugfix on 0.2.6.3-alpha. + Patch from "d4fq0fQAgoJ". + diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 3550d0e21..0fad69737 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1910,8 +1910,8 @@ destination_from_socket(entry_connection_t *conn, socks_request_t *req) socklen_t orig_dst_len = sizeof(orig_dst); tor_addr_t addr;

-#ifdef TRANS_TRPOXY - if (options->TransProxyType_parsed == TPT_TPROXY) { +#ifdef TRANS_TPROXY + if (get_options()->TransProxyType_parsed == TPT_TPROXY) { if (getsockname(ENTRY_TO_CONN(conn)->s, (struct sockaddr*)&orig_dst, &orig_dst_len) < 0) { int e = tor_socket_errno(ENTRY_TO_CONN(conn)->s);