X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=fc8bc142f9df2dfeb7ef54f4294e9fdb9dc7b8a9;hb=9db7af579c46a9f0379fdf71fb773a0a76a94846;hp=062f6b644bc27fb04d8bc775cf00697692419d00;hpb=7c1509e0a79ede51146d38469e63c1437f2d4907;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 062f6b644..fc8bc142f 100644
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -15,7 +15,13 @@
 #include "socket.h"
 #include "inspstring.h"
 #include "socketengine.h"
+
+#ifndef DISABLE_WRITEV
 #include <sys/uio.h>
+#ifndef IOV_MAX
+#define IOV_MAX 1024
+#endif
+#endif
 
 BufferedSocket::BufferedSocket()
 {
@@ -46,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;
@@ -55,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;
 		}
@@ -139,9 +145,10 @@ void StreamSocket::Close()
 	errno = save;
 }
 
-void StreamSocket::cull()
+CullResult StreamSocket::cull()
 {
 	Close();
+	return EventHandler::cull();
 }
 
 bool StreamSocket::GetNextLine(std::string& line, char delim)
@@ -222,52 +229,90 @@ void StreamSocket::DoWrite()
 		return;
 	}
 
+#ifndef DISABLE_WRITEV
 	if (IOHook)
+#endif
 	{
 		int rv = -1;
 		try
 		{
-			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);
-			}
 			while (!sendq.empty())
 			{
-				std::string& front = sendq.front();
-				int itemlen = front.length();
-				rv = IOHook->OnStreamSocketWrite(this, front);
-				if (rv > 0)
+				if (sendq.size() > 1 && sendq[0].length() < 1024)
 				{
-					// consumed the entire string, and is ready for more
-					sendq_len -= itemlen;
-					sendq.pop_front();
+					// 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);
 				}
-				else if (rv == 0)
+				std::string& front = sendq.front();
+				int itemlen = front.length();
+				if (IOHook)
 				{
-					// socket has blocked. Stop trying to send data.
-					// IOHook has requested unblock notification from the socketengine
+					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;
+						// 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)
@@ -276,6 +321,7 @@ void StreamSocket::DoWrite()
 				modexcept.GetSource(), modexcept.GetReason());
 		}
 	}
+#ifndef DISABLE_WRITEV
 	else
 	{
 		// don't even try if we are known to be blocking
@@ -315,6 +361,11 @@ void StreamSocket::DoWrite()
 			else if (rv > 0)
 			{
 				// Partial write. Clean out strings from the sendq
+				if (rv < rv_max)
+				{
+					// it's going to block now
+					eventChange = FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK;
+				}
 				sendq_len -= rv;
 				while (rv > 0 && !sendq.empty())
 				{
@@ -332,11 +383,6 @@ void StreamSocket::DoWrite()
 						rv = 0;
 					}
 				}
-				if (rv < rv_max)
-				{
-					// it's going to block now
-					eventChange = FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK;
-				}
 			}
 			else if (rv == 0)
 			{
@@ -365,6 +411,7 @@ void StreamSocket::DoWrite()
 			ServerInstance->SE->ChangeEventMask(this, eventChange);
 		}
 	}
+#endif
 }
 
 void StreamSocket::WriteData(const std::string &data)
@@ -440,6 +487,8 @@ BufferedSocket::~BufferedSocket()
 
 void StreamSocket::HandleEvent(EventType et, int errornum)
 {
+	if (!error.empty())
+		return;
 	BufferedSocketError errcode = I_ERR_OTHER;
 	switch (et)
 	{