Browse Source

Make TransProxyType ipfw work correctly

Fixes bug 15064; bugfix on 0.2.5.4-alpha.
Nick Mathewson 9 years ago
parent
commit
681802817d
2 changed files with 6 additions and 1 deletions
  1. 4 0
      changes/bug15064
  2. 2 1
      src/or/connection_edge.c

+ 4 - 0
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.

+ 2 - 1
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;