Use the preprocessor to detect whether hash_map is available.

[user/henk/code/inspircd.git] / src / socketengine.cpp

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index daba545809d56c4d612a365eab8c2fa44fa7d33d..27abd0ad630f45e358d401ffa9e65a9895a3112e 100644 (file)
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -98,7 +98,7 @@ bool SocketEngine::HasFd(int fd)
 {
        if ((fd < 0) || (fd > GetMaxFds()))
                return false;
-       return ref[fd];
+       return (ref[fd] != NULL);
 }
 
 EventHandler* SocketEngine::GetRef(int fd)
@@ -125,7 +125,7 @@ int SocketEngine::Accept(EventHandler* fd, sockaddr *addr, socklen_t *addrlen)
 
 int SocketEngine::Close(EventHandler* fd)
 {
-#ifdef WINDOWS
+#ifdef _WIN32
        return closesocket(fd->GetFd());
 #else
        return close(fd->GetFd());
@@ -134,7 +134,7 @@ int SocketEngine::Close(EventHandler* fd)
 
 int SocketEngine::Close(int fd)
 {
-#ifdef WINDOWS
+#ifdef _WIN32
        return closesocket(fd);
 #else
        return close(fd);
@@ -143,7 +143,7 @@ int SocketEngine::Close(int fd)
 
 int SocketEngine::Blocking(int fd)
 {
-#ifdef WINDOWS
+#ifdef _WIN32
        unsigned long opt = 0;
        return ioctlsocket(fd, FIONBIO, &opt);
 #else
@@ -154,7 +154,7 @@ int SocketEngine::Blocking(int fd)
 
 int SocketEngine::NonBlocking(int fd)
 {
-#ifdef WINDOWS
+#ifdef _WIN32
        unsigned long opt = 1;
        return ioctlsocket(fd, FIONBIO, &opt);
 #else
@@ -176,31 +176,44 @@ void SocketEngine::SetReuse(int fd)
 
 int SocketEngine::RecvFrom(EventHandler* fd, void *buf, size_t len, int flags, sockaddr *from, socklen_t *fromlen)
 {
-       this->UpdateStats(len, 0);
-       return recvfrom(fd->GetFd(), (char*)buf, len, flags, from, fromlen);
+       int nbRecvd = recvfrom(fd->GetFd(), (char*)buf, len, flags, from, fromlen);
+       if (nbRecvd > 0)
+               this->UpdateStats(nbRecvd, 0);
+       return nbRecvd;
 }
 
 int SocketEngine::Send(EventHandler* fd, const void *buf, size_t len, int flags)
 {
-       this->UpdateStats(0, len);
-       return send(fd->GetFd(), (char*)buf, len, flags);
+       int nbSent = send(fd->GetFd(), (const char*)buf, len, flags);
+       if (nbSent > 0)
+               this->UpdateStats(0, nbSent);
+       return nbSent;
 }
 
 int SocketEngine::Recv(EventHandler* fd, void *buf, size_t len, int flags)
 {
-       this->UpdateStats(len, 0);
-       return recv(fd->GetFd(), (char*)buf, len, flags);
+       int nbRecvd = recv(fd->GetFd(), (char*)buf, len, flags);
+       if (nbRecvd > 0)
+               this->UpdateStats(nbRecvd, 0);
+       return nbRecvd;
 }
 
 int SocketEngine::SendTo(EventHandler* fd, const void *buf, size_t len, int flags, const sockaddr *to, socklen_t tolen)
 {
-       this->UpdateStats(0, len);
-       return sendto(fd->GetFd(), (char*)buf, len, flags, to, tolen);
+       int nbSent = sendto(fd->GetFd(), (const char*)buf, len, flags, to, tolen);
+       if (nbSent > 0)
+               this->UpdateStats(0, nbSent);
+       return nbSent;
 }
 
 int SocketEngine::Connect(EventHandler* fd, const sockaddr *serv_addr, socklen_t addrlen)
 {
-       return connect(fd->GetFd(), serv_addr, addrlen);
+       int ret = connect(fd->GetFd(), serv_addr, addrlen);
+#ifdef _WIN32
+       if ((ret == SOCKET_ERROR) && (WSAGetLastError() == WSAEWOULDBLOCK))
+               errno = EINPROGRESS;
+#endif
+       return ret;
 }
 
 int SocketEngine::Shutdown(EventHandler* fd, int how)