Merge pull request #1094 from SISheogorath/insp20+fixed-Override

[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..ea37892f8d9c0d239ca1b1aa485f590a230b4fcf 100644 (file)
--- a/src/threadengines/threadengine_win32.cpp
+++ b/src/threadengines/threadengine_win32.cpp
@@ -1,20 +1,27 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *         the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "threadengines/threadengine_win32.h"
 
-ThreadEngine::ThreadEngine(InspIRCd* Instance)
+ThreadEngine::ThreadEngine()
 {
 }
 
@@ -28,9 +35,12 @@ void ThreadEngine::Start(Thread* thread)
 
        if (data->handle == NULL)
        {
+               DWORD lasterr = GetLastError();
                thread->state = NULL;
                delete data;
-               throw CoreException(std::string("Unable to create new thread: ") + dlerror());
+               std::string err = "Unable to create new thread: " + ConvToStr(lasterr);
+               SetLastError(ERROR_SUCCESS);
+               throw CoreException(err);
        }
 }
 
@@ -49,30 +59,31 @@ void ThreadData::FreeThread(Thread* thread)
 {
        thread->SetExitFlag();
        WaitForSingleObject(handle,INFINITE);
+       CloseHandle(handle);
 }
 
 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)
+       {
+       }
+
+       void OnDataReady()
        {
+               recvq.clear();
+               parent->OnNotify();
        }
 
-       virtual bool OnDataReady()
+       void OnError(BufferedSocketError)
        {
-               char data = 0;
-               if (ServerInstance->SE->Recv(this, &data, 1, 0) > 0)
-               {
-                       parent->OnNotify();
-                       return true;
-               }
-               return false;
+               ServerInstance->GlobalCulls.AddItem(this);
        }
 };
 
-SocketThread::SocketThread(InspIRCd* SI)
+SocketThread::SocketThread()
 {
        int listenFD = socket(AF_INET, SOCK_STREAM, 0);
        if (listenFD == -1)
@@ -81,21 +92,22 @@ 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);
+       ServerInstance->SE->Blocking(listenFD);
+       int nfd = accept(listenFD, reinterpret_cast<struct sockaddr*>(&addr), &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;
 }