X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fthreadengines%2Fthreadengine_win32.cpp;h=0f0d1f277442578a259c7eab14fed2063e6022cd;hb=8ff409cb9a393559ebda3990ab2926c9a42d87a1;hp=33eb707e4fcc886c595b71fc1c8d9a93b7763a4b;hpb=7bb96595ee11acda44bdeda400e356d4044e072e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/threadengines/threadengine_win32.cpp b/src/threadengines/threadengine_win32.cpp
index 33eb707e4..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)
 	{
@@ -71,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);
@@ -80,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);