/*
- * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2017 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
#include "StatCounters.h"
#include "Store.h"
#include "store_key_md5.h"
-#include "SwapDir.h"
#include "tools.h"
#include "wordlist.h"
static void icpIncomingConnectionOpened(const Comm::ConnectionPointer &conn, int errNo);
/// \ingroup ServerProtocolICPInternal2
-static void icpLogIcp(const Ip::Address &, LogTags, int, const char *, int);
+static void icpLogIcp(const Ip::Address &, const LogTags &, int, const char *, int);
/// \ingroup ServerProtocolICPInternal2
static void icpHandleIcpV2(int, Ip::Address &, char *, int);
icp_opcode
_icp_common_t::getOpCode() const
{
- if (opcode > (char)ICP_END)
+ if (opcode > static_cast<char>(icp_opcode::ICP_END))
return ICP_INVALID;
- return (icp_opcode)opcode;
+ return static_cast<icp_opcode>(opcode);
}
/* ICPState */
/// \ingroup ServerProtocolICPInternal2
static void
-icpLogIcp(const Ip::Address &caddr, LogTags logcode, int len, const char *url, int delay)
+icpLogIcp(const Ip::Address &caddr, const LogTags &logcode, int len, const char *url, int delay)
{
AccessLogEntry::Pointer al = new AccessLogEntry();
- if (LOG_TAG_NONE == logcode)
+ if (LOG_TAG_NONE == logcode.oldType)
return;
- if (LOG_ICP_QUERY == logcode)
+ if (LOG_ICP_QUERY == logcode.oldType)
return;
clientdbUpdate(caddr, logcode, AnyP::PROTO_ICP, len);
icpUdpSend(int fd,
const Ip::Address &to,
icp_common_t * msg,
- LogTags logcode,
+ const LogTags &logcode,
int delay)
{
icpUdpData *queue;
break;
if (len < 0) {
- if (ignoreErrno(errno))
+ int xerrno = errno;
+ if (ignoreErrno(xerrno))
break;
#if _SQUID_LINUX_
* return ECONNREFUSED when sendto() fails and generates an ICMP
* port unreachable message. */
/* or maybe an EHOSTUNREACH "No route to host" message */
- if (errno != ECONNREFUSED && errno != EHOSTUNREACH)
+ if (xerrno != ECONNREFUSED && xerrno != EHOSTUNREACH)
#endif
-
- debugs(50, DBG_IMPORTANT, "icpHandleUdp: FD " << sock << " recvfrom: " << xstrerror());
+ debugs(50, DBG_IMPORTANT, "icpHandleUdp: FD " << sock << " recvfrom: " << xstrerr(xerrno));
break;
}
if (SENT == which) {
++statCounter.icp.pkts_sent;
- kb_incr(&statCounter.icp.kbytes_sent, len);
+ statCounter.icp.kbytes_sent += len;
if (ICP_QUERY == icp->opcode) {
++statCounter.icp.queries_sent;
- kb_incr(&statCounter.icp.q_kbytes_sent, len);
+ statCounter.icp.q_kbytes_sent += len;
} else {
++statCounter.icp.replies_sent;
- kb_incr(&statCounter.icp.r_kbytes_sent, len);
+ statCounter.icp.r_kbytes_sent += len;
/* this is the sent-reply service time */
statCounter.icp.replySvcTime.count(delay);
}
++statCounter.icp.hits_sent;
} else if (RECV == which) {
++statCounter.icp.pkts_recv;
- kb_incr(&statCounter.icp.kbytes_recv, len);
+ statCounter.icp.kbytes_recv += len;
if (ICP_QUERY == icp->opcode) {
++statCounter.icp.queries_recv;
- kb_incr(&statCounter.icp.q_kbytes_recv, len);
+ statCounter.icp.q_kbytes_recv += len;
} else {
++statCounter.icp.replies_recv;
- kb_incr(&statCounter.icp.r_kbytes_recv, len);
+ statCounter.icp.r_kbytes_recv += len;
/* statCounter.icp.querySvcTime set in clientUpdateCounters */
}