Remove m_sqlv2.h from these modules, they both use v3 now.

[user/henk/code/inspircd.git] / src / threadengines / threadengine_win32.cpp

diff --git a/src/threadengines/threadengine_win32.cpp b/src/threadengines/threadengine_win32.cpp
index 5c62b5081b89c5ad8d9fdc4cd3baa461e15b2c68..b2a4dcacac0b50eab18e43e94815a31037f36609 100644 (file)
--- a/src/threadengines/threadengine_win32.cpp
+++ b/src/threadengines/threadengine_win32.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "threadengines/threadengine_win32.h"
 
-ThreadEngine::ThreadEngine(InspIRCd* Instance)
+ThreadEngine::ThreadEngine()
 {
 }
 
@@ -55,24 +55,24 @@ class ThreadSignalSocket : public BufferedSocket
 {
        SocketThread* parent;
  public:
-       ThreadSignalSocket(SocketThread* t, InspIRCd* SI, int newfd, const char* ip)
-               : BufferedSocket(SI, newfd, ip), parent(t)
+       ThreadSignalSocket(SocketThread* t, int newfd)
+               : BufferedSocket(newfd), parent(t)
        {
        }
 
-       virtual bool OnDataReady()
+       void OnDataReady()
        {
-               char data = 0;
-               if (ServerInstance->SE->Recv(this, &data, 1, 0) > 0)
-               {
-                       parent->OnNotify();
-                       return true;
-               }
-               return false;
+               recvq.clear();
+               parent->OnNotify();
+       }
+
+       void OnError(BufferedSocketError)
+       {
+               ServerInstance->GlobalCulls.AddItem(this);
        }
 };
 
-SocketThread::SocketThread(InspIRCd* SI)
+SocketThread::SocketThread()
 {
        int listenFD = socket(AF_INET, SOCK_STREAM, 0);
        if (listenFD == -1)
@@ -81,21 +81,21 @@ SocketThread::SocketThread(InspIRCd* SI)
        if (connFD == -1)
                throw CoreException("Could not create ITC pipe");
 
-       if (!SI->BindSocket(listenFD, 0, "127.0.0.1", true))
+       if (!ServerInstance->BindSocket(listenFD, 0, "127.0.0.1", true))
                throw CoreException("Could not create ITC pipe");
-       SI->SE->NonBlocking(connFD);
+       ServerInstance->SE->NonBlocking(connFD);
 
        struct sockaddr_in addr;
        socklen_t sz = sizeof(addr);
        getsockname(listenFD, reinterpret_cast<struct sockaddr*>(&addr), &sz);
        connect(connFD, reinterpret_cast<struct sockaddr*>(&addr), sz);
-       int nfd = accept(listenFD);
+       int nfd = accept(listenFD, reinterpret_cast<struct sockaddr*>(&addr), (int*)sz);
        if (nfd < 0)
                throw CoreException("Could not create ITC pipe");
-       new ThreadSignalSocket(parent, ServerInstance, nfd, "127.0.0.1");
+       new ThreadSignalSocket(this, nfd);
        closesocket(listenFD);
 
-       SI->SE->Blocking(connFD);
+       ServerInstance->SE->Blocking(connFD);
        this->signal.connFD = connFD;
 }