Call OnStreamSocketWrite() once per write event

Do sendq flattening in SSL modules, move code for it into class SSLIOHook from core

3 files changed, 15 insertions, 26 deletions

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index b8f8949dd..436cbb6bb 100644
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -202,33 +202,12 @@ void StreamSocket::DoWrite()
 	if (GetIOHook())
 	{
 		{
-			while (error.empty() && !sendq.empty())
 			{
-				if (sendq.size() > 1 && sendq.front().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);
-				}
-
 				{
 					int rv = GetIOHook()->OnStreamSocketWrite(this);
 					if (rv > 0)
 					{
 						// consumed the entire string, and is ready for more
-						sendq.pop_front();
 					}
 					else if (rv == 0)
 					{
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index f5e52b4e1..935b0ee77 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -987,14 +987,16 @@ info_done_dealloc:
 		StreamSocket::SendQueue& sendq = user->GetSendQ();
 		int ret = 0;
 
+		while (!sendq.empty())
 		{
+			FlattenSendQueue(sendq, profile->GetOutgoingRecordSize());
 			const StreamSocket::SendQueue::Element& buffer = sendq.front();
 			ret = gnutls_record_send(this->sess, buffer.data(), buffer.length());
 
 			if (ret == (int)buffer.length())
 			{
-				SocketEngine::ChangeEventMask(user, FD_WANT_NO_WRITE);
-				return 1;
+				// Wrote entire record, continue sending
+				sendq.pop_front();
 			}
 			else if (ret > 0)
 			{
@@ -1014,6 +1016,9 @@ info_done_dealloc:
 				return -1;
 			}
 		}
+
+		SocketEngine::ChangeEventMask(user, FD_WANT_NO_WRITE);
+		return 1;
 	}
 
 	void TellCiphersAndFingerprint(LocalUser* user)
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index f4a661154..b037347f1 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -618,8 +618,10 @@ class OpenSSLIOHook : public SSLIOHook
 
 		// Session is ready for transferring application data
 		StreamSocket::SendQueue& sendq = user->GetSendQ();
+		while (!sendq.empty())
 		{
 			ERR_clear_error();
+			FlattenSendQueue(sendq, profile->GetOutgoingRecordSize());
 			const StreamSocket::SendQueue::Element& buffer = sendq.front();
 			int ret = SSL_write(sess, buffer.data(), buffer.size());
 
@@ -630,9 +632,8 @@ class OpenSSLIOHook : public SSLIOHook
 
 			if (ret == (int)buffer.length())
 			{
-				data_to_write = false;
-				SocketEngine::ChangeEventMask(user, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
-				return 1;
+				// Wrote entire record, continue sending
+				sendq.pop_front();
 			}
 			else if (ret > 0)
 			{
@@ -666,6 +667,10 @@ class OpenSSLIOHook : public SSLIOHook
 				}
 			}
 		}
+
+		data_to_write = false;
+		SocketEngine::ChangeEventMask(user, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
+		return 1;
 	}
 
 	void TellCiphersAndFingerprint(LocalUser* user)