Add support for blocking tag messages with the deaf mode.

[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 c3a844a74957a3fc9b17b36ee9248d7abe750f0d..b14f46e8e7d004413be9c4403e51ea91490da5ff 100644 (file)
--- a/src/threadengines/threadengine_win32.cpp
+++ b/src/threadengines/threadengine_win32.cpp
@@ -1,8 +1,13 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2013-2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
+ *   Copyright (C) 2009, 2011 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2009 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2008-2009 Craig Edwards <brain@inspircd.org>
  *
  * 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
@@ -21,33 +26,19 @@
 #include "inspircd.h"
 #include "threadengines/threadengine_win32.h"
 
-ThreadEngine::ThreadEngine()
-{
-}
-
 void ThreadEngine::Start(Thread* thread)
 {
-       ThreadData* data = new ThreadData;
-       thread->state = data;
-
-       DWORD ThreadId = 0;
-       data->handle = CreateThread(NULL,0,ThreadEngine::Entry,thread,0,&ThreadId);
+       thread->state.handle = CreateThread(NULL, 0, ThreadEngine::Entry, thread, 0, NULL);
 
-       if (data->handle == NULL)
+       if (thread->state.handle == NULL)
        {
                DWORD lasterr = GetLastError();
-               thread->state = NULL;
-               delete data;
                std::string err = "Unable to create new thread: " + ConvToStr(lasterr);
                SetLastError(ERROR_SUCCESS);
                throw CoreException(err);
        }
 }
 
-ThreadEngine::~ThreadEngine()
-{
-}
-
 DWORD WINAPI ThreadEngine::Entry(void* parameter)
 {
        Thread* pt = static_cast<Thread*>(parameter);
@@ -55,9 +46,10 @@ DWORD WINAPI ThreadEngine::Entry(void* parameter)
        return 0;
 }
 
-void ThreadData::FreeThread(Thread* thread)
+void ThreadEngine::Stop(Thread* thread)
 {
        thread->SetExitFlag();
+       HANDLE handle = thread->state.handle;
        WaitForSingleObject(handle,INFINITE);
        CloseHandle(handle);
 }
@@ -83,6 +75,24 @@ class ThreadSignalSocket : public BufferedSocket
        }
 };
 
+static bool BindAndListen(int sockfd, int port, const char* addr)
+{
+       irc::sockets::sockaddrs servaddr;
+       if (!irc::sockets::aptosa(addr, port, servaddr))
+               return false;
+
+       if (SocketEngine::Bind(sockfd, servaddr) != 0)
+               return false;
+
+       if (SocketEngine::Listen(sockfd, ServerInstance->Config->MaxConn) != 0)
+       {
+               ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "ERROR in listen(): %s", strerror(errno));
+               return false;
+       }
+
+       return true;
+}
+
 SocketThread::SocketThread()
 {
        int listenFD = socket(AF_INET, SOCK_STREAM, 0);
@@ -92,7 +102,7 @@ SocketThread::SocketThread()
        if (connFD == -1)
                throw CoreException("Could not create ITC pipe");
 
-       if (!ServerInstance->BindSocket(listenFD, 0, "127.0.0.1", true))
+       if (!BindAndListen(listenFD, 0, "127.0.0.1"))
                throw CoreException("Could not create ITC pipe");
        SocketEngine::NonBlocking(connFD);