aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-02-03 13:56:19 -0500
committerNick Mathewson <nickm@torproject.org>2014-02-03 13:56:19 -0500
commit5991f9a15646d53b838562fd1424b6a8fd9ef614 (patch)
tree800e54ebf294ffa564f05e09b75d605ee13a55e3 /src/or/connection.c
parent00ec6e6af0775cd693e12e56eb6df3cbefe57daa (diff)
downloadtor-5991f9a15646d53b838562fd1424b6a8fd9ef614.tar
tor-5991f9a15646d53b838562fd1424b6a8fd9ef614.tar.gz
TransProxyType replaces TransTPROXY option
I'm making this change now since ipfw will want its own option too, and proliferating options here isn't sensible. (See #10582 and #10267)
Diffstat (limited to 'src/or/connection.c')
-rw-r--r--src/or/connection.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index 6dbba668c..942bfc598 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1036,7 +1036,8 @@ connection_listener_new(const struct sockaddr *listensockaddr,
make_socket_reuseable(s);
#if defined USE_TRANSPARENT && defined(IP_TRANSPARENT)
- if (options->TransTPROXY && type == CONN_TYPE_AP_TRANS_LISTENER) {
+ if (options->TransProxyType_parsed == TPT_TPROXY &&
+ type == CONN_TYPE_AP_TRANS_LISTENER) {
int one = 1;
if (setsockopt(s, SOL_IP, IP_TRANSPARENT, &one, sizeof(one)) < 0) {
const char *extra = "";