X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=4c03c933dc98e0a634f9fa79cd4043337f816fbf;hb=b7c16f1ebc0809bb9f85573a37c6bb11f6854aca;hp=fe6516bb5c94548daf1b62def6e48afc44563c8c;hpb=320cfcc36374cd247ae1c3b30dab8b9b2e5acd67;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socket.cpp b/src/socket.cpp
index fe6516bb5..4c03c933d 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -63,6 +63,7 @@ InspSocket::InspSocket(std::string ahost, int aport, bool listening, unsigned lo
 {
 	this->fd = -1;
 	this->host = ahost;
+	this->Buffer = "";
 	if (listening) {
 		if ((this->fd = OpenTCPSocket()) == ERROR)
 		{
@@ -258,22 +259,26 @@ int InspSocket::Write(std::string data)
 
 void InspSocket::FlushWriteBuffer()
 {
-	int result = 0;
-	if (this->Buffer.length())
+	if ((this->fd > -1) && (this->state == I_CONNECTED))
 	{
-		result = send(this->fd,this->Buffer.c_str(),this->Buffer.length(),0);
-		if (result > 0)
+		int result = 0, v = 0;
+		const char* n = Buffer.c_str();
+		v = Buffer.length();
+		if (v > 0)
 		{
-			if (result == (int)this->Buffer.length())
+			result = write(this->fd,n,v);
+			if (result > 0)
 			{
-				this->Buffer = "";
-			}
-			else
-			{
-				/* If we wrote some, advance the buffer forwards */
-				char* n = (char*)this->Buffer.c_str();
-				n += result;
-				this->Buffer = n;
+				if (result == v)
+				{
+					Buffer = "";
+				}
+				else
+				{
+					/* If we wrote some, advance the buffer forwards */
+					n += result;
+					Buffer = n;
+				}
 			}
 		}
 	}