X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=7ddd774954f913e13cb196e861ba2f44814fe559;hb=f757c2d75bc284211f3b53b2819b88becfd8632f;hp=ee5287e5f33888e0cd24b46f0ce68979cf2d33f9;hpb=3ccae741b8c60acc2d95f2dc54d7e69014090807;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index ee5287e5f..7ddd77495 100644
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -25,14 +25,6 @@
 #include "inspircd.h"
 #include "iohook.h"
 
-#ifndef DISABLE_WRITEV
-#include <sys/uio.h>
-#endif
-
-#ifndef IOV_MAX
-#define IOV_MAX 1024
-#endif
-
 BufferedSocket::BufferedSocket()
 {
 	Timeout = NULL;
@@ -122,15 +114,7 @@ void StreamSocket::Close()
 		DoWrite();
 		if (GetIOHook())
 		{
-			try
-			{
-				GetIOHook()->OnStreamSocketClose(this);
-			}
-			catch (CoreException& modexcept)
-			{
-				ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "%s threw an exception: %s",
-					modexcept.GetSource().c_str(), modexcept.GetReason().c_str());
-			}
+			GetIOHook()->OnStreamSocketClose(this);
 			delete iohook;
 			DelIOHook();
 		}
@@ -159,17 +143,7 @@ void StreamSocket::DoRead()
 {
 	if (GetIOHook())
 	{
-		int rv = -1;
-		try
-		{
-			rv = GetIOHook()->OnStreamSocketRead(this, recvq);
-		}
-		catch (CoreException& modexcept)
-		{
-			ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "%s threw an exception: %s",
-				modexcept.GetSource().c_str(), modexcept.GetReason().c_str());
-			return;
-		}
+		int rv = GetIOHook()->OnStreamSocketRead(this, recvq);
 		if (rv > 0)
 			OnDataReady();
 		if (rv < 0)
@@ -225,12 +199,8 @@ void StreamSocket::DoWrite()
 		return;
 	}
 
-#ifndef DISABLE_WRITEV
 	if (GetIOHook())
-#endif
 	{
-		int rv = -1;
-		try
 		{
 			while (error.empty() && !sendq.empty())
 			{
@@ -254,9 +224,9 @@ void StreamSocket::DoWrite()
 				}
 				std::string& front = sendq.front();
 				int itemlen = front.length();
-				if (GetIOHook())
+
 				{
-					rv = GetIOHook()->OnStreamSocketWrite(this, front);
+					int rv = GetIOHook()->OnStreamSocketWrite(this, front);
 					if (rv > 0)
 					{
 						// consumed the entire string, and is ready for more
@@ -278,48 +248,9 @@ void StreamSocket::DoWrite()
 						return;
 					}
 				}
-#ifdef DISABLE_WRITEV
-				else
-				{
-					rv = SocketEngine::Send(this, front.data(), itemlen, 0);
-					if (rv == 0)
-					{
-						SetError("Connection closed");
-						return;
-					}
-					else if (rv < 0)
-					{
-						if (errno == EINTR || SocketEngine::IgnoreError())
-							SocketEngine::ChangeEventMask(this, FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK);
-						else
-							SetError(SocketEngine::LastError());
-						return;
-					}
-					else if (rv < itemlen)
-					{
-						SocketEngine::ChangeEventMask(this, FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK);
-						front.erase(0, rv);
-						sendq_len -= rv;
-						return;
-					}
-					else
-					{
-						sendq_len -= itemlen;
-						sendq.pop_front();
-						if (sendq.empty())
-							SocketEngine::ChangeEventMask(this, FD_WANT_EDGE_WRITE);
-					}
-				}
-#endif
 			}
 		}
-		catch (CoreException& modexcept)
-		{
-			ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "%s threw an exception: %s",
-				modexcept.GetSource().c_str(), modexcept.GetReason().c_str());
-		}
 	}
-#ifndef DISABLE_WRITEV
 	else
 	{
 		// don't even try if we are known to be blocking
@@ -341,14 +272,14 @@ void StreamSocket::DoWrite()
 			int rv_max = 0;
 			int rv;
 			{
-				iovec iovecs[MYIOV_MAX];
+				SocketEngine::IOVector iovecs[MYIOV_MAX];
 				for (int i = 0; i < bufcount; i++)
 				{
 					iovecs[i].iov_base = const_cast<char*>(sendq[i].data());
 					iovecs[i].iov_len = sendq[i].length();
 					rv_max += sendq[i].length();
 				}
-				rv = writev(fd, iovecs, bufcount);
+				rv = SocketEngine::WriteV(this, iovecs, bufcount);
 			}
 
 			if (rv == (int)sendq_len)
@@ -412,7 +343,6 @@ void StreamSocket::DoWrite()
 			SocketEngine::ChangeEventMask(this, eventChange);
 		}
 	}
-#endif
 }
 
 void StreamSocket::WriteData(const std::string &data)
@@ -462,7 +392,7 @@ bool SocketTimeout::Tick(time_t)
 void BufferedSocket::OnConnected() { }
 void BufferedSocket::OnTimeout() { return; }
 
-void BufferedSocket::DoWrite()
+void BufferedSocket::OnEventHandlerWrite()
 {
 	if (state == I_CONNECTING)
 	{
@@ -471,7 +401,7 @@ void BufferedSocket::DoWrite()
 		if (!GetIOHook())
 			SocketEngine::ChangeEventMask(this, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE);
 	}
-	this->StreamSocket::DoWrite();
+	this->StreamSocket::OnEventHandlerWrite();
 }
 
 BufferedSocket::~BufferedSocket()
@@ -481,57 +411,67 @@ BufferedSocket::~BufferedSocket()
 	delete Timeout;
 }
 
-void StreamSocket::HandleEvent(EventType et, int errornum)
+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;
-	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;
-			}
-		}
+	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;
+	}
+
+	// Log and call OnError()
+	CheckError(errcode);
+}
+
+void StreamSocket::OnEventHandlerRead()
+{
+	if (!error.empty())
+		return;
+
+	try
+	{
+		DoRead();
 	}
 	catch (CoreException& ex)
 	{
-		ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "Caught exception in socket processing on FD %d - '%s'",
-			fd, ex.GetReason().c_str());
+		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", LOG_DEBUG, "Error on FD %d - '%s'", fd, error.c_str());