SourceFormat Enforcement

[thirdparty/squid.git] / src / fde.cc

diff --git a/src/fde.cc b/src/fde.cc
index ad1cbec04ef6ee7fe4f1e8fa710d5e35cf829ede..497adf44f07c96f6016852faddf175b43161a325 100644 (file)
--- a/src/fde.cc
+++ b/src/fde.cc
@@ -1,49 +1,27 @@
-
 /*
- * $Id: fde.cc,v 1.4 2006/05/08 23:38:33 robertc Exp $
- *
- * DEBUG: section ??   FDE
- * AUTHOR: Robert Collins
- *
- * SQUID Web Proxy Cache          http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- *  Squid is the result of efforts by numerous individuals from
- *  the Internet community; see the CONTRIBUTORS file for full
- *  details.   Many organizations have provided support for Squid's
- *  development; see the SPONSORS file for full details.  Squid is
- *  Copyrighted (C) 2001 by the Regents of the University of
- *  California; see the COPYRIGHT file for full details.  Squid
- *  incorporates software developed and/or copyrighted by other
- *  sources; see the CREDITS file for full details.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
  *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
+/* DEBUG: none          FDE */
+
 #include "squid.h"
+#include "comm/Read.h"
 #include "fde.h"
+#include "globals.h"
 #include "SquidTime.h"
 #include "Store.h"
-#include "comm.h"
+
+fde *fde::Table = NULL;
 
 bool
 fde::readPending(int fdNumber)
 {
     if (type == FD_SOCKET)
-        return comm_has_pending_read(fdNumber);
+        return Comm::MonitorsRead(fdNumber);
 
     return read_handler ? true : false ;
 }
@@ -54,10 +32,17 @@ fde::dumpStats (StoreEntry &dumpEntry, int fdNumber)
     if (!flags.open)
         return;
 
-    storeAppendPrintf(&dumpEntry, "%4d %-6.6s %4d %7d%c %7d%c %-21s %s\n",
+#if _SQUID_WINDOWS_
+
+    storeAppendPrintf(&dumpEntry, "%4d 0x%-8lX %-6.6s %4d %7" PRId64 "%c %7" PRId64 "%c %-21s %s\n",
+                      fdNumber,
+                      win32.handle,
+#else
+    storeAppendPrintf(&dumpEntry, "%4d %-6.6s %4d %7" PRId64 "%c %7" PRId64 "%c %-21s %s\n",
                       fdNumber,
+#endif
                       fdTypeStr[type],
-                      timeout_handler ? (int) (timeout - squid_curtime) / 60 : 0,
+                      timeoutHandler != NULL ? (int) (timeout - squid_curtime) : 0,
                       bytes_read,
                       readPending(fdNumber) ? '*' : ' ',
                       bytes_written,
@@ -71,17 +56,28 @@ fde::DumpStats (StoreEntry *dumpEntry)
 {
     int i;
     storeAppendPrintf(dumpEntry, "Active file descriptors:\n");
+#if _SQUID_WINDOWS_
+
+    storeAppendPrintf(dumpEntry, "%-4s %-10s %-6s %-4s %-7s* %-7s* %-21s %s\n",
+                      "File",
+                      "Handle",
+#else
     storeAppendPrintf(dumpEntry, "%-4s %-6s %-4s %-7s* %-7s* %-21s %s\n",
                       "File",
+#endif
                       "Type",
                       "Tout",
                       "Nread",
                       "Nwrite",
                       "Remote Address",
                       "Description");
+#if _SQUID_WINDOWS_
+    storeAppendPrintf(dumpEntry, "---- ---------- ------ ---- -------- -------- --------------------- ------------------------------\n");
+#else
     storeAppendPrintf(dumpEntry, "---- ------ ---- -------- -------- --------------------- ------------------------------\n");
+#endif
 
-    for (i = 0; i < Squid_MaxFD; i++) {
+    for (i = 0; i < Squid_MaxFD; ++i) {
         fd_table[i].dumpStats(*dumpEntry, i);
     }
 }
@@ -89,19 +85,22 @@ fde::DumpStats (StoreEntry *dumpEntry)
 char const *
 fde::remoteAddr() const
 {
-    LOCAL_ARRAY(char, buf, 32);
+    LOCAL_ARRAY(char, buf, MAX_IPSTRLEN );
 
     if (type != FD_SOCKET)
         return null_string;
 
-    snprintf(buf, 32, "%s.%d", ipaddr, (int) remote_port);
+    if ( *ipaddr )
+        snprintf( buf, MAX_IPSTRLEN, "%s:%d", ipaddr, (int)remote_port);
+    else
+        local_addr.toUrl(buf,MAX_IPSTRLEN); // toHostStr does not include port.
 
     return buf;
 }
 
 void
-fde::noteUse(PconnPool *pool)
+fde::noteUse()
 {
-    pconn.uses++;
-    pconn.pool = pool;
+    ++ pconn.uses;
 }
+