[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squid-cvs
Subject:    /bzr/squid3/trunk/ r9104: Improve display on fd debug output
From:       Amos Jeffries <squid3 () treenet ! co ! nz>
Date:       2008-07-24 11:54:57
Message-ID: 20080724120024.19896.qmail () squid-cache ! org
[Download RAW message or body]

--===============1097384748==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

------------------------------------------------------------
revno: 9104
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Thu 2008-07-24 23:54:57 +1200
message:
  Improve display on fd debug output
modified:
  include/IPAddress.h
  src/fd.cc

--===============1097384748==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"; name="r9104.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

=== modified file 'include/IPAddress.h'
--- a/include/IPAddress.h	2008-07-22 09:57:19 +0000
+++ b/include/IPAddress.h	2008-07-24 11:54:57 +0000
@@ -77,6 +77,11 @@
 #define s6_addr32 __u6_addr.__u6_addr32
 #endif
 
+// OpenBSD also hide v6only socket option we need for comm layer. :-(
+#if !defined(IPV6_V6ONLY) && defined(_SQUID_OPENBSD_)
+#define IPV6_V6ONLY		27 // from OpenBSD 4.3 headers. (NP: does not match other OS values for same)
+#endif
+
 /// Length of buffer that needs to be allocated to old a null-terminated IP-string
 // Yuck. But there are still structures that need it to be an 'integer constant'.
 #define MAX_IPSTRLEN  75

=== modified file 'src/fd.cc'
--- a/src/fd.cc	2008-03-02 20:32:24 +0000
+++ b/src/fd.cc	2008-07-24 11:54:57 +0000
@@ -269,7 +269,7 @@
         debugs(51, 1, "Open FD "<< std::left<< std::setw(10) << 
                (F->bytes_read && F->bytes_written ? "READ/WRITE" :
                 F->bytes_read ? "READING" : F->bytes_written ? "WRITING" : 
-                null_string)  <<
+                "UNSTARTED")  <<
                " "<< std::right << std::setw(4) << i  << " " << F->desc);
     }
 }


--===============1097384748==--
[prev in list] [next in list] [prev in thread] [next in thread]