X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=f22645168499d686178b680b504c218fe3184577;hb=467b276d9d0407ec412262525c43c28d47fdae2f;hp=1326093b9d5f8aaa3c25df0af083036aa3a70f8d;hpb=81e644a40b7eead5402fe38ccb7f076b54344911;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 1326093b9..f22645168 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>
@@ -47,7 +48,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)
@@ -56,7 +57,7 @@ void BufferedSocket::DoConnect(const std::string &ipaddr, int aport, unsigned lo
 	if (err != I_ERR_NONE)
 	{
 		state = I_ERROR;
-		SetError(strerror(errno));
+		SetError(SocketEngine::LastError());
 		OnError(err);
 	}
 }
@@ -66,7 +67,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 +93,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 +107,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);
+	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 +123,22 @@ 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", DEFAULT,"%s threw an exception: %s",
-					modexcept.GetSource(), modexcept.GetReason());
+				ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "%s threw an exception: %s",
+					modexcept.GetSource().c_str(), modexcept.GetReason().c_str());
 			}
-			IOHook = NULL;
+			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);
 	}
 }
 
@@ -161,17 +161,17 @@ 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)
 		{
-			ServerInstance->Logs->Log("SOCKET", DEFAULT, "%s threw an exception: %s",
-				modexcept.GetSource(), modexcept.GetReason());
+			ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "%s threw an exception: %s",
+				modexcept.GetSource().c_str(), modexcept.GetReason().c_str());
 			return;
 		}
 		if (rv > 0)
@@ -182,36 +182,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 (errno == EAGAIN)
+		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 = strerror(errno);
-			ServerInstance->SE->ChangeEventMask(this, FD_WANT_NO_READ | FD_WANT_NO_WRITE);
+			error = SocketEngine::LastError();
+			SocketEngine::ChangeEventMask(this, FD_WANT_NO_READ | FD_WANT_NO_WRITE);
 		}
 	}
 }
@@ -225,12 +225,12 @@ void StreamSocket::DoWrite()
 		return;
 	if (!error.empty() || fd < 0 || fd == INT_MAX)
 	{
-		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)
+	if (GetIOHook())
 #endif
 	{
 		int rv = -1;
@@ -248,17 +248,19 @@ void StreamSocket::DoWrite()
 					// The length limit of 1024 is to prevent merging strings
 					// more than once when writes begin to block.
 					std::string tmp;
-					tmp.reserve(sendq_len);
-					for(unsigned int i=0; i < sendq.size(); i++)
-						tmp.append(sendq[i]);
-					sendq.clear();
-					sendq.push_back(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)
+				if (GetIOHook())
 				{
-					rv = IOHook->OnStreamSocketWrite(this, front);
+					rv = GetIOHook()->OnStreamSocketWrite(this, front);
 					if (rv > 0)
 					{
 						// consumed the entire string, and is ready for more
@@ -283,7 +285,7 @@ void StreamSocket::DoWrite()
 #ifdef DISABLE_WRITEV
 				else
 				{
-					rv = ServerInstance->SE->Send(this, front.data(), itemlen, 0);
+					rv = SocketEngine::Send(this, front.data(), itemlen, 0);
 					if (rv == 0)
 					{
 						SetError("Connection closed");
@@ -291,16 +293,16 @@ void StreamSocket::DoWrite()
 					}
 					else if (rv < 0)
 					{
-						if (errno == EAGAIN || errno == EINTR)
-							ServerInstance->SE->ChangeEventMask(this, FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK);
+						if (errno == EINTR || SocketEngine::IgnoreError())
+							SocketEngine::ChangeEventMask(this, FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK);
 						else
-							SetError(strerror(errno));
+							SetError(SocketEngine::LastError());
 						return;
 					}
 					else if (rv < itemlen)
 					{
-						ServerInstance->SE->ChangeEventMask(this, FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK);
-						front = front.substr(itemlen - rv);
+						SocketEngine::ChangeEventMask(this, FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK);
+						front = front.substr(rv);
 						sendq_len -= rv;
 						return;
 					}
@@ -309,7 +311,7 @@ void StreamSocket::DoWrite()
 						sendq_len -= itemlen;
 						sendq.pop_front();
 						if (sendq.empty())
-							ServerInstance->SE->ChangeEventMask(this, FD_WANT_EDGE_WRITE);
+							SocketEngine::ChangeEventMask(this, FD_WANT_EDGE_WRITE);
 					}
 				}
 #endif
@@ -317,8 +319,8 @@ void StreamSocket::DoWrite()
 		}
 		catch (CoreException& modexcept)
 		{
-			ServerInstance->Logs->Log("SOCKET", DEBUG,"%s threw an exception: %s",
-				modexcept.GetSource(), modexcept.GetReason());
+			ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "%s threw an exception: %s",
+				modexcept.GetSource().c_str(), modexcept.GetReason().c_str());
 		}
 	}
 #ifndef DISABLE_WRITEV
@@ -388,7 +390,7 @@ void StreamSocket::DoWrite()
 			{
 				error = "Connection closed";
 			}
-			else if (errno == EAGAIN)
+			else if (SocketEngine::IgnoreError())
 			{
 				eventChange = FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK;
 			}
@@ -399,17 +401,17 @@ void StreamSocket::DoWrite()
 			}
 			else
 			{
-				error = strerror(errno);
+				error = SocketEngine::LastError();
 			}
 		}
 		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
@@ -419,7 +421,7 @@ 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;
 	}
@@ -428,15 +430,18 @@ void StreamSocket::WriteData(const std::string &data)
 	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)
 	{
@@ -452,6 +457,8 @@ void SocketTimeout::Tick(time_t)
 	}
 
 	this->sock->Timeout = NULL;
+	delete this;
+	return false;
 }
 
 void BufferedSocket::OnConnected() { }
@@ -463,10 +470,8 @@ void BufferedSocket::DoWrite()
 	{
 		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();
 }
@@ -476,8 +481,8 @@ BufferedSocket::~BufferedSocket()
 	this->Close();
 	if (Timeout)
 	{
-		ServerInstance->Timers->DelTimer(Timeout);
-		Timeout = NULL;
+		// The timer is removed from the TimerManager in Timer::~Timer()
+		delete Timeout;
 	}
 }
 
@@ -494,7 +499,7 @@ void StreamSocket::HandleEvent(EventType et, int errornum)
 				if (errornum == 0)
 					SetError("Connection closed");
 				else
-					SetError(strerror(errornum));
+					SetError(SocketEngine::GetError(errornum));
 				switch (errornum)
 				{
 					case ETIMEDOUT:
@@ -528,14 +533,13 @@ void StreamSocket::HandleEvent(EventType et, int errornum)
 	}
 	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());
 	}
 	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);
 	}
 }
-