Made use of namespaces for socket wrappers (nonportable, but let's see where it leads).

diff --git a/compat/os/mswin.h b/compat/os/mswin.h
index a4a8a9a21c0c8fe6ebe46b350e4e94a1faa54c71..00198a50298eb5d4dbc8efa6484dc5ef122c51f2 100644 (file)
--- a/compat/os/mswin.h
+++ b/compat/os/mswin.h
@@ -509,18 +509,21 @@ gethostbyaddr(const void * a, size_t l, int t)
         errno = WSAGetLastError();
     return result;
 }
-#define gethostbyaddr(a,l,t) Squid::gethostbyaddr(a,l,t)
+using Squid::gethostbyaddr;
+//#define gethostbyaddr(a,l,t) Squid::gethostbyaddr(a,l,t)
 
 inline int
-getsockname(int s, struct sockaddr * n, socklen_t * l)
+getsockname(int s, struct sockaddr * n, size_t * l)
 {
-    if ((::getsockname(_get_osfhandle(s), n, l)) == SOCKET_ERROR) {
+    int i=*l;
+       if (::getsockname(_get_osfhandle(s), n,&i) == SOCKET_ERROR) {
         errno = WSAGetLastError();
         return -1;
     } else
         return 0;
 }
-#define getsockname(s,a,l) Squid::getsockname(s,a,l)
+using Squid::getsockname;
+//#define getsockname(s,a,l) Squid::getsockname(s,a,l)
 
 inline int
 gethostname(char * n, size_t l)
@@ -531,7 +534,8 @@ gethostname(char * n, size_t l)
     } else
         return 0;
 }
-#define gethostname(n,l) Squid::gethostname(n,l)
+using Squid::gethostname;
+//#define gethostname(n,l) Squid::gethostname(n,l)
 
 inline int
 getsockopt(int s, int l, int o, void * v, socklen_t * n)

diff --git a/src/comm.cc b/src/comm.cc
index aca3385789224cfa250f3e1a86b206d91dd8b1d5..6f048f375885d67c5d81da1c91a2e8b01a30a462 100644 (file)
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -64,8 +64,8 @@
 #endif
 
 #include "cbdata.h"
-#if _SQUID_CYGWIN_
-#include <sys/ioctl.h>
+#if HAVE_WINSOCK2_H
+#include <winsock2.h>
 #endif
 #ifdef HAVE_NETINET_TCP_H
 #include <netinet/tcp.h>
@@ -327,7 +327,7 @@ comm_udp_recvfrom(int fd, void *buf, size_t len, int flags, Ip::Address &from)
 
     from.InitAddrInfo(AI);
 
-    x = recvfrom(fd, buf, len, flags, AI->ai_addr, &AI->ai_addrlen);
+    x = Squid::recvfrom(fd, buf, len, flags, AI->ai_addr, &AI->ai_addrlen);
 
     from = *AI;
 
@@ -346,7 +346,7 @@ comm_udp_recv(int fd, void *buf, size_t len, int flags)
 ssize_t
 comm_udp_send(int s, const void *buf, size_t len, int flags)
 {
-    return send(s, buf, len, flags);
+    return Squid::send(s, buf, len, flags);
 }
 
 
@@ -385,7 +385,7 @@ comm_local_port(int fd)
 
     temp.InitAddrInfo(addr);
 
-    if (getsockname(fd, addr->ai_addr, &(addr->ai_addrlen)) ) {
+    if (Squid::getsockname(fd, addr->ai_addr, &(addr->ai_addrlen)) ) {
         debugs(50, 1, "comm_local_port: Failed to retrieve TCP/UDP port number for socket: FD " << fd << ": " << xstrerror());
         temp.FreeAddrInfo(addr);
         return 0;
@@ -861,7 +861,7 @@ comm_connect_addr(int sock, const Ip::Address &address)
 #else
         errlen = sizeof(err);
 
-        x = getsockopt(sock, SOL_SOCKET, SO_ERROR, &err, &errlen);
+        x = Squid::getsockopt(sock, SOL_SOCKET, SO_ERROR, &err, &errlen);
 
         if (x == 0)
             errno = err;
@@ -1175,7 +1175,7 @@ comm_udp_sendto(int fd,
 
     to_addr.GetAddrInfo(AI, fd_table[fd].sock_family);
 
-    x = sendto(fd, buf, len, 0, AI->ai_addr, AI->ai_addrlen);
+    x = Squid::sendto(fd, buf, len, 0, AI->ai_addr, AI->ai_addrlen);
 
     to_addr.FreeAddrInfo(AI);
 
@@ -1315,7 +1315,7 @@ commSetNonBlocking(int fd)
     if (fd_table[fd].type != FD_PIPE) {
 #endif
 
-        if (ioctl(fd, FIONBIO, &nonblocking) < 0) {
+        if (Squid::ioctl(fd, FIONBIO, &nonblocking) < 0) {
             debugs(50, 0, "commSetNonBlocking: FD " << fd << ": " << xstrerror() << " " << fd_table[fd].type);
             return COMM_ERROR;
         }
@@ -1326,7 +1326,7 @@ commSetNonBlocking(int fd)
 #endif
 #if !_SQUID_MSWIN_
 
-        if ((flags = fcntl(fd, F_GETFL, dummy)) < 0) {
+        if ((flags = Squid::fcntl(fd, F_GETFL, dummy)) < 0) {
             debugs(50, 0, "FD " << fd << ": fcntl F_GETFL: " << xstrerror());
             return COMM_ERROR;
         }