1 files changed, 26 insertions, 21 deletions

diff --git a/src/threadengines/threadengine_win32.cpp b/src/threadengines/threadengine_win32.cpp
index ea37892f8..0f0d1f277 100644
--- a/src/threadengines/threadengine_win32.cpp
+++ b/src/threadengines/threadengine_win32.cpp
@@ -21,33 +21,19 @@
 #include "inspircd.h"
 #include "threadengines/threadengine_win32.h"
 
-ThreadEngine::ThreadEngine()
-{
-}
-
 void ThreadEngine::Start(Thread* thread)
 {
-	ThreadData* data = new ThreadData;
-	thread->state = data;
-
-	DWORD ThreadId = 0;
-	data->handle = CreateThread(NULL,0,ThreadEngine::Entry,thread,0,&ThreadId);
+	thread->state.handle = CreateThread(NULL, 0, ThreadEngine::Entry, thread, 0, NULL);
 
-	if (data->handle == NULL)
+	if (thread->state.handle == NULL)
 	{
 		DWORD lasterr = GetLastError();
-		thread->state = NULL;
-		delete data;
 		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);
@@ -55,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);
 }
@@ -83,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);
@@ -92,22 +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);
-	ServerInstance->SE->Blocking(listenFD);
+	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;
 }