X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=f9b605d3be05a2a1377d18ece0befafca5489261;hb=84a19a9ab6129deb71cdc24b216b74dd8eb80978;hp=9c2f5a362ba8d473a7ed432e6a7f1c77ad29e354;hpb=656e19351668cb5ada005d4e9e7e6d1f787990e2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socket.cpp b/src/socket.cpp
index 9c2f5a362..f9b605d3b 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -14,292 +14,236 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
 #include <string>
-#include <unistd.h>
-#include <fcntl.h>
-#include <poll.h>
-#include <sstream>
-#include <iostream>
-#include <fstream>
+#include "configreader.h"
 #include "socket.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
 #include "inspstring.h"
 #include "helperfuncs.h"
 #include "socketengine.h"
-
+#include "message.h"
 
 extern InspIRCd* ServerInstance;
+extern ServerConfig* Config;
 extern time_t TIME;
+extern int openSockfd[MAX_DESCRIPTORS];
 
 InspSocket* socket_ref[MAX_DESCRIPTORS];
 
-InspSocket::InspSocket()
+/** This will bind a socket to a port. It works for UDP/TCP.
+ * If a hostname is given to bind to, the function will first
+ * attempt to resolve the hostname, then bind to the IP the 
+ * hostname resolves to. This is a blocking lookup blocking for
+ * a maximum of one second before it times out, using the DNS
+ * server specified in the configuration file.
+ */ 
+bool BindSocket(int sockfd, insp_sockaddr client, insp_sockaddr server, int port, char* addr)
 {
-	this->state = I_DISCONNECTED;
-}
+	memset(&server,0,sizeof(server));
+	insp_inaddr addy;
+	bool resolved = false;
+	char resolved_addr[128];
 
-InspSocket::InspSocket(int newfd, char* ip)
-{
-	this->fd = newfd;
-	this->state = I_CONNECTED;
-	this->IP = ip;
-	ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE);
-	socket_ref[this->fd] = this;
-}
+	if (*addr == '*')
+		*addr = 0;
 
-InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long maxtime)
-{
-	if (listening) {
-		if ((this->fd = OpenTCPSocket()) == ERROR)
-		{
-			this->fd = -1;
-			this->state = I_ERROR;
-			this->OnError(I_ERR_SOCKET);
-			log(DEBUG,"OpenTCPSocket() error");
-                        return;
-		}
-		else
-		{
-			if (BindSocket(this->fd,this->client,this->server,port,(char*)host.c_str()) == ERROR)
-			{
-				this->Close();
-				this->fd = -1;
-				this->state = I_ERROR;
-				this->OnError(I_ERR_BIND);
-				log(DEBUG,"BindSocket() error %s",strerror(errno));
-				return;
-			}
-			else
-			{
-				this->state = I_LISTENING;
-				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 {
-		this->host = host;
-
-		if (this->dns.ForwardLookupWithFD(host,fd))
+	if (*addr && !inet_aton(addr,&addy))
+	{
+		/* If they gave a hostname, bind to the IP it resolves to */
+		if (CleanAndResolve(resolved_addr, addr, true))
 		{
-	                timeout_end = time(NULL)+maxtime;
-	                timeout = false;
-			this->state = I_RESOLVING;
+			inet_aton(resolved_addr,&addy);
+			log(DEFAULT,"Resolved binding '%s' -> '%s'",addr,resolved_addr);
+			server.sin_addr = addy;
+			resolved = true;
 		}
 		else
 		{
-			this->state = I_ERROR;
-			this->OnError(I_ERR_RESOLVE);
-                        return;
+			log(DEFAULT,"WARNING: Could not resolve '%s' to an IP for binding to on port %d",addr,port);
+			return false;
 		}
-}
-
-bool InspSocket::DoResolve()
-{
-	if (this->dns.HasResult())
+	}
+	server.sin_family = AF_INET;
+	if (!resolved)
 	{
-		std::string res_ip = dns.GetResultIP();
-		
-		if (res_ip != "")
+		if (!*addr)
 		{
-			this->IP = ip;
+			server.sin_addr.s_addr = htonl(INADDR_ANY);
 		}
 		else
 		{
-			this->IP = this->host;
+			server.sin_addr = addy;
 		}
-
-		if ((this->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
+	}
+	server.sin_port = htons(port);
+	if (bind(sockfd,(struct sockaddr*)&server,sizeof(server)) < 0)
+	{
+		return false;
+	}
+	else
+	{
+		log(DEBUG,"Bound port %s:%d",*addr ? addr : "*",port);
+		if (listen(sockfd, Config->MaxConn) == -1)
 		{
-			this->state = I_ERROR;
-			this->OnError(I_ERR_SOCKET);
+			log(DEFAULT,"ERROR in listen(): %s",strerror(errno));
 			return false;
 		}
-		this->port = port;
-		inet_aton(ip,&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)
+		else
 		{
-			if (errno != EINPROGRESS)
-			{
-				this->Close();
-				this->OnError(I_ERR_CONNECT);
-				this->state = I_ERROR;
-				return false;
-			}
+			NonBlocking(sockfd);
+			return true;
 		}
-		this->state = I_CONNECTING;
-		ServerInstance->SE->AddFd(this->fd,false,X_ESTAB_MODULE);
-		socket_ref[this->fd] = this;
-		return true;
 	}
 }
 
-void InspSocket::Close()
+
+// Open a TCP Socket
+int OpenTCPSocket()
 {
-	if (this->fd != -1)
+	int sockfd;
+	int on = 1;
+	struct linger linger = { 0 };
+  
+	if ((sockfd = socket (AF_INET, SOCK_STREAM, 0)) < 0)
 	{
-		this->OnClose();
-	        shutdown(this->fd,2);
-	        close(this->fd);
-		socket_ref[this->fd] = NULL;
-	        this->fd = -1;
+		log(DEFAULT,"Error creating TCP socket: %s",strerror(errno));
+		return (ERROR);
+	}
+	else
+	{
+		setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
+		/* This is BSD compatible, setting l_onoff to 0 is *NOT* http://web.irc.org/mla/ircd-dev/msg02259.html */
+		linger.l_onoff = 1;
+		linger.l_linger = 1;
+		setsockopt(sockfd, SOL_SOCKET, SO_LINGER, &linger,sizeof(linger));
+		return (sockfd);
 	}
 }
 
-std::string InspSocket::GetIP()
+bool HasPort(int port, char* addr)
 {
-	return this->IP;
+	for (int count = 0; count < ServerInstance->stats->BoundPortCount; count++)
+	{
+		if ((port == Config->ports[count]) && (!strcasecmp(Config->addrs[count],addr)))
+		{
+			return true;
+		}
+	}
+	return false;
 }
 
-char* InspSocket::Read()
+int BindPorts(bool bail)
 {
-	int n = recv(this->fd,this->ibuf,sizeof(this->ibuf),0);
-	if (n > 0)
-	{
-		ibuf[n] = 0;
-		return ibuf;
-	}
-	else
+	char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
+	insp_sockaddr client, server;
+	int clientportcount = 0;
+	int BoundPortCount = 0;
+
+	if (!bail)
 	{
-		if (n == EAGAIN)
+		int InitialPortCount = ServerInstance->stats->BoundPortCount;
+		log(DEBUG,"Initial port count: %d",InitialPortCount);
+
+		for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "bind"); count++)
+		{
+			Config->ConfValue(Config->config_data, "bind", "port", count, configToken, MAXBUF);
+			Config->ConfValue(Config->config_data, "bind", "address", count, Addr, MAXBUF);
+			Config->ConfValue(Config->config_data, "bind", "type", count, Type, MAXBUF);
+
+			if (((!*Type) || (!strcmp(Type,"clients"))) && (!HasPort(atoi(configToken),Addr)))
+			{
+				// modules handle server bind types now
+				Config->ports[clientportcount+InitialPortCount] = atoi(configToken);
+				if (*Addr == '*')
+					*Addr = 0;
+
+				strlcpy(Config->addrs[clientportcount+InitialPortCount],Addr,256);
+				clientportcount++;
+				log(DEBUG,"NEW binding %s:%s [%s] from config",Addr,configToken, Type);
+			}
+		}
+		int PortCount = clientportcount;
+		if (PortCount)
 		{
-			return "";
+			for (int count = InitialPortCount; count < InitialPortCount + PortCount; count++)
+			{
+				if ((openSockfd[count] = OpenTCPSocket()) == ERROR)
+				{
+					log(DEBUG,"Bad fd %d binding port [%s:%d]",openSockfd[count],Config->addrs[count],Config->ports[count]);
+					return ERROR;
+				}
+				if (!BindSocket(openSockfd[count],client,server,Config->ports[count],Config->addrs[count]))
+				{
+					log(DEFAULT,"Failed to bind port [%s:%d]: %s",Config->addrs[count],Config->ports[count],strerror(errno));
+				}
+				else
+				{
+					/* Associate the new open port with a slot in the socket engine */
+					ServerInstance->SE->AddFd(openSockfd[count],true,X_LISTEN);
+					BoundPortCount++;
+				}
+			}
+			return InitialPortCount + BoundPortCount;
 		}
 		else
 		{
-			log(DEBUG,"EOF or error on socket");
-			return NULL;
+			log(DEBUG,"There is nothing new to bind!");
 		}
+		return InitialPortCount;
 	}
-}
 
-// There are two possible outcomes to this function.
-// 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)
-{
-	this->Buffer = this->Buffer + data;
-	this->FlushWriteBuffer();
-	return data.length();
-}
-
-void InspSocket::FlushWriteBuffer()
-{
-	int result = 0;
-	if (this->Buffer.length())
+	for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "bind"); count++)
 	{
-		result = send(this->fd,this->Buffer.c_str(),this->Buffer.length(),0);
-		if (result > 0)
+		Config->ConfValue(Config->config_data, "bind", "port", count, configToken, MAXBUF);
+		Config->ConfValue(Config->config_data, "bind", "address", count, Addr, MAXBUF);
+		Config->ConfValue(Config->config_data, "bind", "type", count, Type, MAXBUF);
+
+		if ((!*Type) || (!strcmp(Type,"clients")))
 		{
-			/* If we wrote some, advance the buffer forwards */
-			char* n = (char*)this->Buffer.c_str();
-			n += result;
-			this->Buffer = n;
+			// modules handle server bind types now
+			Config->ports[clientportcount] = atoi(configToken);
+
+			// If the client put bind "*", this is an unrealism.
+			// We don't actually support this as documented, but
+			// i got fed up of people trying it, so now it converts
+			// it to an empty string meaning the same 'bind to all'.
+			if (*Addr == '*')
+				*Addr = 0;
+
+			strlcpy(Config->addrs[clientportcount],Addr,256);
+			clientportcount++;
+			log(DEBUG,"Binding %s:%s [%s] from config",Addr,configToken, Type);
 		}
 	}
-}
 
-bool InspSocket::Timeout(time_t current)
-{
-	if (((this->state == I_RESOLVING) || (this->state == I_CONNECTING)) && (current > timeout_end))
+	int PortCount = clientportcount;
+
+	for (int count = 0; count < PortCount; count++)
 	{
-		// for non-listening sockets, the timeout can occur
-		// which causes termination of the connection after
-		// the given number of seconds without a successful
-		// connection.
-		this->OnTimeout();
-		this->OnError(I_ERR_TIMEOUT);
-		timeout = true;
-		this->state = I_ERROR;
-		return true;
+		if ((openSockfd[BoundPortCount] = OpenTCPSocket()) == ERROR)
+		{
+			log(DEBUG,"Bad fd %d binding port [%s:%d]",openSockfd[BoundPortCount],Config->addrs[count],Config->ports[count]);
+			return ERROR;
+		}
+
+		if (!BindSocket(openSockfd[BoundPortCount],client,server,Config->ports[count],Config->addrs[count]))
+		{
+			log(DEFAULT,"Failed to bind port [%s:%d]: %s",Config->addrs[count],Config->ports[count],strerror(errno));
+		}
+		else
+		{
+			/* well we at least bound to one socket so we'll continue */
+			BoundPortCount++;
+		}
 	}
-	if (this->Buffer.length())
-		this->FlushWriteBuffer();
-	return false;
-}
 
-bool InspSocket::Poll()
-{
-	int incoming = -1;
-	
-	switch (this->state)
+	/* if we didn't bind to anything then abort */
+	if (!BoundPortCount)
 	{
-		case I_RESOLVING:
-			return this->DoResolve();
-		break;
-		case I_CONNECTING:
-			this->SetState(I_CONNECTED);
-			/* Our socket was in write-state, so delete it and re-add it
-			 * in read-state.
-			 */
-			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->OnIncomingConnection(incoming,inet_ntoa(client.sin_addr));
-			return true;
-		break;
-		case I_CONNECTED:
-			return this->OnDataReady();
-		break;
-		default:
-		break;
+		log(DEFAULT,"No ports bound, bailing!");
+		printf("\nERROR: Could not bind any of %d ports! Please check your configuration.\n\n", PortCount);
+		return ERROR;
 	}
 
-	if (this->Buffer.length())
-		this->FlushWriteBuffer();
-
-	return true;
-}
-
-void InspSocket::SetState(InspSocketState s)
-{
-	log(DEBUG,"Socket state change");
-	this->state = s;
-}
-
-InspSocketState InspSocket::GetState()
-{
-	return this->state;
-}
-
-int InspSocket::GetFd()
-{
-	return this->fd;
+	return BoundPortCount;
 }
-
-bool InspSocket::OnConnected() { return true; }
-void InspSocket::OnError(InspSocketError e) { return; }
-int InspSocket::OnDisconnect() { return 0; }
-int InspSocket::OnIncomingConnection(int newfd, char* ip) { return 0; }
-bool InspSocket::OnDataReady() { return true; }
-void InspSocket::OnTimeout() { return; }
-void InspSocket::OnClose() { return; }
-
-InspSocket::~InspSocket()
-{
-	this->Close();
-}
-