diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-03-12 12:49:08 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-03-12 12:49:08 -0400 |
| commit | 9063f29160615b379f907009e7158f1fcf1ed84c (patch) | |
| tree | 04826aae82dd99f7585249a6ef5640a1328f88b7 | |
| parent | eecd410984e3f1741dda877fe482e082a41db700 (diff) | |
| download | tor-9063f29160615b379f907009e7158f1fcf1ed84c.tar.gz tor-9063f29160615b379f907009e7158f1fcf1ed84c.zip | |
Revert "Make TransProxyType ipfw work correctly"
This reverts commit 681802817deb6fb93b95f8284856fd42f3556600.
(I didn't mean to backport this, but somehow I had based my branch
for #15205 on it.)
| -rw-r--r-- | changes/bug15064 | 4 | ||||
| -rw-r--r-- | src/or/connection_edge.c | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/changes/bug15064 b/changes/bug15064 deleted file mode 100644 index e6bd747b1f..0000000000 --- a/changes/bug15064 +++ /dev/null @@ -1,4 +0,0 @@ - o Major bugfixes (FreeBSD IPFW transparent proxy): - - Fix address detection with FreeBSD transparent proxies, - when "TransProxyType ipfw" is in use. - Fixes bug 15064; bugfix on 0.2.5.4-alpha. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 1eeb22fcef..49f9ba4978 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1531,8 +1531,7 @@ 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 || - options->TransProxyType_parsed == TPT_IPFW) + if (options->TransProxyType_parsed == TPT_DEFAULT) return destination_from_pf(conn, req); (void)conn; |