X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=1fbe3b5abbc9fed6866dc098058437b38cce7ce8;hb=9d4004e8d477232c143830508a7a6e41fd2d31b7;hp=1f0aa56292704aa2e968a8f626e2b996a066ee4f;hpb=4f6589e123c0a494287f59e3bc75e34ed6e4f6d7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 1f0aa5629..1fbe3b5ab 100644
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -16,6 +16,13 @@
 #include "inspstring.h"
 #include "socketengine.h"
 
+#ifndef DISABLE_WRITEV
+#include <sys/uio.h>
+#ifndef IOV_MAX
+#define IOV_MAX 1024
+#endif
+#endif
+
 BufferedSocket::BufferedSocket()
 {
 	Timeout = NULL;
@@ -28,7 +35,7 @@ BufferedSocket::BufferedSocket(int newfd)
 	this->fd = newfd;
 	this->state = I_CONNECTED;
 	if (fd > -1)
-		ServerInstance->SE->AddFd(this);
+		ServerInstance->SE->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)
@@ -45,7 +52,7 @@ void BufferedSocket::DoConnect(const std::string &ipaddr, int aport, unsigned lo
 BufferedSocketError BufferedSocket::BeginConnect(const std::string &ipaddr, int aport, unsigned long maxtime, const std::string &connectbindip)
 {
 	irc::sockets::sockaddrs addr, bind;
-	if (!irc::sockets::aptosa(ipaddr.c_str(), aport, &addr))
+	if (!irc::sockets::aptosa(ipaddr, aport, addr))
 	{
 		ServerInstance->Logs->Log("SOCKET", DEBUG, "BUG: Hostname passed to BufferedSocket, rather than an IP address!");
 		return I_ERR_CONNECT;
@@ -54,7 +61,7 @@ BufferedSocketError BufferedSocket::BeginConnect(const std::string &ipaddr, int
 	bind.sa.sa_family = 0;
 	if (!connectbindip.empty())
 	{
-		if (!irc::sockets::aptosa(connectbindip.c_str(), 0, &bind))
+		if (!irc::sockets::aptosa(connectbindip, 0, bind))
 		{
 			return I_ERR_BIND;
 		}
@@ -83,7 +90,7 @@ BufferedSocketError BufferedSocket::BeginConnect(const irc::sockets::sockaddrs&
 
 	if (bind.sa.sa_family != 0)
 	{
-		if (ServerInstance->SE->Bind(fd, &bind.sa, sa_size(bind)) < 0)
+		if (ServerInstance->SE->Bind(fd, bind) < 0)
 			return I_ERR_BIND;
 	}
 
@@ -97,7 +104,7 @@ BufferedSocketError BufferedSocket::BeginConnect(const irc::sockets::sockaddrs&
 
 	this->state = I_CONNECTING;
 
-	if (!ServerInstance->SE->AddFd(this, true))
+	if (!ServerInstance->SE->AddFd(this, FD_WANT_NO_READ | FD_WANT_SINGLE_WRITE))
 		return I_ERR_NOMOREFDS;
 
 	this->Timeout = new SocketTimeout(this->GetFd(), this, timeout, ServerInstance->Time());
@@ -111,11 +118,6 @@ BufferedSocketError BufferedSocket::BeginConnect(const irc::sockets::sockaddrs&
 
 void StreamSocket::Close()
 {
-	/* Save this, so we dont lose it,
-	 * otherise on failure, error messages
-	 * might be inaccurate.
-	 */
-	int save = errno;
 	if (this->fd > -1)
 	{
 		if (IOHook)
@@ -135,12 +137,12 @@ void StreamSocket::Close()
 		ServerInstance->SE->Close(this);
 		fd = -1;
 	}
-	errno = save;
 }
 
-void StreamSocket::cull()
+CullResult StreamSocket::cull()
 {
 	Close();
+	return EventHandler::cull();
 }
 
 bool StreamSocket::GetNextLine(std::string& line, char delim)
@@ -148,7 +150,7 @@ 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 - 1);
+	line = recvq.substr(0, i);
 	// TODO is this the most efficient way to split?
 	recvq = recvq.substr(i + 1);
 	return true;
@@ -178,18 +180,35 @@ void StreamSocket::DoRead()
 	{
 		char* ReadBuffer = ServerInstance->GetReadBuffer();
 		int n = recv(fd, ReadBuffer, ServerInstance->Config->NetBufferSize, 0);
-		if (n > 0)
+		if (n == ServerInstance->Config->NetBufferSize)
+		{
+			ServerInstance->SE->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);
 			recvq.append(ReadBuffer, n);
 			OnDataReady();
 		}
 		else if (n == 0)
 		{
 			error = "Connection closed";
+			ServerInstance->SE->ChangeEventMask(this, FD_WANT_NO_READ | FD_WANT_NO_WRITE);
+		}
+		else if (errno == EAGAIN)
+		{
+			ServerInstance->SE->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);
 		}
-		else if (errno != EAGAIN && errno != EINTR)
+		else
 		{
 			error = strerror(errno);
+			ServerInstance->SE->ChangeEventMask(this, FD_WANT_NO_READ | FD_WANT_NO_WRITE);
 		}
 	}
 }
@@ -198,37 +217,96 @@ void StreamSocket::DoWrite()
 {
 	if (sendq.empty())
 		return;
+	if (!error.empty() || fd < 0 || fd == INT_MAX)
+	{
+		ServerInstance->Logs->Log("SOCKET", DEBUG, "DoWrite on errored or closed socket");
+		return;
+	}
 
+#ifndef DISABLE_WRITEV
 	if (IOHook)
+#endif
 	{
 		int rv = -1;
 		try
 		{
-			while (!sendq.empty())
+			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(sendq_len);
+					for(unsigned int i=0; i < sendq.size(); i++)
+						tmp.append(sendq[i]);
+					sendq.clear();
+					sendq.push_back(tmp);
+				}
 				std::string& front = sendq.front();
 				int itemlen = front.length();
-				rv = IOHook->OnStreamSocketWrite(this, front);
-				if (rv > 0)
+				if (IOHook)
 				{
-					// 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
-
-					// Since it is possible that a partial write took place, adjust sendq_len
-					sendq_len = sendq_len - itemlen + front.length();
-					return;
+					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
+
+						// 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
 				{
-					SetError("Write Error"); // will not overwrite a better error message
-					return;
+					rv = ServerInstance->SE->Send(this, front.data(), itemlen, 0);
+					if (rv == 0)
+					{
+						SetError("Connection closed");
+						return;
+					}
+					else if (rv < 0)
+					{
+						if (errno == EAGAIN || errno == EINTR)
+							ServerInstance->SE->ChangeEventMask(this, FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK);
+						else
+							SetError(strerror(errno));
+						return;
+					}
+					else if (rv < itemlen)
+					{
+						ServerInstance->SE->ChangeEventMask(this, FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK);
+						front = front.substr(itemlen - 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)
@@ -237,61 +315,98 @@ void StreamSocket::DoWrite()
 				modexcept.GetSource(), modexcept.GetReason());
 		}
 	}
+#ifndef DISABLE_WRITEV
 	else
 	{
-		// Prepare a writev() call to write all buffers efficiently
-		int bufcount = sendq.size();
+		// don't even try if we are known to be blocking
+		if (GetEventMask() & FD_WRITE_WILL_BLOCK)
+			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)
+		{
+			// Prepare a writev() call to write all buffers efficiently
+			int bufcount = sendq.size();
 		
-		// cap the number of buffers at IOV_MAX
-		if (bufcount > IOV_MAX)
-			bufcount = IOV_MAX;
+			// cap the number of buffers at IOV_MAX
+			if (bufcount > IOV_MAX)
+			{
+				bufcount = IOV_MAX;
+			}
 
-		iovec* iovecs = new iovec[bufcount];
-		for(int i=0; i < bufcount; i++)
-		{
-			iovecs[i].iov_base = const_cast<char*>(sendq[i].data());
-			iovecs[i].iov_len = sendq[i].length();
-		}
-		int rv = writev(fd, iovecs, bufcount);
-		delete[] iovecs;
-		if (rv == (int)sendq_len)
-		{
-			// it's our lucky day, everything got written out. Fast cleanup.
-			sendq_len = 0;
-			sendq.clear();
-		}
-		else if (rv > 0)
-		{
-			// Partial write. Clean out strings from the sendq
-			sendq_len -= rv;
-			while (rv > 0 && !sendq.empty())
+			int rv_max = 0;
+			iovec* iovecs = new iovec[bufcount];
+			for(int i=0; i < bufcount; i++)
 			{
-				std::string& front = sendq.front();
-				if (front.length() < (size_t)rv)
+				iovecs[i].iov_base = const_cast<char*>(sendq[i].data());
+				iovecs[i].iov_len = sendq[i].length();
+				rv_max += sendq[i].length();
+			}
+			int rv = writev(fd, iovecs, bufcount);
+			delete[] iovecs;
+
+			if (rv == (int)sendq_len)
+			{
+				// 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)
+			{
+				// Partial write. Clean out strings from the sendq
+				if (rv < rv_max)
 				{
-					// this string got fully written out
-					rv -= front.length();
-					sendq.pop_front();
+					// it's going to block now
+					eventChange = FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK;
 				}
-				else
+				sendq_len -= rv;
+				while (rv > 0 && !sendq.empty())
 				{
-					// stopped in the middle of this string
-					front = front.substr(rv);
-					rv = 0;
+					std::string& front = sendq.front();
+					if (front.length() <= (size_t)rv)
+					{
+						// this string got fully written out
+						rv -= front.length();
+						sendq.pop_front();
+					}
+					else
+					{
+						// stopped in the middle of this string
+						front = front.substr(rv);
+						rv = 0;
+					}
 				}
 			}
+			else if (rv == 0)
+			{
+				error = "Connection closed";
+			}
+			else if (errno == EAGAIN)
+			{
+				eventChange = FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK;
+			}
+			else if (errno == EINTR)
+			{
+				// restart interrupted syscall
+				errno = 0;
+			}
+			else
+			{
+				error = strerror(errno);
+			}
 		}
-		else if (rv == 0)
+		if (!error.empty())
 		{
-			error = "Connection closed";
+			// error - kill all events
+			ServerInstance->SE->ChangeEventMask(this, FD_WANT_NO_READ | FD_WANT_NO_WRITE);
 		}
-		else if (errno != EAGAIN && errno != EINTR)
+		else
 		{
-			error = strerror(errno);
+			ServerInstance->SE->ChangeEventMask(this, eventChange);
 		}
-		if (sendq_len && error.empty())
-			ServerInstance->SE->WantWrite(this);
 	}
+#endif
 }
 
 void StreamSocket::WriteData(const std::string &data)
@@ -302,18 +417,12 @@ void StreamSocket::WriteData(const std::string &data)
 			data.c_str());
 		return;
 	}
-	bool newWrite = sendq.empty() && !data.empty();
 
 	/* Append the data to the back of the queue ready for writing */
 	sendq.push_back(data);
 	sendq_len += data.length();
 
-	if (newWrite)
-	{
-		// TODO perhaps we should try writing first, before asking SE about writes?
-		// DoWrite();
-		ServerInstance->SE->WantWrite(this);
-	}
+	ServerInstance->SE->ChangeEventMask(this, FD_ADD_TRIAL_WRITE);
 }
 
 void SocketTimeout::Tick(time_t)
@@ -355,6 +464,8 @@ void BufferedSocket::DoWrite()
 		this->OnConnected();
 		if (GetIOHook())
 			GetIOHook()->OnStreamSocketConnect(this);
+		else
+			ServerInstance->SE->ChangeEventMask(this, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE);
 	}
 	this->StreamSocket::DoWrite();
 }
@@ -371,47 +482,59 @@ BufferedSocket::~BufferedSocket()
 
 void StreamSocket::HandleEvent(EventType et, int errornum)
 {
+	if (!error.empty())
+		return;
 	BufferedSocketError errcode = I_ERR_OTHER;
-	switch (et)
-	{
-		case EVENT_ERROR:
+	try {
+		switch (et)
 		{
-			SetError(strerror(errornum));
-			switch (errornum)
+			case EVENT_ERROR:
 			{
-				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;
+				if (errornum == 0)
+					SetError("Connection closed");
+				else
+					SetError(strerror(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;
 			}
-			break;
-		}
-		case EVENT_READ:
-		{
-			DoRead();
-			break;
-		}
-		case EVENT_WRITE:
-		{
-			DoWrite();
-			break;
 		}
 	}
+	catch (CoreException& ex)
+	{
+		ServerInstance->Logs->Log("SOCKET", DEFAULT, "Caught exception in socket processing on FD %d - '%s'",
+			fd, ex.GetReason());
+		SetError(ex.GetReason());
+	}
 	if (!error.empty())
 	{
 		ServerInstance->Logs->Log("SOCKET", DEBUG, "Error on FD %d - '%s'", fd, error.c_str());
 		OnError(errcode);
-		ServerInstance->GlobalCulls.AddItem(this);
 	}
 }