X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=356904f741b35e8efbcfe5bac61cdaf98721f31e;hb=4e3d7a6e30eadf714483994681b8b2534229f4a8;hp=d78ace31891601d3b5d7d61179aefe8fabea2f9f;hpb=47332d6e9b990498dd35457090dd8983d8aae8d3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index d78ace318..356904f74 100644
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -56,7 +56,7 @@ void BufferedSocket::DoConnect(const std::string &ipaddr, int aport, unsigned lo
 	if (err != I_ERR_NONE)
 	{
 		state = I_ERROR;
-		SetError(strerror(errno));
+		SetError(SocketEngine::LastError());
 		OnError(err);
 	}
 }
@@ -210,7 +210,7 @@ void StreamSocket::DoRead()
 		}
 		else
 		{
-			error = strerror(errno);
+			error = SocketEngine::LastError();
 			ServerInstance->SE->ChangeEventMask(this, FD_WANT_NO_READ | FD_WANT_NO_WRITE);
 		}
 	}
@@ -248,11 +248,13 @@ void StreamSocket::DoWrite()
 					// 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);
+					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();
@@ -294,7 +296,7 @@ void StreamSocket::DoWrite()
 						if (errno == EINTR || SocketEngine::IgnoreError())
 							ServerInstance->SE->ChangeEventMask(this, FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK);
 						else
-							SetError(strerror(errno));
+							SetError(SocketEngine::LastError());
 						return;
 					}
 					else if (rv < itemlen)
@@ -399,7 +401,7 @@ void StreamSocket::DoWrite()
 			}
 			else
 			{
-				error = strerror(errno);
+				error = SocketEngine::LastError();
 			}
 		}
 		if (!error.empty())
@@ -494,7 +496,7 @@ void StreamSocket::HandleEvent(EventType et, int errornum)
 				if (errornum == 0)
 					SetError("Connection closed");
 				else
-					SetError(strerror(errornum));
+					SetError(SocketEngine::GetError(errornum));
 				switch (errornum)
 				{
 					case ETIMEDOUT: