Update copyrights for 2009.

[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 b27f960357b1bb5905889bc76f2dfbdd67eb8063..7dce02dbd925b71b4794a30e03d5c0cd27f3a93a 100644 (file)
--- a/src/socketengines/socketengine_iocp.cpp
+++ b/src/socketengines/socketengine_iocp.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -17,6 +17,8 @@
 
 IOCPEngine::IOCPEngine(InspIRCd * Instance) : SocketEngine(Instance)
 {
+       MAX_DESCRIPTORS = 10240;
+
        /* Create completion port */
        m_completionPort = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, (ULONG_PTR)0, 0);
 
@@ -289,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
@@ -453,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))
@@ -463,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));
@@ -482,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);
@@ -492,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;
@@ -522,3 +525,4 @@ int IOCPEngine::Close(EventHandler* fd)
        return this->Close(fd->GetFd());
 }
 
+