X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=d18a8f5bc97c81c29fa053a04715d8ec2b4dbaa7;hb=1fb8a3f1b120db764375911be9ad8019a807a8ad;hp=e1f0d2c23ba6783274f3c5a5eb7c0499abf6bc41;hpb=a46930efdc701520a187263e0f08195dcb344ef2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socket.cpp b/src/socket.cpp
index e1f0d2c23..d18a8f5bc 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -2,418 +2,334 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
+/* $Core */
 
-#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 <stdexcept>
-#include "socket.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
+#include "socket.h"
 #include "socketengine.h"
 
-
-extern InspIRCd* ServerInstance;
-extern ServerConfig* Config;
-extern time_t TIME;
-
-InspSocket* socket_ref[MAX_DESCRIPTORS];
-
-InspSocket::InspSocket()
+/** This will bind a socket to a port. It works for UDP/TCP.
+ * It can only bind to IP addresses, if you wish to bind to hostnames
+ * you should first resolve them using class 'Resolver'.
+ */
+bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
 {
-	this->state = I_DISCONNECTED;
-	this->fd = -1;
-	this->ClosePending = false;
-}
+	/* We allocate 2 of these, because sockaddr_in6 is larger than sockaddr (ugh, hax) */
+	sockaddr* servaddr = new sockaddr[2];
+	memset(servaddr,0,sizeof(sockaddr)*2);
 
-InspSocket::InspSocket(int newfd, char* ip)
-{
-	this->fd = newfd;
-	this->state = I_CONNECTED;
-	strlcpy(this->IP,ip,MAXBUF);
-	this->ClosePending = false;
-	ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE);
-	socket_ref[this->fd] = this;
-}
+	int ret, size;
 
-InspSocket::InspSocket(const std::string &ahost, int aport, bool listening, unsigned long maxtime) : fd(-1)
-{
-	strlcpy(host,ahost.c_str(),MAXBUF);
-	this->ClosePending = false;
-	if (listening) {
-		if ((this->fd = OpenTCPSocket()) == ERROR)
+	if (*addr == '*')
+		addr = "";
+
+#ifdef IPV6
+	if (*addr)
+	{
+		/* There is an address here. Is it ipv6? */
+		if (strchr(addr,':'))
 		{
-			this->fd = -1;
-			this->state = I_ERROR;
-			this->OnError(I_ERR_SOCKET);
-			this->ClosePending = true;
-			log(DEBUG,"OpenTCPSocket() error");
-                        return;
+			/* Yes it is */
+			in6_addr addy;
+			if (inet_pton(AF_INET6, addr, &addy) < 1)
+			{
+				delete[] servaddr;
+				return false;
+			}
+
+			((sockaddr_in6*)servaddr)->sin6_family = AF_INET6;
+			memcpy(&(((sockaddr_in6*)servaddr)->sin6_addr), &addy, sizeof(in6_addr));
+			((sockaddr_in6*)servaddr)->sin6_port = htons(port);
+			size = sizeof(sockaddr_in6);
 		}
 		else
 		{
-			if (!BindSocket(this->fd,this->client,this->server,aport,(char*)ahost.c_str()))
+			/* No, its not */
+			in_addr addy;
+			if (inet_pton(AF_INET, addr, &addy) < 1)
 			{
-				this->Close();
-				this->fd = -1;
-				this->state = I_ERROR;
-				this->OnError(I_ERR_BIND);
-				this->ClosePending = true;
-				log(DEBUG,"BindSocket() error %s",strerror(errno));
-				return;
+				delete[] servaddr;
+				return false;
 			}
-			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;
-			}
-		}			
+
+			((sockaddr_in*)servaddr)->sin_family = AF_INET;
+			((sockaddr_in*)servaddr)->sin_addr = addy;
+			((sockaddr_in*)servaddr)->sin_port = htons(port);
+			size = sizeof(sockaddr_in);
+		}
 	}
 	else
 	{
-		strlcpy(this->host,ahost.c_str(),MAXBUF);
-		this->port = aport;
-
-		if (!inet_aton(host,&addy))
+		if (port == -1)
 		{
-			log(DEBUG,"Attempting to resolve %s",this->host);
-			/* 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;
+			/* Port -1: Means UDP IPV4 port binding - Special case
+			 * used by DNS engine.
+			 */
+			((sockaddr_in*)servaddr)->sin_family = AF_INET;
+			((sockaddr_in*)servaddr)->sin_addr.s_addr = htonl(INADDR_ANY);
+			((sockaddr_in*)servaddr)->sin_port = 0;
+			size = sizeof(sockaddr_in);
 		}
 		else
 		{
-			log(DEBUG,"No need to resolve %s",this->host);
-			strlcpy(this->IP,host,MAXBUF);
-			timeout_end = time(NULL) + maxtime;
-			this->DoConnect();
+			/* Theres no address here, default to ipv6 bind to all */
+			((sockaddr_in6*)servaddr)->sin6_family = AF_INET6;
+			memset(&(((sockaddr_in6*)servaddr)->sin6_addr), 0, sizeof(in6_addr));
+			((sockaddr_in6*)servaddr)->sin6_port = htons(port);
+			size = sizeof(sockaddr_in6);
 		}
 	}
-}
-
-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));
-}
-
-bool InspSocket::DoResolve()
-{
-	log(DEBUG,"In DoResolve(), trying to resolve IP");
-	if (this->dns.HasResult())
+#else
+	/* If we aren't built with ipv6, the choice becomes simple */
+	((sockaddr_in*)servaddr)->sin_family = AF_INET;
+	if (*addr)
 	{
-		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());
-			strlcpy(this->IP,res_ip.c_str(),MAXBUF);
-			socket_ref[this->fd] = NULL;
-		}
-		else
+		/* There is an address here. */
+		in_addr addy;
+		if (inet_pton(AF_INET, addr, &addy) < 1)
 		{
-			log(DEBUG,"Socket DNS failure");
-			this->Close();
-			this->state = I_ERROR;
-			this->OnError(I_ERR_RESOLVE);
-			this->fd = -1;
-			this->ClosePending = true;
+			delete[] servaddr;
 			return false;
 		}
-		return this->DoConnect();
+		((sockaddr_in*)servaddr)->sin_addr = addy;
 	}
-	log(DEBUG,"No result for socket yet!");
-	return true;
-}
-
-bool InspSocket::DoConnect()
-{
-	log(DEBUG,"In DoConnect()");
-	if ((this->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
+	else
+	{
+		/* Bind ipv4 to all */
+		((sockaddr_in*)servaddr)->sin_addr.s_addr = htonl(INADDR_ANY);
+	}
+	/* Bind ipv4 port number */
+	((sockaddr_in*)servaddr)->sin_port = htons(port);
+	size = sizeof(sockaddr_in);
+#endif
+	ret = SE->Bind(sockfd, servaddr, size);
+	delete[] servaddr;
+
+	if (ret < 0)
 	{
-		log(DEBUG,"Cant socket()");
-		this->state = I_ERROR;
-		this->OnError(I_ERR_SOCKET);
-		this->fd = -1;
 		return false;
 	}
-
-	log(DEBUG,"Part 2 DoConnect() %s",this->IP);
-	inet_aton(this->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)
+		if (dolisten)
 		{
-			log(DEBUG,"Error connect() %d: %s",this->fd,strerror(errno));
-			this->OnError(I_ERR_CONNECT);
-			this->state = I_ERROR;
-			this->Close();
-			this->fd = -1;
-			this->ClosePending = true;
-			return false;
+			if (SE->Listen(sockfd, Config->MaxConn) == -1)
+			{
+				this->Logs->Log("SOCKET",DEFAULT,"ERROR in listen(): %s",strerror(errno));
+				return false;
+			}
+			else
+			{
+				this->Logs->Log("SOCKET",DEBUG,"New socket binding for %d with listen: %s:%d", sockfd, addr, port);
+				SE->NonBlocking(sockfd);
+				return true;
+			}
+		}
+		else
+		{
+			this->Logs->Log("SOCKET",DEBUG,"New socket binding for %d without listen: %s:%d", sockfd, addr, port);
+			return true;
 		}
 	}
-	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()
+// Open a TCP Socket
+int irc::sockets::OpenTCPSocket(const char* addr, int socktype)
 {
-	if (this->fd != -1)
+	int sockfd;
+	int on = 1;
+	addr = addr;
+	struct linger linger = { 0, 0 };
+#ifdef IPV6
+	if (!*addr)
 	{
-		this->OnClose();
-	        shutdown(this->fd,2);
-	        close(this->fd);
-		socket_ref[this->fd] = NULL;
-		this->ClosePending = true;
-	        this->fd = -1;
+		sockfd = socket (PF_INET6, socktype, 0);
+		if (sockfd < 0)
+			sockfd = socket (PF_INET, socktype, 0);
 	}
-}
-
-std::string InspSocket::GetIP()
-{
-	return this->IP;
-}
-
-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 <= (int)sizeof(this->ibuf)))
+	else if (strchr(addr,':'))
+		sockfd = socket (PF_INET6, socktype, 0);
+	else
+		sockfd = socket (PF_INET, socktype, 0);
+	if (sockfd < 0)
+#else
+	if ((sockfd = socket (PF_INET, socktype, 0)) < 0)
+#endif
 	{
-		ibuf[n] = 0;
-		return ibuf;
+		return ERROR;
 	}
 	else
 	{
-		if (errno == EAGAIN)
-		{
-			return "";
-		}
-		else
-		{
-			log(DEBUG,"EOF or error on socket: %s",strerror(errno));
-			return NULL;
-		}
+		setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (char*)&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, (char*)&linger,sizeof(linger));
+		return (sockfd);
 	}
 }
 
-void InspSocket::MarkAsClosed()
+// XXX: it would be VERY nice to genericize this so all listen stuff (server/client) could use the one function. -- w00t
+int InspIRCd::BindPorts(FailedPortList &failed_ports)
 {
-	log(DEBUG,"Marked as closed");
-	this->ClosePending = true;
-}
-
-// 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(const std::string &data)
-{
-	if (this->ClosePending)
-		return false;
+	char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
+	int bound = 0;
+	bool started_with_nothing = (ports.size() == 0);
+	std::vector<std::pair<std::string, int> > old_ports;
 
-	/*int result = write(this->fd,data.c_str(),data.length());
-	if (result < 1)
-		return false;
-	return true;*/
+	/* XXX: Make a copy of the old ip/port pairs here */
+	for (std::vector<ListenSocketBase *>::iterator o = ports.begin(); o != ports.end(); ++o)
+		old_ports.push_back(make_pair((*o)->GetIP(), (*o)->GetPort()));
 
-	/* Try and append the data to the back of the queue, and send it on its way
-	 */
-	outbuffer.push_back(data);
-	return (!this->FlushWriteBuffer());
-}
+	for (int count = 0; count < Config->ConfValueEnum("bind"); count++)
+	{
+		Config->ConfValue("bind", "port", count, configToken, MAXBUF);
+		Config->ConfValue("bind", "address", count, Addr, MAXBUF);
+		Config->ConfValue("bind", "type", count, Type, MAXBUF);
 
-bool InspSocket::FlushWriteBuffer()
-{
-	if (this->ClosePending)
-		return true;
+		if (strncmp(Addr, "::ffff:", 7) == 0)
+			this->Logs->Log("SOCKET",DEFAULT, "Using 4in6 (::ffff:) isn't recommended. You should bind IPv4 addresses directly instead.");
 
-	if ((this->fd > -1) && (this->state == I_CONNECTED))
-	{
-		if (outbuffer.size())
+		if ((!*Type) || (!strcmp(Type,"clients")))
 		{
-			int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length());
-			if (result > 0)
+			irc::portparser portrange(configToken, false);
+			int portno = -1;
+			while (0 != (portno = portrange.GetToken()))
 			{
-				if ((unsigned int)result == outbuffer[0].length())
+				if (*Addr == '*')
+					*Addr = 0;
+
+				bool skip = false;
+				for (std::vector<ListenSocketBase *>::iterator n = ports.begin(); n != ports.end(); ++n)
 				{
-					/* The whole block was written (usually a line)
-					 * Pop the block off the front of the queue
-					 */
-					outbuffer.pop_front();
+					if (((*n)->GetIP() == Addr) && ((*n)->GetPort() == portno))
+					{
+						skip = true;
+						/* XXX: Here, erase from our copy of the list */
+						for (std::vector<std::pair<std::string, int> >::iterator k = old_ports.begin(); k != old_ports.end(); ++k)
+						{
+							if ((k->first == Addr) && (k->second == portno))
+							{
+								old_ports.erase(k);
+								break;
+							}
+						}
+					}
 				}
-				else
+				if (!skip)
 				{
-					std::string temp = outbuffer[0].substr(result);
-					outbuffer[0] = temp;
+					ClientListenSocket *ll = new ClientListenSocket(this, portno, Addr);
+					if (ll->GetFd() > -1)
+					{
+						bound++;
+						ports.push_back(ll);
+					}
+					else
+					{
+						failed_ports.push_back(std::make_pair((*Addr ? Addr : "*") + std::string(":") + ConvToStr(portno), strerror(errno)));
+					}
 				}
 			}
-			else if ((result == -1) && (errno != EAGAIN))
+		}
+	}
+
+	/* XXX: Here, anything left in our copy list, close as removed */
+	if (!started_with_nothing)
+	{
+		for (size_t k = 0; k < old_ports.size(); ++k)
+		{
+			for (std::vector<ListenSocketBase *>::iterator n = ports.begin(); n != ports.end(); ++n)
 			{
-				log(DEBUG,"Write error on socket: %s",strerror(errno));
-				this->OnError(I_ERR_WRITE);
-				this->state = I_ERROR;
-				return true;
+				if (((*n)->GetIP() == old_ports[k].first) && ((*n)->GetPort() == old_ports[k].second))
+				{
+					this->Logs->Log("SOCKET",DEFAULT,"Port binding %s:%d was removed from the config file, closing.", old_ports[k].first.c_str(), old_ports[k].second);
+					delete *n;
+					ports.erase(n);
+					break;
+				}
 			}
 		}
 	}
-	return false;
+
+	return bound;
+}
+
+const char* irc::sockets::insp_ntoa(insp_inaddr n)
+{
+	static char buf[1024];
+	inet_ntop(AF_FAMILY, &n, buf, sizeof(buf));
+	return buf;
+}
+
+int irc::sockets::insp_aton(const char* a, insp_inaddr* n)
+{
+	return inet_pton(AF_FAMILY, a, n);
 }
 
-bool InspSocket::Timeout(time_t current)
+int irc::sockets::aptosa(const char* addr, int port, irc::sockets::sockaddrs* sa)
 {
-	if (!socket_ref[this->fd] || !ServerInstance->SE->HasFd(this->fd))
+	memset(sa, 0, sizeof(*sa));
+	if (!addr || !*addr)
 	{
-		log(DEBUG,"No FD or socket ref");
-		return false;
+#ifdef IPV6
+		sa->in6.sin6_family = AF_INET6;
+		sa->in6.sin6_port = htons(port);
+#else
+		sa->in4.sin_family = AF_INET;
+		sa->in4.sin_port = htons(port);
+#endif
+		return true;
 	}
-
-	if (this->ClosePending)
+	else if (inet_pton(AF_INET, addr, &sa->in4.sin_addr) > 0)
 	{
-		log(DEBUG,"Close is pending");
+		sa->in4.sin_family = AF_INET;
+		sa->in4.sin_port = htons(port);
 		return true;
 	}
-
-	if (((this->state == I_RESOLVING) || (this->state == I_CONNECTING)) && (current > timeout_end))
+	else if (inet_pton(AF_INET6, addr, &sa->in6.sin6_addr) > 0)
 	{
-		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
-		// connection.
-		this->OnTimeout();
-		this->OnError(I_ERR_TIMEOUT);
-		timeout = true;
-		this->state = I_ERROR;
+		sa->in6.sin6_family = AF_INET6;
+		sa->in6.sin6_port = htons(port);
 		return true;
 	}
-	return this->FlushWriteBuffer();
+	return false;
 }
 
-bool InspSocket::Poll()
-{
-	if (!socket_ref[this->fd] || !ServerInstance->SE->HasFd(this->fd))
-		return false;
-
-	int incoming = -1;
-	bool n = true;
-
-	if ((fd < 0) || (fd > MAX_DESCRIPTORS) || (this->ClosePending))
-		return false;
-
-	switch (this->state)
+int irc::sockets::satoap(const irc::sockets::sockaddrs* sa, std::string& addr, int &port) {
+	char addrv[INET6_ADDRSTRLEN+1];
+	if (sa->sa.sa_family == AF_INET)
 	{
-		case I_RESOLVING:
-			log(DEBUG,"State = I_RESOLVING, calling DoResolve()");
-			return this->DoResolve();
-		break;
-		case I_CONNECTING:
-			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.
-			 */
-			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:
-			n = this->OnDataReady();
-			/* Flush any pending, but not till after theyre done with the event
-			 * 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;
+		if (!inet_ntop(AF_INET, &sa->in4.sin_addr, addrv, sizeof(addrv)))
+			return false;
+		addr = addrv;
+		port = ntohs(sa->in4.sin_port);
+		return true;
 	}
-	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;
+	else if (sa->sa.sa_family == AF_INET6)
+	{
+		if (!inet_ntop(AF_INET6, &sa->in6.sin6_addr, addrv, sizeof(addrv)))
+			return false;
+		addr = addrv;
+		port = ntohs(sa->in6.sin6_port);
+		return true;
+	}
+	return false;
 }
 
-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()
+int irc::sockets::sa_size(irc::sockets::sockaddrs& sa)
 {
-	this->Close();
+	if (sa.sa.sa_family == AF_INET)
+		return sizeof(sa.in4);
+	if (sa.sa.sa_family == AF_INET6)
+		return sizeof(sa.in6);
+	return 0;
 }