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

diff --git a/src/socket.cpp b/src/socket.cpp
index cb2eeb041..4c03c933d 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -59,10 +59,11 @@ InspSocket::InspSocket(int newfd, char* ip)
 	socket_ref[this->fd] = this;
 }
 
-InspSocket::InspSocket(std::string ahost, int port, bool listening, unsigned long maxtime)
+InspSocket::InspSocket(std::string ahost, int aport, bool listening, unsigned long maxtime)
 {
 	this->fd = -1;
 	this->host = ahost;
+	this->Buffer = "";
 	if (listening) {
 		if ((this->fd = OpenTCPSocket()) == ERROR)
 		{
@@ -74,7 +75,7 @@ InspSocket::InspSocket(std::string ahost, int port, bool listening, unsigned lon
 		}
 		else
 		{
-			if (BindSocket(this->fd,this->client,this->server,port,(char*)ahost.c_str()) == ERROR)
+			if (BindSocket(this->fd,this->client,this->server,aport,(char*)ahost.c_str()) == ERROR)
 			{
 				this->Close();
 				this->fd = -1;
@@ -96,7 +97,7 @@ InspSocket::InspSocket(std::string ahost, int port, bool listening, unsigned lon
 	else
 	{
 		this->host = ahost;
-		this->port = port;
+		this->port = aport;
 
 		if (!inet_aton(host.c_str(),&addy))
 		{
@@ -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;
+				}
 			}
 		}
 	}
@@ -303,8 +308,6 @@ bool InspSocket::Poll()
 	int incoming = -1;
 	bool n = true;
 
-	log(DEBUG,"InspSocket::Poll()");
-	
 	switch (this->state)
 	{
 		case I_RESOLVING:
@@ -312,7 +315,7 @@ bool InspSocket::Poll()
 			return this->DoResolve();
 		break;
 		case I_CONNECTING:
-			log(DEBUG,"State = I_CONNECTED");
+			log(DEBUG,"State = I_CONNECTING");
 			this->SetState(I_CONNECTED);
 			/* Our socket was in write-state, so delete it and re-add it
 			 * in read-state.
@@ -329,9 +332,7 @@ bool InspSocket::Poll()
 			return true;
 		break;
 		case I_CONNECTED:
-			log(DEBUG,"State = I_CONNECTED");
 			n = this->OnDataReady();
-			log(DEBUG,"State return: %d",(int)n);
 			/* Flush any pending, but not till after theyre done with the event
 			 * so there are less write calls involved. */
 			this->FlushWriteBuffer();