diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-05-15 11:19:44 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-05-15 11:19:44 -0400 |
| commit | 1ec45bb54621208906ce260255086a8456a9646e (patch) | |
| tree | 04dc6f2469bb462e5e30458987c1a5ddae7aecf6 | |
| parent | d3a39cf8d0dbc80a1936a0c5391506398828393e (diff) | |
| parent | 4473271c66d69941d19592480174ebf32ff4bf5c (diff) | |
| download | tor-1ec45bb54621208906ce260255086a8456a9646e.tar.gz tor-1ec45bb54621208906ce260255086a8456a9646e.zip | |
Merge branch 'bug18100_029'
| -rw-r--r-- | changes/bug18100 | 5 | ||||
| -rw-r--r-- | 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 0000000000..cd3ba2c977 --- /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 6713ffa86f..fd9c97bd3d 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1987,8 +1987,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); |