Fixed pipe and win32 socketengine builds

1 files changed, 29 insertions, 12 deletions

diff --git a/src/socketengines/socketengine_pipe.cpp b/src/socketengines/socketengine_pipe.cpp
index 21a558d66..9d5b47154 100644
--- a/src/socketengines/socketengine_pipe.cpp
+++ b/src/socketengines/socketengine_pipe.cpp
@@ -1,17 +1,33 @@
 #include "services.h"
 
-int Pipe::RecvInternal(char *buf, size_t sz) const
+class PipeIO : public SocketIO
 {
-	static char dummy[512];
-	while (read(this->Sock, &dummy, 512) == 512);
-	return 0;
-}
+ public:
+	/** Receive something from the buffer
+ 	 * @param s The socket
+	 * @param buf The buf to read to
+	 * @param sz How much to read
+	 * @return Number of bytes received
+	 */
+	int Recv(Socket *s, char *buf, size_t sz) const
+	{
+		static char dummy[512];
+		while (read(s->GetFD(), &dummy, 512) == 512);
+		return 0;
+	}
 
-int Pipe::SendInternal(const Anope::string &) const
-{
-	static const char dummy = '*';
-	return write(this->WritePipe, &dummy, 1);
-}
+	/** Write something to the socket
+ 	 * @param s The socket
+	 * @param buf What to write
+	 * @return Number of bytes written
+	 */
+	int Send(Socket *s, const Anope::string &buf) const
+	{
+		static const char dummy = '*';
+		Pipe *pipe = debug_cast<Pipe *>(s);
+		return write(pipe->WritePipe, &dummy, 1);
+	}
+} pipeSocketIO;
 
 Pipe::Pipe() : BufferedSocket()
 {
@@ -23,6 +39,7 @@ Pipe::Pipe() : BufferedSocket()
 	flags = fcntl(fds[1], F_GETFL, 0);
 	fcntl(fds[1], F_SETFL, flags | O_NONBLOCK);
 
+	this->IO = &pipeSocketIO;
 	this->Sock = fds[0];
 	this->WritePipe = fds[1];
 	this->IPv6 = false;
@@ -32,7 +49,7 @@ Pipe::Pipe() : BufferedSocket()
 
 bool Pipe::ProcessRead()
 {
-	this->RecvInternal(NULL, 0);
+	this->IO->Recv(this, NULL, 0);
 	return this->Read("");
 }
 
@@ -44,7 +61,7 @@ bool Pipe::Read(const Anope::string &)
 
 void Pipe::Notify()
 {
-	this->SendInternal("");
+	this->IO->Send(this, "");
 }
 
 void Pipe::OnNotify()