X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fthreadengines%2Fthreadengine_win32.cpp;h=0f0d1f277442578a259c7eab14fed2063e6022cd;hb=f757c2d75bc284211f3b53b2819b88becfd8632f;hp=b2a4dcacac0b50eab18e43e94815a31037f36609;hpb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/threadengines/threadengine_win32.cpp b/src/threadengines/threadengine_win32.cpp
index b2a4dcaca..0f0d1f277 100644
--- a/src/threadengines/threadengine_win32.cpp
+++ b/src/threadengines/threadengine_win32.cpp
@@ -1,43 +1,39 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 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()
-{
-}
-
 void ThreadEngine::Start(Thread* thread)
 {
-	ThreadData* data = new ThreadData;
-	thread->state = data;
+	thread->state.handle = CreateThread(NULL, 0, ThreadEngine::Entry, thread, 0, NULL);
 
-	DWORD ThreadId = 0;
-	data->handle = CreateThread(NULL,0,ThreadEngine::Entry,thread,0,&ThreadId);
-
-	if (data->handle == NULL)
+	if (thread->state.handle == NULL)
 	{
-		thread->state = NULL;
-		delete data;
-		throw CoreException(std::string("Unable to create new thread: ") + dlerror());
+		DWORD lasterr = GetLastError();
+		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);
@@ -45,10 +41,12 @@ 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);
 }
 
 class ThreadSignalSocket : public BufferedSocket
@@ -72,6 +70,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);
@@ -81,21 +97,22 @@ 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");
-	ServerInstance->SE->NonBlocking(connFD);
+	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);
-	int nfd = accept(listenFD, reinterpret_cast<struct sockaddr*>(&addr), (int*)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);
 
-	ServerInstance->SE->Blocking(connFD);
+	SocketEngine::Blocking(connFD);
 	this->signal.connFD = connFD;
 }