From: Amos Jeffries Date: Thu, 24 Jul 2008 11:54:57 +0000 (+1200) Subject: Improve display on fd debug output X-Git-Tag: SQUID_3_1_0_1~49^2~129 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86905e1f411161fe2dabb9f9b09d4dff991464a8;p=thirdparty%2Fsquid.git Improve display on fd debug output --- diff --git a/include/IPAddress.h b/include/IPAddress.h index 0b7b790724..def0919381 100644 --- a/include/IPAddress.h +++ b/include/IPAddress.h @@ -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 diff --git a/src/fd.cc b/src/fd.cc index bc5e1226fa..9e190f42e2 100644 --- a/src/fd.cc +++ b/src/fd.cc @@ -269,7 +269,7 @@ fdDumpOpen(void) 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); } }