X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=f3917bba0bc91f6e94ed3ce663eadb7dec530068;hb=7a7fb7167c0e96509523c378e776cf38418cd4e5;hp=c44ad130fc7cb8e7c440562458070535eda76211;hpb=e381b06561228aaea752deda20a62c6dc99a560e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index c44ad130f..f3917bba0 100644
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -2,164 +2,111 @@
  *       | 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-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-#include <string>
-#include <sstream>
-#include <iostream>
-#include <fstream>
-#include <stdexcept>
-#include "inspircd_config.h"
+/* $Core */
+
 #include "socket.h"
-#include "configreader.h"
 #include "inspstring.h"
 #include "socketengine.h"
 #include "inspircd.h"
 
-using irc::sockets::OpenTCPSocket;
-using irc::sockets::insp_inaddr;
-using irc::sockets::insp_sockaddr;
-
-bool InspSocket::Readable()
+bool BufferedSocket::Readable()
 {
-	return ((this->state != I_CONNECTING) && (this->WaitingForWriteEvent == false));
+	return (this->state != I_CONNECTING);
 }
 
-InspSocket::InspSocket(InspIRCd* SI)
+BufferedSocket::BufferedSocket(InspIRCd* SI)
 {
+	this->Timeout = NULL;
 	this->state = I_DISCONNECTED;
 	this->fd = -1;
-	this->WaitingForWriteEvent = false;
-	this->ClosePending = false;
 	this->Instance = SI;
 }
 
-InspSocket::InspSocket(InspIRCd* SI, int newfd, const char* ip)
+BufferedSocket::BufferedSocket(InspIRCd* SI, int newfd, const char* ip)
 {
+	this->Timeout = NULL;
 	this->fd = newfd;
 	this->state = I_CONNECTED;
 	strlcpy(this->IP,ip,MAXBUF);
-	this->ClosePending = false;
-	this->WaitingForWriteEvent = false;
 	this->Instance = SI;
 	if (this->fd > -1)
-		this->ClosePending = (!this->Instance->SE->AddFd(this));
+		this->Instance->SE->AddFd(this);
 }
 
-InspSocket::InspSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool listening, unsigned long maxtime)
+BufferedSocket::BufferedSocket(InspIRCd* SI, const std::string &ipaddr, int aport, unsigned long maxtime, const std::string &connectbindip)
 {
+	this->cbindip = connectbindip;
 	this->fd = -1;
 	this->Instance = SI;
 	strlcpy(host,ipaddr.c_str(),MAXBUF);
-	this->ClosePending = false;
-	this->WaitingForWriteEvent = false;
-	if (listening)
+	this->Timeout = NULL;
+
+	strlcpy(this->host,ipaddr.c_str(),MAXBUF);
+	this->port = aport;
+
+	bool ipvalid = true;
+#ifdef IPV6
+	if (strchr(host,':'))
 	{
-		if ((this->fd = OpenTCPSocket()) == ERROR)
-		{
-			this->fd = -1;
-			this->state = I_ERROR;
-			this->OnError(I_ERR_SOCKET);
-			this->ClosePending = true;
-			this->Instance->Log(DEBUG,"OpenTCPSocket() error");
-			return;
-		}
-		else
-		{
-			if (!SI->BindSocket(this->fd,this->client,this->server,aport,(char*)ipaddr.c_str()))
-			{
-				this->Instance->Log(DEBUG,"BindSocket() error %s",strerror(errno));
-				this->Close();
-				this->fd = -1;
-				this->state = I_ERROR;
-				this->OnError(I_ERR_BIND);
-				this->ClosePending = true;
-				return;
-			}
-			else
-			{
-				this->state = I_LISTENING;
-				if (this->fd > -1)
-				{
-					if (!this->Instance->SE->AddFd(this))
-					{
-						this->Close();
-						this->state = I_ERROR;
-						this->OnError(I_ERR_NOMOREFDS);
-						this->ClosePending = true;
-					}
-				}
-				this->Instance->Log(DEBUG,"New socket now in I_LISTENING state");
-				return;
-			}
-		}			
+		in6_addr n;
+		if (inet_pton(AF_INET6, host, &n) < 1)
+			ipvalid = false;
 	}
 	else
+#endif
 	{
-		strlcpy(this->host,ipaddr.c_str(),MAXBUF);
-		this->port = aport;
-
-		if (insp_aton(host,&addy) < 1)
+		in_addr n;
+		if (inet_aton(host,&n) < 1)
+			ipvalid = false;
+	}
+	if (!ipvalid)
+	{
+		this->Instance->Logs->Log("SOCKET", DEBUG,"BUG: Hostname passed to BufferedSocket, rather than an IP address!");
+		this->OnError(I_ERR_CONNECT);
+		this->Close();
+		this->fd = -1;
+		this->state = I_ERROR;
+		return;
+	}
+	else
+	{
+		strlcpy(this->IP,host,MAXBUF);
+		timeout_val = maxtime;
+		if (!this->DoConnect())
 		{
-			this->Instance->Log(DEBUG,"You cannot pass hostnames to InspSocket, resolve them first with Resolver!");
+			this->OnError(I_ERR_CONNECT);
 			this->Close();
 			this->fd = -1;
 			this->state = I_ERROR;
-			this->OnError(I_ERR_RESOLVE);
-			this->ClosePending = true;
 			return;
 		}
-		else
-		{
-			this->Instance->Log(DEBUG,"No need to resolve %s",this->host);
-			strlcpy(this->IP,host,MAXBUF);
-			timeout_end = time(NULL) + maxtime;
-			this->DoConnect();
-		}
 	}
 }
 
-void InspSocket::WantWrite()
+void BufferedSocket::WantWrite()
 {
-	/** XXX:
-	 * The socket engine may only have each FD in the list ONCE.
-	 * This means we cant watch for write AND read at the same
-	 * time. We have to remove the READ fd, to insert the WRITE
-	 * fd. Once we receive our WRITE event (which WILL ARRIVE,
-	 * pretty much gauranteed) we switch back to watching for
-	 * READ events again.
-	 *
-	 * This behaviour may be fixed in a later version.
-	 */
-	this->Instance->SE->DelFd(this);
-	this->WaitingForWriteEvent = true;
-	if (!this->Instance->SE->AddFd(this))
-	{
-		this->Close();
-		this->fd = -1;
-		this->state = I_ERROR;
-		this->OnError(I_ERR_NOMOREFDS);
-		this->ClosePending = true;
-	}
+	this->Instance->SE->WantWrite(this);
 }
 
-void InspSocket::SetQueues(int nfd)
+void BufferedSocket::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));
+	if(setsockopt(nfd,SOL_SOCKET,SO_SNDBUF,(const char *)&sendbuf,sizeof(sendbuf)) || setsockopt(nfd,SOL_SOCKET,SO_RCVBUF,(const char *)&recvbuf,sizeof(sendbuf)))
+	{
+		//this->Instance->Log(DEFAULT, "Could not increase SO_SNDBUF/SO_RCVBUF for socket %u", GetFd());
+		; // do nothing. I'm a little sick of people trying to interpret this message as a result of why their incorrect setups don't work.
+	}
 }
 
 /* Most irc servers require you to specify the ip you want to bind to.
@@ -170,101 +117,165 @@ void InspSocket::SetQueues(int nfd)
  * This is easier to configure when you have a lot of links and a lot
  * of servers to configure.
  */
-bool InspSocket::BindAddr()
+bool BufferedSocket::BindAddr(const std::string &ip)
 {
-	insp_inaddr n;
 	ConfigReader Conf(this->Instance);
-
-	this->Instance->Log(DEBUG,"In InspSocket::BindAddr()");
-	for (int j =0; j < Conf.Enumerate("bind"); j++)
+	socklen_t size = sizeof(sockaddr_in);
+#ifdef IPV6
+	bool v6 = false;
+	/* Are we looking for a binding to fit an ipv6 host? */
+	if ((ip.empty()) || (ip.find(':') != std::string::npos))
+		v6 = true;
+#endif
+	int j = 0;
+	while (j < Conf.Enumerate("bind") || (!ip.empty()))
 	{
-		std::string Type = Conf.ReadValue("bind","type",j);
-		std::string IP = Conf.ReadValue("bind","address",j);
-		if (Type == "servers")
+		std::string sIP = ip.empty() ? Conf.ReadValue("bind","address",j) : ip;
+		if (!ip.empty() || Conf.ReadValue("bind","type",j) == "servers")
 		{
-			if ((IP != "*") && (IP != "127.0.0.1") && (IP != ""))
+			if (!ip.empty() || ((sIP != "*") && (sIP != "127.0.0.1") && (!sIP.empty()) && (sIP != "::1")))
 			{
-				insp_sockaddr s;
-
-				if (insp_aton(IP.c_str(),&n) > 0)
-				{
-					this->Instance->Log(DEBUG,"Found an IP to bind to: %s",IP.c_str());
+				/* The [2] is required because we may write a sockaddr_in6 here, and sockaddr_in6 is larger than sockaddr, where sockaddr_in4 is not. */
+				sockaddr* s = new sockaddr[2];
 #ifdef IPV6
-					s.sin6_addr = n;
-					s.sin6_family = AF_FAMILY;
-#else
-					s.sin_addr = n;
-					s.sin_family = AF_FAMILY;
-#endif
-					if (bind(this->fd,(struct sockaddr*)&s,sizeof(s)) < 0)
+				if (v6)
+				{
+					in6_addr n;
+					if (inet_pton(AF_INET6, sIP.c_str(), &n) > 0)
 					{
-						this->Instance->Log(DEBUG,"Cant bind()");
-						this->state = I_ERROR;
-						this->OnError(I_ERR_BIND);
-						this->fd = -1;
-						return false;
+						memcpy(&((sockaddr_in6*)s)->sin6_addr, &n, sizeof(sockaddr_in6));
+						((sockaddr_in6*)s)->sin6_port = 0;
+						((sockaddr_in6*)s)->sin6_family = AF_INET6;
+						size = sizeof(sockaddr_in6);
+					}
+					else
+					{
+						delete[] s;
+						j++;
+						continue;
 					}
-					this->Instance->Log(DEBUG,"bind() reports outbound fd bound to ip %s",IP.c_str());
-					return true;
 				}
 				else
+#endif
+				{
+					in_addr n;
+					if (inet_aton(sIP.c_str(), &n) > 0)
+					{
+						((sockaddr_in*)s)->sin_addr = n;
+						((sockaddr_in*)s)->sin_port = 0;
+						((sockaddr_in*)s)->sin_family = AF_INET;
+					}
+					else
+					{
+						delete[] s;
+						j++;
+						continue;
+					}
+				}
+
+				if (Instance->SE->Bind(this->fd, s, size) < 0)
 				{
-					this->Instance->Log(DEBUG,"Address '%s' was not an IP address",IP.c_str());
+					this->state = I_ERROR;
+					this->OnError(I_ERR_BIND);
+					this->fd = -1;
+					delete[] s;
+					return false;
 				}
+
+				delete[] s;
+				return true;
 			}
 		}
+		j++;
 	}
-	this->Instance->Log(DEBUG,"Found no suitable IPs to bind, binding INADDR_ANY");
+	Instance->Logs->Log("SOCKET", DEBUG,"nothing in the config to bind()!");
 	return true;
 }
 
-bool InspSocket::DoConnect()
+bool BufferedSocket::DoConnect()
 {
-	this->Instance->Log(DEBUG,"In DoConnect()");
-	if ((this->fd = socket(AF_FAMILY, SOCK_STREAM, 0)) == -1)
+	/* The [2] is required because we may write a sockaddr_in6 here, and sockaddr_in6 is larger than sockaddr, where sockaddr_in4 is not. */
+	sockaddr* addr = new sockaddr[2];
+	socklen_t size = sizeof(sockaddr_in);
+#ifdef IPV6
+	bool v6 = false;
+	if ((!*this->host) || strchr(this->host, ':'))
+		v6 = true;
+
+	if (v6)
+	{
+		this->fd = socket(AF_INET6, SOCK_STREAM, 0);
+		if ((this->fd > -1) && ((strstr(this->IP,"::ffff:") != (char*)&this->IP) && (strstr(this->IP,"::FFFF:") != (char*)&this->IP)))
+		{
+			if (!this->BindAddr(this->cbindip))
+			{
+				delete[] addr;
+				return false;
+			}
+		}
+	}
+	else
+#endif
+	{
+		this->fd = socket(AF_INET, SOCK_STREAM, 0);
+		if (this->fd > -1)
+		{
+			if (!this->BindAddr(this->cbindip))
+			{
+				delete[] addr;
+				return false;
+			}
+		}
+	}
+
+	if (this->fd == -1)
 	{
-		this->Instance->Log(DEBUG,"Cant socket()");
 		this->state = I_ERROR;
 		this->OnError(I_ERR_SOCKET);
-		this->fd = -1;
+		delete[] addr;
 		return false;
 	}
 
-	if ((strstr(this->IP,"::ffff:") != (char*)&this->IP) && (strstr(this->IP,"::FFFF:") != (char*)&this->IP))
+#ifdef IPV6
+	if (v6)
 	{
-		if (!this->BindAddr())
-			return false;
+		in6_addr addy;
+		if (inet_pton(AF_INET6, this->host, &addy) > 0)
+		{
+			((sockaddr_in6*)addr)->sin6_family = AF_INET6;
+			memcpy(&((sockaddr_in6*)addr)->sin6_addr, &addy, sizeof(addy));
+			((sockaddr_in6*)addr)->sin6_port = htons(this->port);
+			size = sizeof(sockaddr_in6);
+		}
 	}
-
-	this->Instance->Log(DEBUG,"Part 2 DoConnect() %s",this->IP);
-	insp_aton(this->IP,&addy);
-#ifdef IPV6
-	addr.sin6_family = AF_FAMILY;
-	memcpy(&addr.sin6_addr, &addy, sizeof(insp_inaddr));
-	addr.sin6_port = htons(this->port);
-#else
-	addr.sin_family = AF_FAMILY;
-	addr.sin_addr = addy;
-	addr.sin_port = htons(this->port);
+	else
 #endif
+	{
+		in_addr addy;
+		if (inet_aton(this->host, &addy) > 0)
+		{
+			((sockaddr_in*)addr)->sin_family = AF_INET;
+			((sockaddr_in*)addr)->sin_addr = addy;
+			((sockaddr_in*)addr)->sin_port = htons(this->port);
+		}
+	}
 
-	int flags;
-	flags = fcntl(this->fd, F_GETFL, 0);
-	fcntl(this->fd, F_SETFL, flags | O_NONBLOCK);
+	Instance->SE->NonBlocking(this->fd);
 
-	if (connect(this->fd, (sockaddr*)&this->addr,sizeof(this->addr)) == -1)
+	if (Instance->SE->Connect(this, (sockaddr*)addr, size) == -1)
 	{
 		if (errno != EINPROGRESS)
 		{
-			this->Instance->Log(DEBUG,"Error connect() %d: %s",this->fd,strerror(errno));
 			this->OnError(I_ERR_CONNECT);
 			this->Close();
 			this->state = I_ERROR;
-			this->fd = -1;
-			this->ClosePending = true;
 			return false;
 		}
+
+		this->Timeout = new SocketTimeout(this->GetFd(), this->Instance, this, timeout_val, this->Instance->Time());
+		this->Instance->Timers->AddTimer(this->Timeout);
 	}
+
 	this->state = I_CONNECTING;
 	if (this->fd > -1)
 	{
@@ -272,218 +283,284 @@ bool InspSocket::DoConnect()
 		{
 			this->OnError(I_ERR_NOMOREFDS);
 			this->Close();
-			this->fd = -1;
 			this->state = I_ERROR;
-			this->ClosePending = true;
 			return false;
 		}
 		this->SetQueues(this->fd);
 	}
-	this->Instance->Log(DEBUG,"Returning true from InspSocket::DoConnect");
+
+	Instance->Logs->Log("SOCKET", DEBUG,"BufferedSocket::DoConnect success");
 	return true;
 }
 
 
-void InspSocket::Close()
+void BufferedSocket::Close()
 {
-	if (this->fd != -1)
+	/* Save this, so we dont lose it,
+	 * otherise on failure, error messages
+	 * might be inaccurate.
+	 */
+	int save = errno;
+	if (this->fd > -1)
 	{
-		this->OnClose();
-		shutdown(this->fd,2);
-		close(this->fd);
-		this->ClosePending = true;
-		this->fd = -1;
+		if (this->GetIOHook())
+		{
+			try
+			{
+				this->GetIOHook()->OnRawSocketClose(this->fd);
+			}
+			catch (CoreException& modexcept)
+			{
+				Instance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+			}
+		}
+		Instance->SE->Shutdown(this, 2);
+		if (Instance->SE->Close(this) != -1)
+			this->OnClose();
+
+		if (Instance->SocketCull.find(this) == Instance->SocketCull.end())
+			Instance->SocketCull[this] = this;
 	}
+	errno = save;
 }
 
-std::string InspSocket::GetIP()
+std::string BufferedSocket::GetIP()
 {
 	return this->IP;
 }
 
-char* InspSocket::Read()
+const char* BufferedSocket::Read()
 {
-	if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+	if (!Instance->SE->BoundsCheckFd(this))
 		return NULL;
-	int n = recv(this->fd,this->ibuf,sizeof(this->ibuf),0);
-	if ((n > 0) && (n <= (int)sizeof(this->ibuf)))
-	{
-		ibuf[n] = 0;
-		return ibuf;
-	}
-	else
+
+	int n = 0;
+	char* ReadBuffer = Instance->GetReadBuffer();
+
+	if (this->GetIOHook())
 	{
-		if (errno == EAGAIN)
+		int result2 = 0;
+		int MOD_RESULT = 0;
+		try
 		{
-			return "";
+			MOD_RESULT = this->GetIOHook()->OnRawSocketRead(this->fd, ReadBuffer, Instance->Config->NetBufferSize, result2);
+		}
+		catch (CoreException& modexcept)
+		{
+			Instance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+		}
+		if (MOD_RESULT < 0)
+		{
+			n = -1;
+			errno = EAGAIN;
 		}
 		else
 		{
-			this->Instance->Log(DEBUG,"EOF or error on socket: %s",strerror(errno));
-			return NULL;
+			n = result2;
 		}
 	}
-}
+	else
+	{
+		n = recv(this->fd, ReadBuffer, Instance->Config->NetBufferSize, 0);
+	}
 
-void InspSocket::MarkAsClosed()
-{
-	this->Instance->Log(DEBUG,"Marked as closed");
-	this->ClosePending = true;
+	/*
+	 * This used to do some silly bounds checking instead of just passing bufsize - 1 to recv.
+	 * Not only does that make absolutely no sense, but it could potentially result in a read buffer's worth
+	 * of data being thrown into the bit bucket for no good reason, which is just *stupid*.. do things correctly now.
+	 * --w00t (july 2, 2008)
+	 */
+	if (n > 0)
+	{
+		ReadBuffer[n] = 0;
+		return ReadBuffer;
+	}
+	else
+	{
+		int err = errno;
+		if (err == EAGAIN)
+			return "";
+		else
+			return NULL;
+	}
 }
 
-// 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)
+/*
+ * This function formerly tried to flush write buffer each call.
+ * While admirable in attempting to get the data out to wherever
+ * it is going, on a full socket, it's just going to syscall write() and
+ * EAGAIN constantly, instead of waiting in the SE to know if it can write
+ * which will chew a bit of CPU.
+ *
+ * So, now this function returns void (take note) and just adds to the sendq.
+ *
+ * It'll get written at a determinate point when the socketengine tells us it can write.
+ *		-- w00t (april 1, 2008)
+ */
+void BufferedSocket::Write(const std::string &data)
 {
-	if (this->ClosePending)
-		return false;
-
-	/*int result = write(this->fd,data.c_str(),data.length());
-	if (result < 1)
-		return false;
-	return true;*/
-
-	/* Try and append the data to the back of the queue, and send it on its way
-	 */
+	/* Append the data to the back of the queue ready for writing */
 	outbuffer.push_back(data);
-	return (!this->FlushWriteBuffer());
+
+	/* Mark ourselves as wanting write */
+	this->Instance->SE->WantWrite(this);
 }
 
-bool InspSocket::FlushWriteBuffer()
+bool BufferedSocket::FlushWriteBuffer()
 {
-	if (this->ClosePending)
-		return true;
-
+	errno = 0;
 	if ((this->fd > -1) && (this->state == I_CONNECTED))
 	{
-		if (outbuffer.size())
+		if (this->GetIOHook())
 		{
-			int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length());
-			if (result > 0)
+			while (outbuffer.size() && (errno != EAGAIN))
 			{
-				if ((unsigned int)result == outbuffer[0].length())
+				try
 				{
-					/* The whole block was written (usually a line)
-					 * Pop the block off the front of the queue
+					/* XXX: The lack of buffering here is NOT a bug, modules implementing this interface have to
+					 * implement their own buffering mechanisms
 					 */
+					this->GetIOHook()->OnRawSocketWrite(this->fd, outbuffer[0].c_str(), outbuffer[0].length());
 					outbuffer.pop_front();
 				}
-				else
+				catch (CoreException& modexcept)
 				{
-					std::string temp = outbuffer[0].substr(result);
-					outbuffer[0] = temp;
+					Instance->Logs->Log("SOCKET", DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+					return true;
 				}
 			}
-			else if ((result == -1) && (errno != EAGAIN))
+		}
+		else
+		{
+			/* If we have multiple lines, try to send them all,
+			 * not just the first one -- Brain
+			 */
+			while (outbuffer.size() && (errno != EAGAIN))
 			{
-				this->Instance->Log(DEBUG,"Write error on socket: %s",strerror(errno));
-				this->OnError(I_ERR_WRITE);
-				this->state = I_ERROR;
-				this->ClosePending = true;
-				return true;
+				/* Send a line */
+				int result = Instance->SE->Send(this, outbuffer[0].c_str(), outbuffer[0].length(), 0);
+
+				if (result > 0)
+				{
+					if ((unsigned int)result >= outbuffer[0].length())
+					{
+						/* The whole block was written (usually a line)
+						 * Pop the block off the front of the queue,
+						 * dont set errno, because we are clear of errors
+						 * and want to try and write the next block too.
+						 */
+						outbuffer.pop_front();
+					}
+					else
+					{
+						std::string temp = outbuffer[0].substr(result);
+						outbuffer[0] = temp;
+						/* We didnt get the whole line out. arses.
+						 * Try again next time, i guess. Set errno,
+						 * because we shouldnt be writing any more now,
+						 * until the socketengine says its safe to do so.
+						 */
+						errno = EAGAIN;
+					}
+				}
+				else if (result == 0)
+				{
+					this->Instance->SE->DelFd(this);
+					this->Close();
+					return true;
+				}
+				else if ((result == -1) && (errno != EAGAIN))
+				{
+					this->OnError(I_ERR_WRITE);
+					this->state = I_ERROR;
+					this->Instance->SE->DelFd(this);
+					this->Close();
+					return true;
+				}
 			}
 		}
 	}
+
+	if ((errno == EAGAIN) && (fd > -1))
+	{
+		this->Instance->SE->WantWrite(this);
+	}
+
 	return (fd < 0);
 }
 
-bool InspSocket::Timeout(time_t current)
+void SocketTimeout::Tick(time_t)
 {
-	if (this->Instance->SE->GetRef(this->fd) != this)
-	{
-		this->Instance->Log(DEBUG,"No FD or socket ref");
-		return false;
-	}
+	ServerInstance->Logs->Log("SOCKET", DEBUG,"SocketTimeout::Tick");
 
-	if (this->ClosePending)
-	{
-		this->Instance->Log(DEBUG,"Close is pending");
-		return true;
-	}
+	if (ServerInstance->SE->GetRef(this->sfd) != this->sock)
+		return;
 
-	if ((this->state == I_CONNECTING) && (current > timeout_end))
+	if (this->sock->state == I_CONNECTING)
 	{
-		this->Instance->Log(DEBUG,"Timed out, current=%lu timeout_end=%lu");
-		// for non-listening sockets, the timeout can occur
+		// for connecting 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;
-		this->ClosePending = true;
-		return true;
+		this->sock->OnTimeout();
+		this->sock->OnError(I_ERR_TIMEOUT);
+
+		/* NOTE: We must set this AFTER DelFd, as we added
+		 * this socket whilst writeable. This means that we
+		 * must DELETE the socket whilst writeable too!
+		 */
+		this->sock->state = I_ERROR;
+
+		if (ServerInstance->SocketCull.find(this->sock) == ServerInstance->SocketCull.end())
+			ServerInstance->SocketCull[this->sock] = this->sock;
 	}
-	return this->FlushWriteBuffer();
+
+	this->sock->Timeout = NULL;
 }
 
-bool InspSocket::Poll()
+bool BufferedSocket::Poll()
 {
-	if (this->Instance->SE->GetRef(this->fd) != this)
+#ifndef WINDOWS
+	if (!Instance->SE->BoundsCheckFd(this))
 		return false;
+#endif
 
-	int incoming = -1;
-	bool n = true;
-
-	if ((fd < 0) || (fd > MAX_DESCRIPTORS) || (this->ClosePending))
+	if (Instance->SE->GetRef(this->fd) != this)
 		return false;
 
 	switch (this->state)
 	{
 		case I_CONNECTING:
-			this->Instance->Log(DEBUG,"State = I_CONNECTING");
 			/* Our socket was in write-state, so delete it and re-add it
 			 * in read-state.
 			 */
+#ifndef WINDOWS
 			if (this->fd > -1)
 			{
 				this->Instance->SE->DelFd(this);
-				this->SetState(I_CONNECTED);
 				if (!this->Instance->SE->AddFd(this))
 					return false;
 			}
-			return this->OnConnected();
-		break;
-		case I_LISTENING:
-			length = sizeof (client);
-			incoming = accept (this->fd, (sockaddr*)&client,&length);
-			this->SetQueues(incoming);
-#ifdef IPV6
-			this->OnIncomingConnection(incoming,(char*)insp_ntoa(client.sin6_addr));
-#else
-			this->OnIncomingConnection(incoming,(char*)insp_ntoa(client.sin_addr));
 #endif
-			return true;
-		break;
-		case I_CONNECTED:
-
-			if (this->WaitingForWriteEvent)
-			{
-				/* Switch back to read events */
-				this->Instance->SE->DelFd(this);
-				this->WaitingForWriteEvent = false;
-				if (!this->Instance->SE->AddFd(this))
-					return false;
+			this->SetState(I_CONNECTED);
 
-				/* Trigger the write event */
-				n = this->OnWriteReady();
-			}
-			else
+			if (this->GetIOHook())
 			{
-				/* Process the read event */
-				n = this->OnDataReady();
+				Instance->Logs->Log("SOCKET",DEBUG,"Hook for raw connect");
+				try
+				{
+					this->GetIOHook()->OnRawSocketConnect(this->fd);
+				}
+				catch (CoreException& modexcept)
+				{
+					Instance->Logs->Log("SOCKET",DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+				}
 			}
-			/* 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.
-			 */
-			if (this->FlushWriteBuffer())
-				return false;
-			return n;
+			return this->OnConnected();
+		break;
+		case I_CONNECTED:
+			/* Process the read event */
+			return this->OnDataReady();
 		break;
 		default:
 		break;
@@ -491,42 +568,94 @@ bool InspSocket::Poll()
 	return true;
 }
 
-void InspSocket::SetState(InspSocketState s)
+void BufferedSocket::SetState(BufferedSocketState s)
 {
-	this->Instance->Log(DEBUG,"Socket state change");
 	this->state = s;
 }
 
-InspSocketState InspSocket::GetState()
+BufferedSocketState BufferedSocket::GetState()
 {
 	return this->state;
 }
 
-int InspSocket::GetFd()
+bool BufferedSocket::OnConnected() { return true; }
+void BufferedSocket::OnError(BufferedSocketError) { return; }
+int BufferedSocket::OnDisconnect() { return 0; }
+bool BufferedSocket::OnDataReady() { return true; }
+bool BufferedSocket::OnWriteReady()
 {
-	return this->fd;
+	// Default behaviour: just try write some.
+	return !this->FlushWriteBuffer();
 }
+void BufferedSocket::OnTimeout() { return; }
+void BufferedSocket::OnClose() { return; }
 
-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; }
-bool InspSocket::OnWriteReady() { return true; }
-void InspSocket::OnTimeout() { return; }
-void InspSocket::OnClose() { return; }
-
-InspSocket::~InspSocket()
+BufferedSocket::~BufferedSocket()
 {
 	this->Close();
+	if (Timeout)
+	{
+		Instance->Timers->DelTimer(Timeout);
+		Timeout = NULL;
+	}
 }
 
-void InspSocket::HandleEvent(EventType et)
+void BufferedSocket::HandleEvent(EventType et, int errornum)
 {
-	if (!this->Poll())
+	switch (et)
 	{
-		this->Instance->SE->DelFd(this);
-		delete this;
+		case EVENT_ERROR:
+			switch (errornum)
+			{
+				case ETIMEDOUT:
+					this->OnError(I_ERR_TIMEOUT);
+				break;
+				case ECONNREFUSED:
+				case 0:
+					this->OnError(this->state == I_CONNECTING ? I_ERR_CONNECT : I_ERR_WRITE);
+				break;
+				case EADDRINUSE:
+					this->OnError(I_ERR_BIND);
+				break;
+				case EPIPE:
+				case EIO:
+					this->OnError(I_ERR_WRITE);
+				break;
+			}
+			if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end())
+				this->Instance->SocketCull[this] = this;
+			return;
+		break;
+		case EVENT_READ:
+			if (!this->Poll())
+			{
+				if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end())
+					this->Instance->SocketCull[this] = this;
+				return;
+			}
+		break;
+		case EVENT_WRITE:
+			if (this->state == I_CONNECTING)
+			{
+				/* This might look wrong as if we should be actually calling
+				 * with EVENT_WRITE, but trust me it is correct. There are some
+				 * writeability-state things in the read code, because of how
+				 * BufferedSocket used to work regarding write buffering in previous
+				 * versions of InspIRCd. - Brain
+				 */
+				this->HandleEvent(EVENT_READ);
+				return;
+			}
+			else
+			{
+				if (!this->OnWriteReady())
+				{
+					if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end())
+						this->Instance->SocketCull[this] = this;
+					return;
+				}
+			}
+		break;
 	}
 }