瀏覽代碼

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.)
Nick Mathewson 9 年之前
父節點
當前提交
9063f29160
共有 2 個文件被更改,包括 1 次插入6 次删除
  1. 0 4
      changes/bug15064
  2. 1 2
      src/or/connection_edge.c

+ 0 - 4
changes/bug15064

@@ -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.

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