X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fthreadengines%2Fthreadengine_win32.cpp;h=529e24a294c30fe5cb00956f9f17529f7a5d3834;hb=5cc9614e73a783dec7a8e0887a0435cf577eaad4;hp=4bac4f5dce513834b4c101428a390720806f4785;hpb=deb6822302cb9009adc3450dd405817cc0dae9cd;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/threadengines/threadengine_win32.cpp b/src/threadengines/threadengine_win32.cpp
index 4bac4f5dc..529e24a29 100644
--- 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()
 {
 }
 
@@ -30,7 +37,16 @@ void ThreadEngine::Start(Thread* thread)
 	{
 		thread->state = NULL;
 		delete data;
-		throw CoreException(std::string("Unable to create new thread: ") + dlerror());
+		std::string err = "Unable to create new thread: ";
+#ifdef _WIN32
+		CHAR errdetail[100];
+		FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, 0, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), errdetail, 100, 0);
+		SetLastError(ERROR_SUCCESS);
+		err += errdetail;
+#else
+		err += dlerror();
+#endif
+		throw CoreException(err);
 	}
 }
 
@@ -49,75 +65,55 @@ 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)
-	{
-	}
-	
-	virtual bool OnDataReady()
+	ThreadSignalSocket(SocketThread* t, int newfd)
+		: BufferedSocket(newfd), parent(t)
 	{
-		char data = 0;
-		if (ServerInstance->SE->Recv(this, &data, 1, 0) > 0)
-		{
-			parent->OnNotify();
-			return true;
-		}
-		return false;
 	}
-};
 
-class ThreadSignalListener : public ListenSocketBase
-{
-	SocketThread* parent;
-	sockaddr_in sock_us;
- public:
-	ThreadSignalListener(SocketThread* t, InspIRCd* Instance, int port, const std::string &addr) : ListenSocketBase(Instance, port, addr), parent(t)
+	void OnDataReady()
 	{
-		socklen_t uslen = sizeof(sock_us);
-		if (getsockname(this->fd,(sockaddr*)&sock_us,&uslen))
-		{
-			throw ModuleException("Could not getsockname() to find out port number for ITC port");
-		}
+		recvq.clear();
+		parent->OnNotify();
 	}
 
-	virtual void OnAcceptReady(int nfd)
+	void OnError(BufferedSocketError)
 	{
-		new ThreadSignalSocket(parent, ServerInstance, nfd, "");
-		ServerInstance->SE->DelFd(this);
-	}
-/* Using getsockname and ntohs, we can determine which port number we were allocated */
-	int GetPort()
-	{
-		return ntohs(sock_us.sin_port);
+		ServerInstance->GlobalCulls.AddItem(this);
 	}
 };
 
-SocketThread::SocketThread(InspIRCd* SI)
+SocketThread::SocketThread()
 {
-	ThreadSignalListener* listener = new ThreadSignalListener(this, SI, 0, "127.0.0.1");
-	if (listener->GetFd() == -1)
+	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 (!ServerInstance->BindSocket(listenFD, 0, "127.0.0.1", true))
+		throw CoreException("Could not create ITC pipe");
+	ServerInstance->SE->NonBlocking(connFD);
+
 	struct sockaddr_in addr;
-	inet_aton("127.0.0.1", &addr.sin_addr);
-	addr.sin_family = AF_INET;
-	addr.sin_port = htons(listener->GetPort());
+	socklen_t sz = sizeof(addr);
+	getsockname(listenFD, reinterpret_cast<struct sockaddr*>(&addr), &sz);
+	connect(connFD, reinterpret_cast<struct sockaddr*>(&addr), sz);
+	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(this, nfd);
+	closesocket(listenFD);
 
-	if (connect(connFD, reinterpret_cast<struct sockaddr*>(&addr), sizeof(addr)) == -1)
-	{
-		SI->SE->DelFd(listener);
-		closesocket(connFD);
-		throw CoreException("Could not connet to ITC pipe");
-	}
+	ServerInstance->SE->Blocking(connFD);
 	this->signal.connFD = connFD;
 }