Wakey wakey w00t :p

[user/henk/code/inspircd.git] / src / socketengines / socketengine_iocp.cpp

diff --git a/src/socketengines/socketengine_iocp.cpp b/src/socketengines/socketengine_iocp.cpp
index 9ae394e5656ed1f0d917e6bae550e4f8324c9162..5c011deb83d075104be6c2d3034112b807c76cf4 100644 (file)
--- a/src/socketengines/socketengine_iocp.cpp
+++ b/src/socketengines/socketengine_iocp.cpp
@@ -291,7 +291,7 @@ int IOCPEngine::DispatchEvents()
 
        while (GetQueuedCompletionStatus(m_completionPort, &len, &intfd, &overlap, 1000))
        {
-               if (intfd < 0 || intfd > MAX_DESCRIPTORS)
+               if (intfd > (unsigned long)MAX_DESCRIPTORS)
                        continue;
 
                // woot, we got an event on a socket :P
@@ -455,7 +455,7 @@ EventHandler * IOCPEngine::GetIntRef(int fd)
 
 int IOCPEngine::Accept(EventHandler* fd, sockaddr *addr, socklen_t *addrlen)
 {
-       SOCKET s = fd->GetFd();
+       //SOCKET s = fd->GetFd();
 
        Overlapped* acceptevent = NULL;
        if (!fd->GetExt("windows_acceptevent", acceptevent))
@@ -465,7 +465,7 @@ int IOCPEngine::Accept(EventHandler* fd, sockaddr *addr, socklen_t *addrlen)
        Overlapped* ovl = acceptevent;
        accept_overlap* ov = (accept_overlap*)ovl->m_params;
        
-       sockaddr_in* server_address = (sockaddr_in*)&ov->buf[10];
+       //sockaddr_in* server_address = (sockaddr_in*)&ov->buf[10];
        sockaddr_in* client_address = (sockaddr_in*)&ov->buf[38];
 
        memcpy(addr, client_address, sizeof(sockaddr_in));
@@ -484,7 +484,7 @@ int IOCPEngine::GetSockName(EventHandler* fd, sockaddr *name, socklen_t* namelen
        accept_overlap* ov = (accept_overlap*)ovl->m_params;
 
        sockaddr_in* server_address = (sockaddr_in*)&ov->buf[10];
-       sockaddr_in* client_address = (sockaddr_in*)&ov->buf[38];
+       //sockaddr_in* client_address = (sockaddr_in*)&ov->buf[38];
 
        memcpy(name, server_address, sizeof(sockaddr_in));
        *namelen = sizeof(sockaddr_in);
@@ -494,6 +494,7 @@ int IOCPEngine::GetSockName(EventHandler* fd, sockaddr *name, socklen_t* namelen
 
 int IOCPEngine::RecvFrom(EventHandler* fd, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen)
 {
+       this->UpdateStats(len, 0);
        udp_overlap * ov = NULL;
        if (!fd->GetExt("windows_readevent", ov))
                return -1;
@@ -524,3 +525,4 @@ int IOCPEngine::Close(EventHandler* fd)
        return this->Close(fd->GetFd());
 }
 
+