X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fthreadengines%2Fthreadengine_win32.cpp;h=b14f46e8e7d004413be9c4403e51ea91490da5ff;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=025fcad9bb3aedb0d24e26b9a297a25463e8ac41;hpb=08277954dc8334d72e31fe0f768855056e282f27;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/threadengines/threadengine_win32.cpp b/src/threadengines/threadengine_win32.cpp
index 025fcad9b..b14f46e8e 100644
--- a/src/threadengines/threadengine_win32.cpp
+++ b/src/threadengines/threadengine_win32.cpp
@@ -1,77 +1,137 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   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 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"
 
-CRITICAL_SECTION MyMutex;
+void ThreadEngine::Start(Thread* thread)
+{
+	thread->state.handle = CreateThread(NULL, 0, ThreadEngine::Entry, thread, 0, NULL);
+
+	if (thread->state.handle == NULL)
+	{
+		DWORD lasterr = GetLastError();
+		std::string err = "Unable to create new thread: " + ConvToStr(lasterr);
+		SetLastError(ERROR_SUCCESS);
+		throw CoreException(err);
+	}
+}
 
-Win32ThreadEngine::Win32ThreadEngine(InspIRCd* Instance) : ThreadEngine(Instance)
+DWORD WINAPI ThreadEngine::Entry(void* parameter)
 {
+	Thread* pt = static_cast<Thread*>(parameter);
+	pt->Run();
+	return 0;
 }
 
-void Win32ThreadEngine::Create(Thread* thread_to_init)
+void ThreadEngine::Stop(Thread* thread)
 {
-	HANDLE* MyThread = new HANDLE;
-	DWORD ThreadId = 0;
+	thread->SetExitFlag();
+	HANDLE handle = thread->state.handle;
+	WaitForSingleObject(handle,INFINITE);
+	CloseHandle(handle);
+}
 
-	if (!(*MyThread = CreateThread(NULL,0,Win32ThreadEngine::Entry,this,0,&ThreadId)))
+class ThreadSignalSocket : public BufferedSocket
+{
+	SocketThread* parent;
+ public:
+	ThreadSignalSocket(SocketThread* t, int newfd)
+		: BufferedSocket(newfd), parent(t)
 	{
-		delete MyThread;
-		throw CoreException(std::string("Unable to reate new Win32ThreadEngine: ") + dlerror());
 	}
 
-	NewThread = thread_to_init;
-	NewThread->Creator = this;
-	NewThread->Extend("winthread", MyThread);
-}
+	void OnDataReady()
+	{
+		recvq.clear();
+		parent->OnNotify();
+	}
 
-Win32ThreadEngine::~Win32ThreadEngine()
-{
-}
+	void OnError(BufferedSocketError)
+	{
+		ServerInstance->GlobalCulls.AddItem(this);
+	}
+};
 
-void Win32ThreadEngine::Run()
+static bool BindAndListen(int sockfd, int port, const char* addr)
 {
-	NewThread->Run();
+	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;
 }
 
-bool Win32ThreadEngine::Mutex(bool enable)
+SocketThread::SocketThread()
 {
-	if (enable)
-		EnterCriticalSection(&MyMutex);
-	else
-		LeaveCriticalSection(&MyMutex);
+	int listenFD = socket(AF_INET, SOCK_STREAM, 0);
+	if (listenFD == -1)
+		throw CoreException("Could not create ITC pipe");
+	int connFD = socket(AF_INET, SOCK_STREAM, 0);
+	if (connFD == -1)
+		throw CoreException("Could not create ITC pipe");
+
+	if (!BindAndListen(listenFD, 0, "127.0.0.1"))
+		throw CoreException("Could not create ITC pipe");
+	SocketEngine::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);
+	SocketEngine::Blocking(listenFD);
+	int nfd = accept(listenFD, reinterpret_cast<struct sockaddr*>(&addr), &sz);
+	if (nfd < 0)
+		throw CoreException("Could not create ITC pipe");
+	new ThreadSignalSocket(this, nfd);
+	closesocket(listenFD);
 
-	return false;
+	SocketEngine::Blocking(connFD);
+	this->signal.connFD = connFD;
 }
 
-DWORD WINAPI Win32ThreadEngine::Entry(void* parameter)
+void SocketThread::NotifyParent()
 {
-	ThreadEngine * pt = (ThreadEngine*)parameter;
-	pt->Run();
-	return 0;
+	char dummy = '*';
+	send(signal.connFD, &dummy, 1, 0);
 }
 
-void Win32ThreadEngine::FreeThread(Thread* thread)
+SocketThread::~SocketThread()
 {
-	HANDLE* winthread = NULL;
-	if (thread->GetExt("winthread", winthread))
+	if (signal.connFD >= 0)
 	{
-		thread->SetExitFlag();
-		int rc;
-		void* status;
-		WaitForSingleObject(*winthread,INFINITE);
-		delete winthread;
+		shutdown(signal.connFD, 2);
+		closesocket(signal.connFD);
 	}
 }
-