X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=ec528571bba2f15028daafadc5362d13a8511949;hb=fd1d19d6345943ecdb5ce4ef947f9b3c5c8bca86;hp=5f2da23419b2db00b86cff7549f82479c0919832;hpb=1638ee61936bc91758be39c3463c6e46d0d655e7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 5f2da2341..ec528571b 100644
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -26,6 +26,7 @@
 #include "socket.h"
 #include "inspstring.h"
 #include "socketengine.h"
+#include "iohook.h"
 
 #ifndef DISABLE_WRITEV
 #include <sys/uio.h>
@@ -98,7 +99,7 @@ BufferedSocketError BufferedSocket::BeginConnect(const irc::sockets::sockaddrs&
 
 	ServerInstance->SE->NonBlocking(fd);
 
-	if (ServerInstance->SE->Connect(this, &dest.sa, sa_size(dest)) == -1)
+	if (ServerInstance->SE->Connect(this, &dest.sa, dest.sa_size()) == -1)
 	{
 		if (errno != EINPROGRESS)
 			return I_ERR_CONNECT;
@@ -112,7 +113,7 @@ BufferedSocketError BufferedSocket::BeginConnect(const irc::sockets::sockaddrs&
 	this->Timeout = new SocketTimeout(this->GetFd(), this, timeout, ServerInstance->Time());
 	ServerInstance->Timers->AddTimer(this->Timeout);
 
-	ServerInstance->Logs->Log("SOCKET", LOG_DEBUG,"BufferedSocket::DoConnect success");
+	ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BufferedSocket::DoConnect success");
 	return I_ERR_NONE;
 }
 
@@ -122,18 +123,18 @@ void StreamSocket::Close()
 	{
 		// final chance, dump as much of the sendq as we can
 		DoWrite();
-		if (IOHook)
+		if (GetIOHook())
 		{
 			try
 			{
-				IOHook->OnStreamSocketClose(this);
+				GetIOHook()->OnStreamSocketClose(this);
 			}
 			catch (CoreException& modexcept)
 			{
-				ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT,"%s threw an exception: %s",
+				ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "%s threw an exception: %s",
 					modexcept.GetSource(), modexcept.GetReason());
 			}
-			IOHook = NULL;
+			DelIOHook();
 		}
 		ServerInstance->SE->Shutdown(this, 2);
 		ServerInstance->SE->DelFd(this);
@@ -161,12 +162,12 @@ bool StreamSocket::GetNextLine(std::string& line, char delim)
 
 void StreamSocket::DoRead()
 {
-	if (IOHook)
+	if (GetIOHook())
 	{
 		int rv = -1;
 		try
 		{
-			rv = IOHook->OnStreamSocketRead(this, recvq);
+			rv = GetIOHook()->OnStreamSocketRead(this, recvq);
 		}
 		catch (CoreException& modexcept)
 		{
@@ -200,7 +201,7 @@ void StreamSocket::DoRead()
 			error = "Connection closed";
 			ServerInstance->SE->ChangeEventMask(this, FD_WANT_NO_READ | FD_WANT_NO_WRITE);
 		}
-		else if (errno == EAGAIN)
+		else if (SocketEngine::IgnoreError())
 		{
 			ServerInstance->SE->ChangeEventMask(this, FD_WANT_FAST_READ | FD_READ_WILL_BLOCK);
 		}
@@ -230,7 +231,7 @@ void StreamSocket::DoWrite()
 	}
 
 #ifndef DISABLE_WRITEV
-	if (IOHook)
+	if (GetIOHook())
 #endif
 	{
 		int rv = -1;
@@ -256,9 +257,9 @@ void StreamSocket::DoWrite()
 				}
 				std::string& front = sendq.front();
 				int itemlen = front.length();
-				if (IOHook)
+				if (GetIOHook())
 				{
-					rv = IOHook->OnStreamSocketWrite(this, front);
+					rv = GetIOHook()->OnStreamSocketWrite(this, front);
 					if (rv > 0)
 					{
 						// consumed the entire string, and is ready for more
@@ -291,7 +292,7 @@ void StreamSocket::DoWrite()
 					}
 					else if (rv < 0)
 					{
-						if (errno == EAGAIN || errno == EINTR)
+						if (errno == EINTR || SocketEngine::IgnoreError())
 							ServerInstance->SE->ChangeEventMask(this, FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK);
 						else
 							SetError(strerror(errno));
@@ -317,7 +318,7 @@ void StreamSocket::DoWrite()
 		}
 		catch (CoreException& modexcept)
 		{
-			ServerInstance->Logs->Log("SOCKET", LOG_DEBUG,"%s threw an exception: %s",
+			ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "%s threw an exception: %s",
 				modexcept.GetSource(), modexcept.GetReason());
 		}
 	}
@@ -388,7 +389,7 @@ void StreamSocket::DoWrite()
 			{
 				error = "Connection closed";
 			}
-			else if (errno == EAGAIN)
+			else if (SocketEngine::IgnoreError())
 			{
 				eventChange = FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK;
 			}
@@ -433,7 +434,7 @@ void StreamSocket::WriteData(const std::string &data)
 
 bool SocketTimeout::Tick(time_t)
 {
-	ServerInstance->Logs->Log("SOCKET", LOG_DEBUG,"SocketTimeout::Tick");
+	ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "SocketTimeout::Tick");
 
 	if (ServerInstance->SE->GetRef(this->sfd) != this->sock)
 		return false;