X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=d78ace31891601d3b5d7d61179aefe8fabea2f9f;hb=62e7254fbe791dc61ebbca0ab3c228f5c1e48994;hp=81e61f051416fcf72d515fe077f7d8e62ee052b1;hpb=4857bf4771b7f0b21a0f8b78045ff2a1009e0aab;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 81e61f051..d78ace318 100644
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -82,16 +82,6 @@ BufferedSocketError BufferedSocket::BeginConnect(const std::string &ipaddr, int
 	return BeginConnect(addr, bind, maxtime);
 }
 
-static void IncreaseOSBuffers(int fd)
-{
-	// attempt to increase socket sendq and recvq as high as its possible
-	int sendbuf = 32768;
-	int recvbuf = 32768;
-	setsockopt(fd,SOL_SOCKET,SO_SNDBUF,(const char *)&sendbuf,sizeof(sendbuf));
-	setsockopt(fd,SOL_SOCKET,SO_RCVBUF,(const char *)&recvbuf,sizeof(recvbuf));
-	// on failure, do nothing. I'm a little sick of people trying to interpret this message as a result of why their incorrect setups don't work.
-}
-
 BufferedSocketError BufferedSocket::BeginConnect(const irc::sockets::sockaddrs& dest, const irc::sockets::sockaddrs& bind, unsigned long timeout)
 {
 	if (fd < 0)
@@ -210,7 +200,7 @@ void StreamSocket::DoRead()
 			error = "Connection closed";
 			ServerInstance->SE->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);
 		}
@@ -301,7 +291,7 @@ void StreamSocket::DoWrite()
 					}
 					else if (rv < 0)
 					{
-						if (errno == EAGAIN || errno == EINTR)
+						if (errno == EINTR || SocketEngine::IgnoreError())
 							ServerInstance->SE->ChangeEventMask(this, FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK);
 						else
 							SetError(strerror(errno));
@@ -310,7 +300,7 @@ void StreamSocket::DoWrite()
 					else if (rv < itemlen)
 					{
 						ServerInstance->SE->ChangeEventMask(this, FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK);
-						front = front.substr(itemlen - rv);
+						front = front.substr(rv);
 						sendq_len -= rv;
 						return;
 					}
@@ -398,7 +388,7 @@ void StreamSocket::DoWrite()
 			{
 				error = "Connection closed";
 			}
-			else if (errno == EAGAIN)
+			else if (SocketEngine::IgnoreError())
 			{
 				eventChange = FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK;
 			}