]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Transparent flag must be done before bind(). BASIC_TPROXY4
authorAmos Jeffries <squid3@treenet.co.nz>
Mon, 7 Apr 2008 22:05:09 +0000 (10:05 +1200)
committerAmos Jeffries <squid3@treenet.co.nz>
Mon, 7 Apr 2008 22:05:09 +0000 (10:05 +1200)
Also fix a small cut-n-paste error with #endif.

1  2 
src/comm.cc
src/forward.cc

diff --cc src/comm.cc
index 384f574523cbb6b093854b76b25a9c03ae98a0d5,513c71a2ceb670f7ab6eb3ebd461cbc340e97510..526a4de25f6d59085d235927acb9bd10b0b18ddf
@@@ -754,6 -734,6 +754,13 @@@ comm_openex(int sock_type
              commSetReuseAddr(new_socket);
      }
  
++#if LINUX_TPROXY4
++    /* MUST be done before binding or face OS Error: "(99) Cannot assign requested address"... */
++    if((flags & COMM_TRANSPARENT)) {
++        comm_set_transparent(new_socket);
++    }
++#endif
++
      if (!addr.IsNoAddr())
      {
          if (commBind(new_socket, *AI) != COMM_OK) {
diff --cc src/forward.cc
Simple merge