[tor-commits] [tor/maint-0.2.5] Make TransProxyType ipfw work correctly

[nickm at torproject.org]

commit 681802817deb6fb93b95f8284856fd42f3556600
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 4 12:24:51 2015 +0100

    Make TransProxyType ipfw work correctly
    
    Fixes bug 15064; bugfix on 0.2.5.4-alpha.
---
 changes/bug15064         |    4 ++++
 src/or/connection_edge.c |    3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug15064 b/changes/bug15064
new file mode 100644
index 0000000..e6bd747
--- /dev/null
+++ b/changes/bug15064
@@ -0,0 +1,4 @@
+  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 49f9ba4..1eeb22f 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;