svn commit: r992201 - /trafficserver/traffic/trunk/iocore/net/UnixConnection.cc

[am...@apache.org]

Author: amc
Date: Fri Sep  3 04:40:50 2010
New Revision: 992201

URL: http://svn.apache.org/viewvc?rev=992201&view=rev
Log:
Fix for use of SOL_IP even when TPROXY is disabled.

Modified:
    trafficserver/traffic/trunk/iocore/net/UnixConnection.cc

Modified: trafficserver/traffic/trunk/iocore/net/UnixConnection.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixConnection.cc?rev=992201&r1=992200&r2=992201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixConnection.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixConnection.cc Fri Sep  3 04:40:50 2010
@@ -281,6 +281,7 @@ Connection::open(NetVCOptions const& opt
 
   if (NetVCOptions::FOREIGN_ADDR == opt.addr_binding && local_addr) {
     static char const * const DEBUG_TEXT = "::open setsockopt() IP_TRANSPARENT";
+#if ATS_USE_TPROXY
     int value = 1;
     if (-1 == safe_setsockopt(fd, SOL_IP, ATS_IP_TRANSPARENT,
 			      reinterpret_cast<char*>(&value), sizeof(value)
@@ -290,6 +291,9 @@ Connection::open(NetVCOptions const& opt
     } else {
       NetDebug("socket", "%s set", DEBUG_TEXT);
     }
+#else
+    NetDebug("socket", "%s - requested but TPROXY not configured", DEBUG_TEXT);
+#endif
   }
 
   // Local address/port.