recvfrom() -> comm_recvfrom()

diff --git a/src/dns_internal.cc b/src/dns_internal.cc
index b2481a1067ff07ee61a0a156659bc0b67e4108c8..3b335cda9d7fb542bfbf1b733b4140e64ddb43ba 100644 (file)
--- a/src/dns_internal.cc
+++ b/src/dns_internal.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: dns_internal.cc,v 1.48 2002/10/13 20:35:00 robertc Exp $
+ * $Id: dns_internal.cc,v 1.49 2002/10/21 05:45:30 adrian Exp $
  *
  * DEBUG: section 78    DNS lookups; interacts with lib/rfc1035.c
  * AUTHOR: Duane Wessels
@@ -35,6 +35,7 @@
 
 #include "squid.h"
 #include "Store.h"
+#include "comm.h"
 
 #if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_)
 #include <windows.h>
@@ -501,8 +502,7 @@ idnsRead(int fd, void *data)
     while (max--) {
        from_len = sizeof(from);
        memset(&from, '\0', from_len);
-       statCounter.syscalls.sock.recvfroms++;
-       len = recvfrom(fd, rbuf, 512, 0, (struct sockaddr *) &from, &from_len);
+       len = comm_recvfrom(fd, rbuf, 512, 0, (struct sockaddr *) &from, &from_len);
        if (len == 0)
            break;
        if (len < 0) {

diff --git a/src/htcp.cc b/src/htcp.cc
index 9e736119eff23c263aa18c819111524cfa2e3713..c46b87b3dc12c52ffcc7e3fe43d0c68d82dab694 100644 (file)
--- a/src/htcp.cc
+++ b/src/htcp.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: htcp.cc,v 1.44 2002/10/15 08:03:29 robertc Exp $
+ * $Id: htcp.cc,v 1.45 2002/10/21 05:45:30 adrian Exp $
  *
  * DEBUG: section 31    Hypertext Caching Protocol
  * AUTHOR: Duane Wesssels
@@ -893,8 +893,7 @@ htcpRecv(int fd, void *data)
     static struct sockaddr_in from;
     socklen_t flen = sizeof(struct sockaddr_in);
     memset(&from, '\0', flen);
-    statCounter.syscalls.sock.recvfroms++;
-    len = recvfrom(fd, buf, 8192, 0, (struct sockaddr *) &from, &flen);
+    len = comm_recvfrom(fd, buf, 8192, 0, (struct sockaddr *) &from, &flen);
     debug(31, 3) ("htcpRecv: FD %d, %d bytes from %s:%d\n",
        fd, len, inet_ntoa(from.sin_addr), ntohs(from.sin_port));
     htcpHandle(buf, len, &from);

diff --git a/src/icp_v2.cc b/src/icp_v2.cc
index 569f9de0921b93804373c202ffdee3595811aaf3..9854503333f4778de0ef65bdd65a09c22daa22b8 100644 (file)
--- a/src/icp_v2.cc
+++ b/src/icp_v2.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: icp_v2.cc,v 1.69 2002/10/14 11:50:08 adrian Exp $
+ * $Id: icp_v2.cc,v 1.70 2002/10/21 05:45:30 adrian Exp $
  *
  * DEBUG: section 12    Internet Cache Protocol
  * AUTHOR: Duane Wessels
@@ -35,6 +35,7 @@
 
 #include "squid.h"
 #include "Store.h"
+#include "comm.h"
 #include "ICP.h"
 
 static void icpLogIcp(struct in_addr, log_type, int, const char *, int);
@@ -484,8 +485,7 @@ icpHandleUdp(int sock, void *data)
     while (max--) {
        from_len = sizeof(from);
        memset(&from, '\0', from_len);
-       statCounter.syscalls.sock.recvfroms++;
-       len = recvfrom(sock,
+       len = comm_recvfrom(sock,
            buf,
            SQUID_UDP_SO_RCVBUF - 1,
            0,

diff --git a/src/snmp_core.cc b/src/snmp_core.cc
index cdd864f6b34eb822c447fcaa4d9add3ed82a4248..7cd14997079a2b64a422d1a3d78b7568c0d9c6cf 100644 (file)
--- a/src/snmp_core.cc
+++ b/src/snmp_core.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: snmp_core.cc,v 1.55 2002/10/13 20:35:03 robertc Exp $
+ * $Id: snmp_core.cc,v 1.56 2002/10/21 05:45:30 adrian Exp $
  *
  * DEBUG: section 49    SNMP support
  * AUTHOR: Glenn Chisholm
@@ -33,6 +33,7 @@
  *
  */
 #include "squid.h"
+#include "comm.h"
 #include "cache_snmp.h"
 
 #define SNMP_REQUEST_SIZE 4096
@@ -459,9 +460,7 @@ snmpHandleUdp(int sock, void *not_used)
     memset(&from, '\0', from_len);
     memset(buf, '\0', SNMP_REQUEST_SIZE);
 
-    statCounter.syscalls.sock.recvfroms++;
-
-    len = recvfrom(sock,
+    len = comm_recvfrom(sock,
        buf,
        SNMP_REQUEST_SIZE,
        0,

diff --git a/src/wccp.cc b/src/wccp.cc
index e189e2210b241175c03f92fa51584fd36f0652bc..9f7f7c9df00b90c61f0a812a7681c08a37f678b9 100644 (file)
--- a/src/wccp.cc
+++ b/src/wccp.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: wccp.cc,v 1.25 2002/09/01 15:16:49 hno Exp $
+ * $Id: wccp.cc,v 1.26 2002/10/21 05:45:30 adrian Exp $
  *
  * DEBUG: section 80    WCCP Support
  * AUTHOR: Glenn Chisholm
@@ -33,6 +33,7 @@
  *
  */
 #include "squid.h"
+#include "comm.h"
 
 #if USE_WCCP
 
@@ -219,9 +220,7 @@ wccpHandleUdp(int sock, void *not_used)
     memset(&from, '\0', from_len);
     memset(&wccp_i_see_you, '\0', sizeof(wccp_i_see_you));
 
-    statCounter.syscalls.sock.recvfroms++;
-
-    len = recvfrom(sock,
+    len = comm_recvfrom(sock,
        (void *) &wccp_i_see_you,
        WCCP_RESPONSE_SIZE,
        0,