X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fthreadengines%2Fthreadengine_win32.cpp;h=637a3e01093877d75063c049aadd668afb4c34f5;hb=f4cd5fb72ad191a3708d3d39a4fc74cc1ae4377e;hp=e880d597f71b367f16cf8ed4548923c8bdf5363a;hpb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/threadengines/threadengine_win32.cpp b/src/threadengines/threadengine_win32.cpp
index e880d597f..637a3e010 100644
--- a/src/threadengines/threadengine_win32.cpp
+++ b/src/threadengines/threadengine_win32.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | 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"
 
@@ -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);
 	}
 }
 
@@ -65,6 +81,11 @@ class ThreadSignalSocket : public BufferedSocket
 		recvq.clear();
 		parent->OnNotify();
 	}
+
+	void OnError(BufferedSocketError)
+	{
+		ServerInstance->GlobalCulls.AddItem(this);
+	}
 };
 
 SocketThread::SocketThread()
@@ -76,21 +97,22 @@ SocketThread::SocketThread()
 	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, nfd);
+	new ThreadSignalSocket(this, nfd);
 	closesocket(listenFD);
 
-	SI->SE->Blocking(connFD);
+	ServerInstance->SE->Blocking(connFD);
 	this->signal.connFD = connFD;
 }