X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=d4cdb0a18f41903510d1732596da69ac84af47a7;hb=4ac0ccc06ce0cafea2549f51881cba0c44463d9c;hp=03c9797254d6dd03e1ef6f02ff12138ff3ce14e2;hpb=80c8e91a422250bea57b3edad5f65f4590776d0b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socket.cpp b/src/socket.cpp
index 03c979725..d4cdb0a18 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -29,6 +29,7 @@ using namespace std;
 #include <sstream>
 #include <iostream>
 #include <fstream>
+#include <stdexcept>
 #include "socket.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
@@ -46,6 +47,7 @@ InspSocket* socket_ref[MAX_DESCRIPTORS];
 InspSocket::InspSocket()
 {
 	this->state = I_DISCONNECTED;
+	this->fd = -1;
 }
 
 InspSocket::InspSocket(int newfd, char* ip)
@@ -57,8 +59,10 @@ InspSocket::InspSocket(int newfd, char* ip)
 	socket_ref[this->fd] = this;
 }
 
-InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long maxtime)
+InspSocket::InspSocket(const std::string &ahost, int aport, bool listening, unsigned long maxtime)
+ : fd(-1), host(ahost)
 {
+	this->outbuffer.clear();
 	if (listening) {
 		if ((this->fd = OpenTCPSocket()) == ERROR)
 		{
@@ -70,7 +74,7 @@ InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long
 		}
 		else
 		{
-			if (BindSocket(this->fd,this->client,this->server,port,(char*)host.c_str()) == ERROR)
+			if (BindSocket(this->fd,this->client,this->server,aport,(char*)ahost.c_str()) == ERROR)
 			{
 				this->Close();
 				this->fd = -1;
@@ -91,8 +95,8 @@ InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long
 	}
 	else
 	{
-		this->host = host;
-		this->port = port;
+		this->host = ahost;
+		this->port = aport;
 
 		if (!inet_aton(host.c_str(),&addy))
 		{
@@ -100,7 +104,7 @@ InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long
 			/* Its not an ip, spawn the resolver */
 			this->dns.SetNS(std::string(Config->DNSServer));
 			this->dns.ForwardLookupWithFD(host,fd);
-			timeout_end = time(NULL)+maxtime;
+			timeout_end = time(NULL) + maxtime;
 	                timeout = false;
 			this->state = I_RESOLVING;
 			socket_ref[this->fd] = this;
@@ -109,6 +113,7 @@ InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long
 		{
 			log(DEBUG,"No need to resolve %s",this->host.c_str());
 			this->IP = host;
+			timeout_end = time(NULL) + maxtime;
 			this->DoConnect();
 		}
 	}
@@ -171,7 +176,7 @@ bool InspSocket::DoConnect()
 	flags = fcntl(this->fd, F_GETFL, 0);
 	fcntl(this->fd, F_SETFL, flags | O_NONBLOCK);
 
-	if(connect(this->fd, (sockaddr*)&this->addr,sizeof(this->addr)) == -1)
+	if (connect(this->fd, (sockaddr*)&this->addr,sizeof(this->addr)) == -1)
 	{
 		if (errno != EINPROGRESS)
 		{
@@ -186,6 +191,7 @@ bool InspSocket::DoConnect()
 	ServerInstance->SE->AddFd(this->fd,false,X_ESTAB_MODULE);
 	socket_ref[this->fd] = this;
 	this->SetQueues(this->fd);
+	log(DEBUG,"Returning true from InspSocket::DoConnect");
 	return true;
 }
 
@@ -209,10 +215,10 @@ std::string InspSocket::GetIP()
 
 char* InspSocket::Read()
 {
-	if ((fd < 0) || (fd > MAX_DESCRIPTOR))
+	if ((fd < 0) || (fd > MAX_DESCRIPTORS))
 		return NULL;
 	int n = recv(this->fd,this->ibuf,sizeof(this->ibuf),0);
-	if ((n > 0) && (n <= sizeof(this->ibuf)))
+	if ((n > 0) && (n <= (int)sizeof(this->ibuf)))
 	{
 		ibuf[n] = 0;
 		return ibuf;
@@ -225,7 +231,7 @@ char* InspSocket::Read()
 		}
 		else
 		{
-			log(DEBUG,"EOF or error on socket");
+			log(DEBUG,"EOF or error on socket: %s",strerror(errno));
 			return NULL;
 		}
 	}
@@ -235,39 +241,52 @@ char* InspSocket::Read()
 // It will either write all of the data, or an undefined amount.
 // If an undefined amount is written the connection has failed
 // and should be aborted.
-int InspSocket::Write(std::string data)
+int InspSocket::Write(const std::string &data)
 {
-	this->Buffer.append(data);
-	return data.length();
+	/* Try and append the data to the back of the queue, and send it on its way
+	 */
+	outbuffer.push_back(data);
+	return (!this->FlushWriteBuffer());
 }
 
-void InspSocket::FlushWriteBuffer()
+bool 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)
+		if (outbuffer.size())
 		{
-			if (result == (int)this->Buffer.length())
+			int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length());
+			if (result > 0)
 			{
-				this->Buffer = "";
+				if ((unsigned int)result == outbuffer[0].length())
+				{
+					/* The whole block was written (usually a line)
+					 * Pop the block off the front of the queue
+					 */
+					outbuffer.pop_front();
+				}
+				else
+				{
+					outbuffer[0] = outbuffer[0].substr(result + 1,outbuffer[0].length());
+				}
 			}
-			else
+			else if ((result == -1) && (errno != EAGAIN))
 			{
-				/* If we wrote some, advance the buffer forwards */
-				char* n = (char*)this->Buffer.c_str();
-				n += result;
-				this->Buffer = n;
+				log(DEBUG,"Write error on socket: %s",strerror(errno));
+				this->OnError(I_ERR_WRITE);
+				this->state = I_ERROR;
+				return true;
 			}
 		}
 	}
+	return false;
 }
 
 bool InspSocket::Timeout(time_t current)
 {
 	if (((this->state == I_RESOLVING) || (this->state == I_CONNECTING)) && (current > timeout_end))
 	{
+		log(DEBUG,"Timed out, current=%lu timeout_end=%lu");
 		// for non-listening sockets, the timeout can occur
 		// which causes termination of the connection after
 		// the given number of seconds without a successful
@@ -278,15 +297,14 @@ bool InspSocket::Timeout(time_t current)
 		this->state = I_ERROR;
 		return true;
 	}
-	this->FlushWriteBuffer();
-	return false;
+	return this->FlushWriteBuffer();
 }
 
 bool InspSocket::Poll()
 {
 	int incoming = -1;
 	bool n = true;
-	
+
 	switch (this->state)
 	{
 		case I_RESOLVING:
@@ -294,7 +312,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.
@@ -313,9 +331,11 @@ bool InspSocket::Poll()
 		case I_CONNECTED:
 			n = this->OnDataReady();
 			/* Flush any pending, but not till after theyre done with the event
-			 * so there are less write calls involved. */
-			this->FlushWriteBuffer();
-			return n;
+			 * so there are less write calls involved.
+			 * Both FlushWriteBuffer AND the return result of OnDataReady must
+			 * return true for this to be ok.
+			 */
+			return (n && !this->FlushWriteBuffer());
 		break;
 		default:
 		break;
@@ -351,4 +371,3 @@ InspSocket::~InspSocket()
 {
 	this->Close();
 }
-