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

diff --git a/src/socket.cpp b/src/socket.cpp
index 836a2b5de..4c03c933d 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,11 @@ 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(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)
 		{
@@ -70,7 +75,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 +96,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 +105,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 +114,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 +177,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 +192,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;
 }
 
@@ -212,7 +219,7 @@ char* InspSocket::Read()
 	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;
@@ -237,28 +244,41 @@ char* InspSocket::Read()
 // and should be aborted.
 int InspSocket::Write(std::string data)
 {
-	this->Buffer.append(data);
+	try
+	{
+		if ((data != "") && (this->Buffer.length() + data.length() < this->Buffer.max_size()))
+			this->Buffer.append(data);
+	}
+	catch (std::length_error)
+	{
+		log(DEBUG,"std::length_error exception caught while appending to socket buffer!");
+		return 0;
+	}
 	return data.length();
 }
 
 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;
+				}
 			}
 		}
 	}
@@ -268,6 +288,7 @@ 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
@@ -286,7 +307,7 @@ bool InspSocket::Poll()
 {
 	int incoming = -1;
 	bool n = true;
-	
+
 	switch (this->state)
 	{
 		case I_RESOLVING:
@@ -294,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.