Commit 9063f291 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Revert "Make TransProxyType ipfw work correctly" 

This reverts commit 68180281.

(I didn't mean to backport this, but somehow I had based my branch
for #15205 on it.)
parent eecd4109

changes/bug15064

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
  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.

src/or/connection_edge.c

+1 −2
Original line number Diff line number Diff line
@@ -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;