1 files changed, 121 insertions, 228 deletions

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 356904f74..89c3a71a9 100644
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -23,17 +23,7 @@
 
 
 #include "inspircd.h"
-#include "socket.h"
-#include "inspstring.h"
-#include "socketengine.h"
-
-#ifndef DISABLE_WRITEV
-#include <sys/uio.h>
-#endif
-
-#ifndef IOV_MAX
-#define IOV_MAX 1024
-#endif
+#include "iohook.h"
 
 BufferedSocket::BufferedSocket()
 {
@@ -47,7 +37,7 @@ BufferedSocket::BufferedSocket(int newfd)
 	this->fd = newfd;
 	this->state = I_CONNECTED;
 	if (fd > -1)
-		ServerInstance->SE->AddFd(this, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE);
+		SocketEngine::AddFd(this, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE);
 }
 
 void BufferedSocket::DoConnect(const std::string &ipaddr, int aport, unsigned long maxtime, const std::string &connectbindip)
@@ -66,7 +56,7 @@ BufferedSocketError BufferedSocket::BeginConnect(const std::string &ipaddr, int
 	irc::sockets::sockaddrs addr, bind;
 	if (!irc::sockets::aptosa(ipaddr, aport, addr))
 	{
-		ServerInstance->Logs->Log("SOCKET", DEBUG, "BUG: Hostname passed to BufferedSocket, rather than an IP address!");
+		ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BUG: Hostname passed to BufferedSocket, rather than an IP address!");
 		return I_ERR_CONNECT;
 	}
 
@@ -92,13 +82,13 @@ BufferedSocketError BufferedSocket::BeginConnect(const irc::sockets::sockaddrs&
 
 	if (bind.sa.sa_family != 0)
 	{
-		if (ServerInstance->SE->Bind(fd, bind) < 0)
+		if (SocketEngine::Bind(fd, bind) < 0)
 			return I_ERR_BIND;
 	}
 
-	ServerInstance->SE->NonBlocking(fd);
+	SocketEngine::NonBlocking(fd);
 
-	if (ServerInstance->SE->Connect(this, &dest.sa, sa_size(dest)) == -1)
+	if (SocketEngine::Connect(this, &dest.sa, dest.sa_size()) == -1)
 	{
 		if (errno != EINPROGRESS)
 			return I_ERR_CONNECT;
@@ -106,13 +96,13 @@ BufferedSocketError BufferedSocket::BeginConnect(const irc::sockets::sockaddrs&
 
 	this->state = I_CONNECTING;
 
-	if (!ServerInstance->SE->AddFd(this, FD_WANT_NO_READ | FD_WANT_SINGLE_WRITE | FD_WRITE_WILL_BLOCK))
+	if (!SocketEngine::AddFd(this, FD_WANT_NO_READ | FD_WANT_SINGLE_WRITE | FD_WRITE_WILL_BLOCK))
 		return I_ERR_NOMOREFDS;
 
-	this->Timeout = new SocketTimeout(this->GetFd(), this, timeout, ServerInstance->Time());
-	ServerInstance->Timers->AddTimer(this->Timeout);
+	this->Timeout = new SocketTimeout(this->GetFd(), this, timeout);
+	ServerInstance->Timers.AddTimer(this->Timeout);
 
-	ServerInstance->Logs->Log("SOCKET", DEBUG,"BufferedSocket::DoConnect success");
+	ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BufferedSocket::DoConnect success");
 	return I_ERR_NONE;
 }
 
@@ -122,23 +112,14 @@ void StreamSocket::Close()
 	{
 		// final chance, dump as much of the sendq as we can
 		DoWrite();
-		if (IOHook)
+		if (GetIOHook())
 		{
-			try
-			{
-				IOHook->OnStreamSocketClose(this);
-			}
-			catch (CoreException& modexcept)
-			{
-				ServerInstance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s",
-					modexcept.GetSource(), modexcept.GetReason());
-			}
-			IOHook = NULL;
+			GetIOHook()->OnStreamSocketClose(this);
+			delete iohook;
+			DelIOHook();
 		}
-		ServerInstance->SE->Shutdown(this, 2);
-		ServerInstance->SE->DelFd(this);
-		ServerInstance->SE->Close(this);
-		fd = -1;
+		SocketEngine::Shutdown(this, 2);
+		SocketEngine::Close(this);
 	}
 }
 
@@ -153,27 +134,16 @@ bool StreamSocket::GetNextLine(std::string& line, char delim)
 	std::string::size_type i = recvq.find(delim);
 	if (i == std::string::npos)
 		return false;
-	line = recvq.substr(0, i);
-	// TODO is this the most efficient way to split?
-	recvq = recvq.substr(i + 1);
+	line.assign(recvq, 0, i);
+	recvq.erase(0, i + 1);
 	return true;
 }
 
 void StreamSocket::DoRead()
 {
-	if (IOHook)
+	if (GetIOHook())
 	{
-		int rv = -1;
-		try
-		{
-			rv = IOHook->OnStreamSocketRead(this, recvq);
-		}
-		catch (CoreException& modexcept)
-		{
-			ServerInstance->Logs->Log("SOCKET", DEFAULT, "%s threw an exception: %s",
-				modexcept.GetSource(), modexcept.GetReason());
-			return;
-		}
+		int rv = GetIOHook()->OnStreamSocketRead(this, recvq);
 		if (rv > 0)
 			OnDataReady();
 		if (rv < 0)
@@ -182,36 +152,36 @@ void StreamSocket::DoRead()
 	else
 	{
 		char* ReadBuffer = ServerInstance->GetReadBuffer();
-		int n = ServerInstance->SE->Recv(this, ReadBuffer, ServerInstance->Config->NetBufferSize, 0);
+		int n = SocketEngine::Recv(this, ReadBuffer, ServerInstance->Config->NetBufferSize, 0);
 		if (n == ServerInstance->Config->NetBufferSize)
 		{
-			ServerInstance->SE->ChangeEventMask(this, FD_WANT_FAST_READ | FD_ADD_TRIAL_READ);
+			SocketEngine::ChangeEventMask(this, FD_WANT_FAST_READ | FD_ADD_TRIAL_READ);
 			recvq.append(ReadBuffer, n);
 			OnDataReady();
 		}
 		else if (n > 0)
 		{
-			ServerInstance->SE->ChangeEventMask(this, FD_WANT_FAST_READ);
+			SocketEngine::ChangeEventMask(this, FD_WANT_FAST_READ);
 			recvq.append(ReadBuffer, n);
 			OnDataReady();
 		}
 		else if (n == 0)
 		{
 			error = "Connection closed";
-			ServerInstance->SE->ChangeEventMask(this, FD_WANT_NO_READ | FD_WANT_NO_WRITE);
+			SocketEngine::ChangeEventMask(this, FD_WANT_NO_READ | FD_WANT_NO_WRITE);
 		}
 		else if (SocketEngine::IgnoreError())
 		{
-			ServerInstance->SE->ChangeEventMask(this, FD_WANT_FAST_READ | FD_READ_WILL_BLOCK);
+			SocketEngine::ChangeEventMask(this, FD_WANT_FAST_READ | FD_READ_WILL_BLOCK);
 		}
 		else if (errno == EINTR)
 		{
-			ServerInstance->SE->ChangeEventMask(this, FD_WANT_FAST_READ | FD_ADD_TRIAL_READ);
+			SocketEngine::ChangeEventMask(this, FD_WANT_FAST_READ | FD_ADD_TRIAL_READ);
 		}
 		else
 		{
 			error = SocketEngine::LastError();
-			ServerInstance->SE->ChangeEventMask(this, FD_WANT_NO_READ | FD_WANT_NO_WRITE);
+			SocketEngine::ChangeEventMask(this, FD_WANT_NO_READ | FD_WANT_NO_WRITE);
 		}
 	}
 }
@@ -223,107 +193,21 @@ void StreamSocket::DoWrite()
 {
 	if (sendq.empty())
 		return;
-	if (!error.empty() || fd < 0 || fd == INT_MAX)
+	if (!error.empty() || fd < 0)
 	{
-		ServerInstance->Logs->Log("SOCKET", DEBUG, "DoWrite on errored or closed socket");
+		ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "DoWrite on errored or closed socket");
 		return;
 	}
 
-#ifndef DISABLE_WRITEV
-	if (IOHook)
-#endif
+	if (GetIOHook())
 	{
-		int rv = -1;
-		try
-		{
-			while (error.empty() && !sendq.empty())
-			{
-				if (sendq.size() > 1 && sendq[0].length() < 1024)
-				{
-					// Avoid multiple repeated SSL encryption invocations
-					// This adds a single copy of the queue, but avoids
-					// much more overhead in terms of system calls invoked
-					// by the IOHook.
-					//
-					// The length limit of 1024 is to prevent merging strings
-					// more than once when writes begin to block.
-					std::string tmp;
-					tmp.reserve(1280);
-					while (!sendq.empty() && tmp.length() < 1024)
-					{
-						tmp.append(sendq.front());
-						sendq.pop_front();
-					}
-					sendq.push_front(tmp);
-				}
-				std::string& front = sendq.front();
-				int itemlen = front.length();
-				if (IOHook)
-				{
-					rv = IOHook->OnStreamSocketWrite(this, front);
-					if (rv > 0)
-					{
-						// consumed the entire string, and is ready for more
-						sendq_len -= itemlen;
-						sendq.pop_front();
-					}
-					else if (rv == 0)
-					{
-						// socket has blocked. Stop trying to send data.
-						// IOHook has requested unblock notification from the socketengine
+		int rv = GetIOHook()->OnStreamSocketWrite(this);
+		if (rv < 0)
+			SetError("Write Error"); // will not overwrite a better error message
 
-						// Since it is possible that a partial write took place, adjust sendq_len
-						sendq_len = sendq_len - itemlen + front.length();
-						return;
-					}
-					else
-					{
-						SetError("Write Error"); // will not overwrite a better error message
-						return;
-					}
-				}
-#ifdef DISABLE_WRITEV
-				else
-				{
-					rv = ServerInstance->SE->Send(this, front.data(), itemlen, 0);
-					if (rv == 0)
-					{
-						SetError("Connection closed");
-						return;
-					}
-					else if (rv < 0)
-					{
-						if (errno == EINTR || SocketEngine::IgnoreError())
-							ServerInstance->SE->ChangeEventMask(this, FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK);
-						else
-							SetError(SocketEngine::LastError());
-						return;
-					}
-					else if (rv < itemlen)
-					{
-						ServerInstance->SE->ChangeEventMask(this, FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK);
-						front = front.substr(rv);
-						sendq_len -= rv;
-						return;
-					}
-					else
-					{
-						sendq_len -= itemlen;
-						sendq.pop_front();
-						if (sendq.empty())
-							ServerInstance->SE->ChangeEventMask(this, FD_WANT_EDGE_WRITE);
-					}
-				}
-#endif
-			}
-		}
-		catch (CoreException& modexcept)
-		{
-			ServerInstance->Logs->Log("SOCKET", DEBUG,"%s threw an exception: %s",
-				modexcept.GetSource(), modexcept.GetReason());
-		}
+		// rv == 0 means the socket has blocked. Stop trying to send data.
+		// IOHook has requested unblock notification from the socketengine.
 	}
-#ifndef DISABLE_WRITEV
 	else
 	{
 		// don't even try if we are known to be blocking
@@ -331,7 +215,7 @@ void StreamSocket::DoWrite()
 			return;
 		// start out optimistic - we won't need to write any more
 		int eventChange = FD_WANT_EDGE_WRITE;
-		while (error.empty() && sendq_len && eventChange == FD_WANT_EDGE_WRITE)
+		while (error.empty() && !sendq.empty() && eventChange == FD_WANT_EDGE_WRITE)
 		{
 			// Prepare a writev() call to write all buffers efficiently
 			int bufcount = sendq.size();
@@ -343,21 +227,24 @@ void StreamSocket::DoWrite()
 			}
 
 			int rv_max = 0;
-			iovec* iovecs = new iovec[bufcount];
-			for(int i=0; i < bufcount; i++)
+			int rv;
 			{
-				iovecs[i].iov_base = const_cast<char*>(sendq[i].data());
-				iovecs[i].iov_len = sendq[i].length();
-				rv_max += sendq[i].length();
+				SocketEngine::IOVector iovecs[MYIOV_MAX];
+				size_t j = 0;
+				for (SendQueue::const_iterator i = sendq.begin(), end = i+bufcount; i != end; ++i, j++)
+				{
+					const SendQueue::Element& elem = *i;
+					iovecs[j].iov_base = const_cast<char*>(elem.data());
+					iovecs[j].iov_len = elem.length();
+					rv_max += elem.length();
+				}
+				rv = SocketEngine::WriteV(this, iovecs, bufcount);
 			}
-			int rv = writev(fd, iovecs, bufcount);
-			delete[] iovecs;
 
-			if (rv == (int)sendq_len)
+			if (rv == (int)sendq.bytes())
 			{
 				// it's our lucky day, everything got written out. Fast cleanup.
 				// This won't ever happen if the number of buffers got capped.
-				sendq_len = 0;
 				sendq.clear();
 			}
 			else if (rv > 0)
@@ -368,10 +255,9 @@ void StreamSocket::DoWrite()
 					// it's going to block now
 					eventChange = FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK;
 				}
-				sendq_len -= rv;
 				while (rv > 0 && !sendq.empty())
 				{
-					std::string& front = sendq.front();
+					const SendQueue::Element& front = sendq.front();
 					if (front.length() <= (size_t)rv)
 					{
 						// this string got fully written out
@@ -381,7 +267,7 @@ void StreamSocket::DoWrite()
 					else
 					{
 						// stopped in the middle of this string
-						front = front.substr(rv);
+						sendq.erase_front(rv);
 						rv = 0;
 					}
 				}
@@ -407,38 +293,39 @@ void StreamSocket::DoWrite()
 		if (!error.empty())
 		{
 			// error - kill all events
-			ServerInstance->SE->ChangeEventMask(this, FD_WANT_NO_READ | FD_WANT_NO_WRITE);
+			SocketEngine::ChangeEventMask(this, FD_WANT_NO_READ | FD_WANT_NO_WRITE);
 		}
 		else
 		{
-			ServerInstance->SE->ChangeEventMask(this, eventChange);
+			SocketEngine::ChangeEventMask(this, eventChange);
 		}
 	}
-#endif
 }
 
 void StreamSocket::WriteData(const std::string &data)
 {
 	if (fd < 0)
 	{
-		ServerInstance->Logs->Log("SOCKET", DEBUG, "Attempt to write data to dead socket: %s",
+		ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Attempt to write data to dead socket: %s",
 			data.c_str());
 		return;
 	}
 
 	/* Append the data to the back of the queue ready for writing */
 	sendq.push_back(data);
-	sendq_len += data.length();
 
-	ServerInstance->SE->ChangeEventMask(this, FD_ADD_TRIAL_WRITE);
+	SocketEngine::ChangeEventMask(this, FD_ADD_TRIAL_WRITE);
 }
 
-void SocketTimeout::Tick(time_t)
+bool SocketTimeout::Tick(time_t)
 {
-	ServerInstance->Logs->Log("SOCKET", DEBUG,"SocketTimeout::Tick");
+	ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "SocketTimeout::Tick");
 
-	if (ServerInstance->SE->GetRef(this->sfd) != this->sock)
-		return;
+	if (SocketEngine::GetRef(this->sfd) != this->sock)
+	{
+		delete this;
+		return false;
+	}
 
 	if (this->sock->state == I_CONNECTING)
 	{
@@ -454,90 +341,96 @@ void SocketTimeout::Tick(time_t)
 	}
 
 	this->sock->Timeout = NULL;
+	delete this;
+	return false;
 }
 
 void BufferedSocket::OnConnected() { }
 void BufferedSocket::OnTimeout() { return; }
 
-void BufferedSocket::DoWrite()
+void BufferedSocket::OnEventHandlerWrite()
 {
 	if (state == I_CONNECTING)
 	{
 		state = I_CONNECTED;
 		this->OnConnected();
-		if (GetIOHook())
-			GetIOHook()->OnStreamSocketConnect(this);
-		else
-			ServerInstance->SE->ChangeEventMask(this, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE);
+		if (!GetIOHook())
+			SocketEngine::ChangeEventMask(this, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE);
 	}
-	this->StreamSocket::DoWrite();
+	this->StreamSocket::OnEventHandlerWrite();
 }
 
 BufferedSocket::~BufferedSocket()
 {
 	this->Close();
-	if (Timeout)
+	// The timer is removed from the TimerManager in Timer::~Timer()
+	delete Timeout;
+}
+
+void StreamSocket::OnEventHandlerError(int errornum)
+{
+	if (!error.empty())
+		return;
+
+	if (errornum == 0)
+		SetError("Connection closed");
+	else
+		SetError(SocketEngine::GetError(errornum));
+
+	BufferedSocketError errcode = I_ERR_OTHER;
+	switch (errornum)
 	{
-		ServerInstance->Timers->DelTimer(Timeout);
-		Timeout = NULL;
+		case ETIMEDOUT:
+			errcode = I_ERR_TIMEOUT;
+			break;
+		case ECONNREFUSED:
+		case 0:
+			errcode = I_ERR_CONNECT;
+			break;
+		case EADDRINUSE:
+			errcode = I_ERR_BIND;
+			break;
+		case EPIPE:
+		case EIO:
+			errcode = I_ERR_WRITE;
+			break;
 	}
+
+	// Log and call OnError()
+	CheckError(errcode);
 }
 
-void StreamSocket::HandleEvent(EventType et, int errornum)
+void StreamSocket::OnEventHandlerRead()
 {
 	if (!error.empty())
 		return;
-	BufferedSocketError errcode = I_ERR_OTHER;
-	try {
-		switch (et)
-		{
-			case EVENT_ERROR:
-			{
-				if (errornum == 0)
-					SetError("Connection closed");
-				else
-					SetError(SocketEngine::GetError(errornum));
-				switch (errornum)
-				{
-					case ETIMEDOUT:
-						errcode = I_ERR_TIMEOUT;
-						break;
-					case ECONNREFUSED:
-					case 0:
-						errcode = I_ERR_CONNECT;
-						break;
-					case EADDRINUSE:
-						errcode = I_ERR_BIND;
-						break;
-					case EPIPE:
-					case EIO:
-						errcode = I_ERR_WRITE;
-						break;
-				}
-				break;
-			}
-			case EVENT_READ:
-			{
-				DoRead();
-				break;
-			}
-			case EVENT_WRITE:
-			{
-				DoWrite();
-				break;
-			}
-		}
+
+	try
+	{
+		DoRead();
 	}
 	catch (CoreException& ex)
 	{
-		ServerInstance->Logs->Log("SOCKET", DEFAULT, "Caught exception in socket processing on FD %d - '%s'",
-			fd, ex.GetReason());
+		ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "Caught exception in socket processing on FD %d - '%s'", fd, ex.GetReason().c_str());
 		SetError(ex.GetReason());
 	}
+	CheckError(I_ERR_OTHER);
+}
+
+void StreamSocket::OnEventHandlerWrite()
+{
+	if (!error.empty())
+		return;
+
+	DoWrite();
+	CheckError(I_ERR_OTHER);
+}
+
+void StreamSocket::CheckError(BufferedSocketError errcode)
+{
 	if (!error.empty())
 	{
-		ServerInstance->Logs->Log("SOCKET", DEBUG, "Error on FD %d - '%s'", fd, error.c_str());
+		ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Error on FD %d - '%s'", fd, error.c_str());
 		OnError(errcode);
 	}
 }
-