summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-03-04 12:24:51 +0100
committerNick Mathewson <nickm@torproject.org>2015-03-04 12:25:52 +0100
commit681802817deb6fb93b95f8284856fd42f3556600 (patch)
tree110761e710a1f355b788405e5eba8e53476288eb /src
parent51e36026e5b04384bf3311354ef0cd5a5cbf2d59 (diff)
downloadtor-681802817deb6fb93b95f8284856fd42f3556600.tar.gz
tor-681802817deb6fb93b95f8284856fd42f3556600.zip
Make TransProxyType ipfw work correctly
Fixes bug 15064; bugfix on 0.2.5.4-alpha.
Diffstat (limited to 'src')
-rw-r--r--src/or/connection_edge.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 49f9ba4978..1eeb22fcef 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1531,7 +1531,8 @@ connection_ap_get_original_destination(entry_connection_t *conn,
if (options->TransProxyType_parsed == TPT_PF_DIVERT)
return destination_from_socket(conn, req);
- if (options->TransProxyType_parsed == TPT_DEFAULT)
+ if (options->TransProxyType_parsed == TPT_DEFAULT ||
+ options->TransProxyType_parsed == TPT_IPFW)
return destination_from_pf(conn, req);
(void)conn;