Cleaned up some of the socket code, cleaned up the pipe engines, added support for binary sockets, and cleaned up the asynch connect/accept code

1 files changed, 11 insertions, 38 deletions

diff --git a/src/socketengines/pipeengine_pipe.cpp b/src/socketengines/pipeengine_pipe.cpp
index b3ca15d87..ceaded8ea 100644
--- a/src/socketengines/pipeengine_pipe.cpp
+++ b/src/socketengines/pipeengine_pipe.cpp
@@ -1,67 +1,40 @@
 #include "services.h"
 
-class PipeIO : public SocketIO
-{
- 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)
-	{
-		static char dummy[512];
-		while (read(s->GetFD(), &dummy, 512) == 512);
-		return 0;
-	}
-
-	/** 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)
-	{
-		static const char dummy = '*';
-		Pipe *pipe = debug_cast<Pipe *>(s);
-		return write(pipe->WritePipe, &dummy, 1);
-	}
-} pipeSocketIO;
-
-Pipe::Pipe() : BufferedSocket()
+Pipe::Pipe() : Socket(-1)
 {
 	int fds[2];
 	if (pipe(fds))
-		throw CoreException(Anope::string("Could not create pipe: ") + Anope::LastError());
+		throw CoreException("Could not create pipe: " + Anope::LastError());
 	int flags = fcntl(fds[0], F_GETFL, 0);
 	fcntl(fds[0], F_SETFL, flags | O_NONBLOCK);
 	flags = fcntl(fds[1], F_GETFL, 0);
 	fcntl(fds[1], F_SETFL, flags | O_NONBLOCK);
 
-	this->IO = &pipeSocketIO;
+	this->~Socket();
+
 	this->Sock = fds[0];
 	this->WritePipe = fds[1];
-	this->IPv6 = false;
 
 	SocketEngine::AddSocket(this);
 }
 
-bool Pipe::ProcessRead()
+Pipe::~Pipe()
 {
-	this->IO->Recv(this, NULL, 0);
-	return this->Read("");
+	CloseSocket(this->WritePipe);
 }
 
-bool Pipe::Read(const Anope::string &)
+bool Pipe::ProcessRead()
 {
+	char dummy[512];
+	while (read(this->GetFD(), &dummy, 512) == 512);
 	this->OnNotify();
 	return true;
 }
 
 void Pipe::Notify()
 {
-	this->IO->Send(this, "");
+	const char dummy = '*';
+	write(this->WritePipe, &dummy, 1);
 }
 
 void Pipe::OnNotify()