X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=282d3c5a72fb4355bdfe74e347a28e6d0fb45080;hb=59b1a8955142935b02af6446005ab47fc7c3fc8c;hp=8da570fe452300d7df06b883936d2efcc8746e12;hpb=7d283ead756f22b2c659414b89938777ad97599f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socket.cpp b/src/socket.cpp
index 8da570fe4..282d3c5a7 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *           	  <Craig@chatspike.net>
@@ -29,28 +29,25 @@ using namespace std;
 #include <sstream>
 #include <iostream>
 #include <fstream>
+#include <stdexcept>
 #include "socket.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
-#include "inspircd_util.h"
 #include "inspstring.h"
 #include "helperfuncs.h"
 #include "socketengine.h"
 
-extern SocketEngine* SE;
 
-extern FILE *log_file;
-extern int boundPortCount;
-extern int openSockfd[MAXSOCKS];
+extern InspIRCd* ServerInstance;
+extern ServerConfig* Config;
 extern time_t TIME;
-extern bool unlimitcore;
-extern int MaxConn;
 
-InspSocket* socket_ref[65535];
+InspSocket* socket_ref[MAX_DESCRIPTORS];
 
 InspSocket::InspSocket()
 {
 	this->state = I_DISCONNECTED;
+	this->fd = -1;
 }
 
 InspSocket::InspSocket(int newfd, char* ip)
@@ -58,12 +55,13 @@ InspSocket::InspSocket(int newfd, char* ip)
 	this->fd = newfd;
 	this->state = I_CONNECTED;
 	this->IP = ip;
-	SE->AddFd(this->fd,true,X_ESTAB_MODULE);
+	ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE);
 	socket_ref[this->fd] = this;
 }
 
 InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long maxtime)
 {
+	this->fd = -1;
 	if (listening) {
 		if ((this->fd = OpenTCPSocket()) == ERROR)
 		{
@@ -87,60 +85,116 @@ InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long
 			else
 			{
 				this->state = I_LISTENING;
-				SE->AddFd(this->fd,true,X_ESTAB_MODULE);
+				ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE);
 				socket_ref[this->fd] = this;
 				log(DEBUG,"New socket now in I_LISTENING state");
 				return;
 			}
 		}			
-	} else {
-		char* ip;
+	}
+	else
+	{
 		this->host = host;
-		hostent* hoste = gethostbyname(host.c_str());
-		if (!hoste) {
-			ip = (char*)host.c_str();
-		} else {
-			struct in_addr* ia = (in_addr*)hoste->h_addr;
-			ip = inet_ntoa(*ia);
+		this->port = port;
+
+		if (!inet_aton(host.c_str(),&addy))
+		{
+			log(DEBUG,"Attempting to resolve %s",this->host.c_str());
+			/* 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 = false;
+			this->state = I_RESOLVING;
+			socket_ref[this->fd] = this;
+		}
+		else
+		{
+			log(DEBUG,"No need to resolve %s",this->host.c_str());
+			this->IP = host;
+			timeout_end = time(NULL) + maxtime;
+			this->DoConnect();
 		}
+	}
+}
 
-		this->IP = ip;
+void InspSocket::SetQueues(int nfd)
+{
+        // attempt to increase socket sendq and recvq as high as its possible
+	int sendbuf = 32768;
+	int recvbuf = 32768;
+	setsockopt(nfd,SOL_SOCKET,SO_SNDBUF,(const void *)&sendbuf,sizeof(sendbuf));
+	setsockopt(nfd,SOL_SOCKET,SO_RCVBUF,(const void *)&recvbuf,sizeof(sendbuf));
+}
 
-                timeout_end = time(NULL)+maxtime;
-                timeout = false;
-                if ((this->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
+bool InspSocket::DoResolve()
+{
+	log(DEBUG,"In DoResolve(), trying to resolve IP");
+	if (this->dns.HasResult())
+	{
+		log(DEBUG,"Socket has result");
+		std::string res_ip = dns.GetResultIP();
+		if (res_ip != "")
 		{
+			log(DEBUG,"Socket result set to %s",res_ip.c_str());
+			this->IP = res_ip;
+			socket_ref[this->fd] = NULL;
+		}
+		else
+		{
+			log(DEBUG,"Socket DNS failure");
+			this->Close();
 			this->state = I_ERROR;
-			this->OnError(I_ERR_SOCKET);
-                        return;
+			this->OnError(I_ERR_RESOLVE);
+			return false;
 		}
-		this->port = port;
-                inet_aton(ip,&addy);
-                addr.sin_family = AF_INET;
-                addr.sin_addr = addy;
-                addr.sin_port = htons(this->port);
+		return this->DoConnect();
+	}
+	log(DEBUG,"No result for socket yet!");
+	return true;
+}
 
-                int flags;
-                flags = fcntl(this->fd, F_GETFL, 0);
-                fcntl(this->fd, F_SETFL, flags | O_NONBLOCK);
+bool InspSocket::DoConnect()
+{
+	log(DEBUG,"In DoConnect()");
+	if ((this->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
+	{
+		log(DEBUG,"Cant socket()");
+		this->state = I_ERROR;
+		this->OnError(I_ERR_SOCKET);
+		return false;
+	}
 
-                if(connect(this->fd, (sockaddr*)&this->addr,sizeof(this->addr)) == -1)
-                {
-                        if (errno != EINPROGRESS)
-                        {
-				this->Close();
-				this->OnError(I_ERR_CONNECT);
-				this->state = I_ERROR;
-                                return;
-                        }
-                }
-                this->state = I_CONNECTING;
-		SE->AddFd(this->fd,false,X_ESTAB_MODULE);
-		socket_ref[this->fd] = this;
-                return;
+	log(DEBUG,"Part 2 DoConnect() %s",this->IP.c_str());
+	inet_aton(this->IP.c_str(),&addy);
+	addr.sin_family = AF_INET;
+	addr.sin_addr = addy;
+	addr.sin_port = htons(this->port);
+
+	int flags;
+	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 (errno != EINPROGRESS)
+		{
+			log(DEBUG,"Error connect() %d: %s",this->fd,strerror(errno));
+			this->OnError(I_ERR_CONNECT);
+			this->state = I_ERROR;
+			this->Close();
+			return false;
+		}
 	}
+	this->state = I_CONNECTING;
+	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;
 }
 
+
 void InspSocket::Close()
 {
 	if (this->fd != -1)
@@ -160,16 +214,25 @@ std::string InspSocket::GetIP()
 
 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)
+	if ((n > 0) && (n <= (int)sizeof(this->ibuf)))
 	{
 		ibuf[n] = 0;
 		return ibuf;
 	}
 	else
 	{
-		log(DEBUG,"EOF or error on socket");
-		return NULL;
+		if (errno == EAGAIN)
+		{
+			return "";
+		}
+		else
+		{
+			log(DEBUG,"EOF or error on socket");
+			return NULL;
+		}
 	}
 }
 
@@ -179,31 +242,47 @@ char* InspSocket::Read()
 // and should be aborted.
 int InspSocket::Write(std::string data)
 {
-	char* d = (char*)data.c_str();
-	unsigned int written = 0;
-	int n = 0;
-	int s = data.length();
-	while ((written < data.length()) && (n >= 0))
+	try
 	{
-		n = send(this->fd,d,s,0);
-		if (n > 0)
+		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())
+	{
+		result = send(this->fd,this->Buffer.c_str(),this->Buffer.length(),0);
+		if (result > 0)
 		{
-			// If we didnt write everything, advance
-			// the pointers so that when we retry
-			// the next time around the loop, we try
-			// to write what we failed to write before.
-			written += n;
-			s -= n;
-			d += n;
+			if (result == (int)this->Buffer.length())
+			{
+				this->Buffer = "";
+			}
+			else
+			{
+				/* If we wrote some, advance the buffer forwards */
+				char* n = (char*)this->Buffer.c_str();
+				n += result;
+				this->Buffer = n;
+			}
 		}
 	}
-	return written;
 }
 
 bool InspSocket::Timeout(time_t current)
 {
-	if ((this->state == I_CONNECTING) && (current > timeout_end))
+	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
@@ -214,37 +293,52 @@ bool InspSocket::Timeout(time_t current)
 		this->state = I_ERROR;
 		return true;
 	}
+	this->FlushWriteBuffer();
 	return false;
 }
 
 bool InspSocket::Poll()
 {
 	int incoming = -1;
+	bool n = true;
+
+	log(DEBUG,"InspSocket::Poll()");
 	
 	switch (this->state)
 	{
+		case I_RESOLVING:
+			log(DEBUG,"State = I_RESOLVING, calling DoResolve()");
+			return this->DoResolve();
+		break;
 		case I_CONNECTING:
+			log(DEBUG,"State = I_CONNECTED");
 			this->SetState(I_CONNECTED);
 			/* Our socket was in write-state, so delete it and re-add it
 			 * in read-state.
 			 */
-			SE->DelFd(this->fd);
-			SE->AddFd(this->fd,true,X_ESTAB_MODULE);
+			ServerInstance->SE->DelFd(this->fd);
+			ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE);
 			return this->OnConnected();
 		break;
 		case I_LISTENING:
 			length = sizeof (client);
 			incoming = accept (this->fd, (sockaddr*)&client,&length);
+			this->SetQueues(incoming);
 			this->OnIncomingConnection(incoming,inet_ntoa(client.sin_addr));
 			return true;
 		break;
 		case I_CONNECTED:
-			return this->OnDataReady();
+			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();
+			return n;
 		break;
 		default:
 		break;
 	}
-
 	return true;
 }
 
@@ -277,7 +371,3 @@ InspSocket::~InspSocket()
 	this->Close();
 }
 
-/*
-int BindSocket (int sockfd, struct sockaddr_in client, struct sockaddr_in server, int port, char* addr)
-int OpenTCPSocket (void)
-*/