X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=89c3a71a93a691850b70b882f5db0fddb8db8679;hb=c89cc290fbc6d53040fc8abc6fc0b0cb637beee9;hp=fbeb60122b2cb262245fb5b966ae6c8e73b4317f;hpb=dad754237bf28b9cb7733f7607e128569897eb10;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index fbeb60122..89c3a71a9 100644
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -114,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();
 		}
@@ -151,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)
@@ -219,62 +201,12 @@ void StreamSocket::DoWrite()
 
 	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();
-
-				{
-					rv = GetIOHook()->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;
-					}
-				}
-			}
-		}
-		catch (CoreException& modexcept)
-		{
-			ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "%s threw an exception: %s",
-				modexcept.GetSource().c_str(), modexcept.GetReason().c_str());
-		}
+		// rv == 0 means the socket has blocked. Stop trying to send data.
+		// IOHook has requested unblock notification from the socketengine.
 	}
 	else
 	{
@@ -283,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();
@@ -298,20 +230,21 @@ void StreamSocket::DoWrite()
 			int rv;
 			{
 				SocketEngine::IOVector iovecs[MYIOV_MAX];
-				for (int i = 0; i < bufcount; i++)
+				size_t j = 0;
+				for (SendQueue::const_iterator i = sendq.begin(), end = i+bufcount; i != end; ++i, j++)
 				{
-					iovecs[i].iov_base = const_cast<char*>(sendq[i].data());
-					iovecs[i].iov_len = sendq[i].length();
-					rv_max += sendq[i].length();
+					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);
 			}
 
-			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)
@@ -322,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
@@ -335,7 +267,7 @@ void StreamSocket::DoWrite()
 					else
 					{
 						// stopped in the middle of this string
-						front.erase(0, rv);
+						sendq.erase_front(rv);
 						rv = 0;
 					}
 				}
@@ -381,7 +313,6 @@ void StreamSocket::WriteData(const std::string &data)
 
 	/* Append the data to the back of the queue ready for writing */
 	sendq.push_back(data);
-	sendq_len += data.length();
 
 	SocketEngine::ChangeEventMask(this, FD_ADD_TRIAL_WRITE);
 }