Windows

3 files changed, 10 insertions, 58 deletions

diff --git a/src/socketengines/pipeengine_pipe.cpp b/src/socketengines/pipeengine_pipe.cpp
index f2fa0876a..7901931c8 100644
--- a/src/socketengines/pipeengine_pipe.cpp
+++ b/src/socketengines/pipeengine_pipe.cpp
@@ -10,7 +10,7 @@ Pipe::Pipe() : Socket(-1), WritePipe(-1)
 	flags = fcntl(fds[1], F_GETFL, 0);
 	fcntl(fds[1], F_SETFL, flags | O_NONBLOCK);
 
-	this->~Socket();
+	this->~Pipe();
 
 	this->Sock = fds[0];
 	this->WritePipe = fds[1];
@@ -20,13 +20,14 @@ Pipe::Pipe() : Socket(-1), WritePipe(-1)
 
 Pipe::~Pipe()
 {
-	CloseSocket(this->WritePipe);
+	if (this->WritePipe >= 0)
+		close(this->WritePipe);
 }
 
 bool Pipe::ProcessRead()
 {
 	char dummy[512];
-	while (read(this->GetFD(), &dummy, 512) == 512);
+	while (read(this->GetFD(), dummy, 512) == 512);
 	this->OnNotify();
 	return true;
 }
@@ -40,4 +41,3 @@ void Pipe::Notify()
 void Pipe::OnNotify()
 {
 }
-
diff --git a/src/socketengines/pipeengine_win32.cpp b/src/socketengines/pipeengine_win32.cpp
deleted file mode 100644
index f34472870..000000000
--- a/src/socketengines/pipeengine_win32.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-#include "services.h"
-
-Pipe::Pipe() : Socket(-1)
-{
-	sockaddrs localhost;
-
-	localhost.pton(AF_INET, "127.0.0.1");
-
-	int cfd = socket(AF_INET, SOCK_STREAM, 0), lfd = socket(AF_INET, SOCK_STREAM, 0);
-	if (cfd == -1)
-		throw CoreException("Error accepting new socket for Pipe");
-	
-	if (bind(lfd, &localhost.sa, localhost.size()) == -1)
-		throw CoreException("Error accepting new socket for Pipe");
-	if (listen(lfd, 1) == -1)
-		throw CoreException("Error accepting new socket for Pipe");
-
-	sockaddrs lfd_addr;
-	socklen_t sz = sizeof(lfd_addr);
-	getsockname(lfd, &lfd_addr.sa, &sz);
-
-	if (connect(cfd, &lfd_addr.sa, lfd_addr.size()))
-		throw CoreException("Error accepting new socket for Pipe");
-	CloseSocket(lfd);
-	
-	this->WritePipe = cfd;
-
-	SocketEngine::AddSocket(this);
-}
-
-Pipe::~Pipe()
-{
-	CloseSocket(this->WritePipe);
-}
-
-bool Pipe::ProcessRead()
-{
-	char dummy[512];
-	while (recv(this->GetFD(), dummy, 512, 0) == 512);
-	this->OnNotify();
-	return true;
-}
-
-void Pipe::Notify()
-{
-	const char dummy = '*';
-	send(this->WritePipe, &dummy, 1, 0);
-}
-
-void Pipe::OnNotify()
-{
-}
-
diff --git a/src/socketengines/socketengine_select.cpp b/src/socketengines/socketengine_select.cpp
index 663cdd9ca..89a5c47c3 100644
--- a/src/socketengines/socketengine_select.cpp
+++ b/src/socketengines/socketengine_select.cpp
@@ -1,5 +1,10 @@
 #include "module.h"
 
+#ifdef _AIX
+# undef FD_ZERO
+# define FD_ZERO(p) memset((p), 0, sizeof(*(p)))
+#endif /* _AIX */
+
 static int MaxFD;
 static unsigned FDCount;
 static fd_set ReadFDs;
@@ -77,7 +82,7 @@ void SocketEngine::Process()
 	 */
 	if (FDCount == 0)
 	{
-		sleep(Config->ReadTimeout);
+		sleep(tval.tv_sec);
 		return;
 	}
 #endif