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

diff --git a/src/threadengines/threadengine_win32.cpp b/src/threadengines/threadengine_win32.cpp
index 3376f937a..0f0d1f277 100644
--- a/src/threadengines/threadengine_win32.cpp
+++ b/src/threadengines/threadengine_win32.cpp
@@ -23,8 +23,7 @@
 
 void ThreadEngine::Start(Thread* thread)
 {
-	DWORD ThreadId = 0;
-	thread->state.handle = CreateThread(NULL, 0, ThreadEngine::Entry, thread, 0, &ThreadId);
+	thread->state.handle = CreateThread(NULL, 0, ThreadEngine::Entry, thread, 0, NULL);
 
 	if (thread->state.handle == NULL)
 	{
@@ -42,9 +41,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);
 }
@@ -70,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);
@@ -79,7 +97,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);