X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=ea0534f24b704a575f5ba2316ac8efb408596e23;hb=bd6158e7b044f853be0b493c0ccbfc7a5c05082e;hp=2fb811508b7608810b8d835454e055fbca873acd;hpb=5a24ea2be476c47ba8d09292375b6a6835c44611;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 2fb811508..ea0534f24 100644
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -11,18 +11,16 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDinspsocket */
+/* $Core */
 
 #include "socket.h"
 #include "inspstring.h"
 #include "socketengine.h"
 #include "inspircd.h"
 
-using irc::sockets::OpenTCPSocket;
-
 bool BufferedSocket::Readable()
 {
-	return ((this->state != I_CONNECTING) && (this->WaitingForWriteEvent == false));
+	return (this->state != I_CONNECTING);
 }
 
 BufferedSocket::BufferedSocket(InspIRCd* SI)
@@ -30,9 +28,7 @@ BufferedSocket::BufferedSocket(InspIRCd* SI)
 	this->Timeout = NULL;
 	this->state = I_DISCONNECTED;
 	this->fd = -1;
-	this->WaitingForWriteEvent = false;
 	this->Instance = SI;
-	this->IsIOHooked = false;
 }
 
 BufferedSocket::BufferedSocket(InspIRCd* SI, int newfd, const char* ip)
@@ -41,108 +37,64 @@ BufferedSocket::BufferedSocket(InspIRCd* SI, int newfd, const char* ip)
 	this->fd = newfd;
 	this->state = I_CONNECTED;
 	strlcpy(this->IP,ip,MAXBUF);
-	this->WaitingForWriteEvent = false;
 	this->Instance = SI;
-	this->IsIOHooked = false;
 	if (this->fd > -1)
 		this->Instance->SE->AddFd(this);
 }
 
-BufferedSocket::BufferedSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool listening, unsigned long maxtime, const std::string &connectbindip)
+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->WaitingForWriteEvent = false;
-	this->IsIOHooked = false;
 	this->Timeout = NULL;
-	if (listening)
+
+	strlcpy(this->host,ipaddr.c_str(),MAXBUF);
+	this->port = aport;
+
+	bool ipvalid = true;
+#ifdef IPV6
+	if (strchr(host,':'))
 	{
-		if ((this->fd = OpenTCPSocket(host)) == ERROR)
-		{
-			this->fd = -1;
-			this->state = I_ERROR;
-			this->OnError(I_ERR_SOCKET);
-			return;
-		}
-		else
-		{
-			if (!SI->BindSocket(this->fd,aport,(char*)ipaddr.c_str()))
-			{
-				this->Close();
-				this->fd = -1;
-				this->state = I_ERROR;
-				this->OnError(I_ERR_BIND);
-				this->ClosePending = true;
-				return;
-			}
-			else
-			{
-				this->state = I_LISTENING;
-				this->port = aport;
-				if (this->fd > -1)
-				{
-					if (!this->Instance->SE->AddFd(this))
-					{
-						this->Close();
-						this->state = I_ERROR;
-						this->OnError(I_ERR_NOMOREFDS);
-					}
-				}
-				return;
-			}
-		}
+		in6_addr n;
+		if (inet_pton(AF_INET6, host, &n) < 1)
+			ipvalid = false;
 	}
 	else
-	{
-		strlcpy(this->host,ipaddr.c_str(),MAXBUF);
-		this->port = aport;
-
-		bool ipvalid = true;
-#ifdef IPV6
-		if (strchr(host,':'))
-		{
-			in6_addr n;
-			if (inet_pton(AF_INET6, host, &n) < 1)
-				ipvalid = false;
-		}
-		else
 #endif
+	{
+		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())
 		{
-			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->OnError(I_ERR_CONNECT);
-				this->Close();
-				this->fd = -1;
-				this->state = I_ERROR;
-				return;
-			}
-		}
 	}
 }
 
 void BufferedSocket::WantWrite()
 {
 	this->Instance->SE->WantWrite(this);
-	this->WaitingForWriteEvent = true;
 }
 
 void BufferedSocket::SetQueues(int nfd)
@@ -359,12 +311,11 @@ void BufferedSocket::Close()
 	int save = errno;
 	if (this->fd > -1)
 	{
-		if (this->IsIOHooked && Instance->Config->GetIOHook(this))
+		if (this->GetIOHook())
 		{
 			try
 			{
-				if (this->state != I_LISTENING)
-					Instance->Config->GetIOHook(this)->OnRawSocketClose(this->fd);
+				this->GetIOHook()->OnRawSocketClose(this->fd);
 			}
 			catch (CoreException& modexcept)
 			{
@@ -392,14 +343,15 @@ const char* BufferedSocket::Read()
 		return NULL;
 
 	int n = 0;
+	char* ReadBuffer = Instance->GetReadBuffer();
 
-	if (this->IsIOHooked)
+	if (this->GetIOHook())
 	{
 		int result2 = 0;
 		int MOD_RESULT = 0;
 		try
 		{
-			MOD_RESULT = Instance->Config->GetIOHook(this)->OnRawSocketRead(this->fd,this->ibuf,sizeof(this->ibuf),result2);
+			MOD_RESULT = this->GetIOHook()->OnRawSocketRead(this->fd, ReadBuffer, Instance->Config->NetBufferSize, result2);
 		}
 		catch (CoreException& modexcept)
 		{
@@ -417,13 +369,19 @@ const char* BufferedSocket::Read()
 	}
 	else
 	{
-		n = recv(this->fd,this->ibuf,sizeof(this->ibuf),0);
+		n = recv(this->fd, ReadBuffer, Instance->Config->NetBufferSize, 0);
 	}
 
-	if ((n > 0) && (n <= (int)sizeof(this->ibuf)))
+	/*
+	 * 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)
 	{
-		ibuf[n] = 0;
-		return ibuf;
+		ReadBuffer[n] = 0;
+		return ReadBuffer;
 	}
 	else
 	{
@@ -461,7 +419,7 @@ bool BufferedSocket::FlushWriteBuffer()
 	errno = 0;
 	if ((this->fd > -1) && (this->state == I_CONNECTED))
 	{
-		if (this->IsIOHooked)
+		if (this->GetIOHook())
 		{
 			while (outbuffer.size() && (errno != EAGAIN))
 			{
@@ -470,7 +428,7 @@ bool BufferedSocket::FlushWriteBuffer()
 					/* XXX: The lack of buffering here is NOT a bug, modules implementing this interface have to
 					 * implement their own buffering mechanisms
 					 */
-					Instance->Config->GetIOHook(this)->OnRawSocketWrite(this->fd, outbuffer[0].c_str(), outbuffer[0].length());
+					this->GetIOHook()->OnRawSocketWrite(this->fd, outbuffer[0].c_str(), outbuffer[0].length());
 					outbuffer.pop_front();
 				}
 				catch (CoreException& modexcept)
@@ -548,7 +506,7 @@ void SocketTimeout::Tick(time_t)
 
 	if (this->sock->state == I_CONNECTING)
 	{
-		// 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.
@@ -571,8 +529,6 @@ void SocketTimeout::Tick(time_t)
 
 bool BufferedSocket::Poll()
 {
-	int incoming = -1;
-
 #ifndef WINDOWS
 	if (!Instance->SE->BoundsCheckFd(this))
 		return false;
@@ -597,12 +553,12 @@ bool BufferedSocket::Poll()
 #endif
 			this->SetState(I_CONNECTED);
 
-			if (Instance->Config->GetIOHook(this))
+			if (this->GetIOHook())
 			{
 				Instance->Logs->Log("SOCKET",DEBUG,"Hook for raw connect");
 				try
 				{
-					Instance->Config->GetIOHook(this)->OnRawSocketConnect(this->fd);
+					this->GetIOHook()->OnRawSocketConnect(this->fd);
 				}
 				catch (CoreException& modexcept)
 				{
@@ -611,53 +567,6 @@ bool BufferedSocket::Poll()
 			}
 			return this->OnConnected();
 		break;
-		case I_LISTENING:
-		{
-			/* 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* client = new sockaddr[2];
-			length = sizeof (sockaddr_in);
-			std::string recvip;
-#ifdef IPV6
-			if ((!*this->host) || strchr(this->host, ':'))
-				length = sizeof(sockaddr_in6);
-#endif
-			incoming = Instance->SE->Accept(this, client, &length);
-#ifdef IPV6
-			if ((!*this->host) || strchr(this->host, ':'))
-			{
-				char buf[1024];
-				recvip = inet_ntop(AF_INET6, &((sockaddr_in6*)client)->sin6_addr, buf, sizeof(buf));
-			}
-			else
-#endif
-			{
-				// FIX: we were doing this for IPv6 connections as well, which was fucking recvip..
-				// Add brackets to make this a bit clearer. -- w00t (Jan 15, 2008)
-				recvip = inet_ntoa(((sockaddr_in*)client)->sin_addr);
-			}
-
-			Instance->SE->NonBlocking(incoming);
-
-			this->OnIncomingConnection(incoming, (char*)recvip.c_str());
-
-			if (this->IsIOHooked)
-			{
-				try
-				{
-					Instance->Config->GetIOHook(this)->OnRawSocketAccept(incoming, recvip.c_str(), this->port);
-				}
-				catch (CoreException& modexcept)
-				{
-					Instance->Logs->Log("SOCKET",DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
-				}
-			}
-
-			this->SetQueues(incoming);
-
-			delete[] client;
-			return true;
-		}
-		break;
 		case I_CONNECTED:
 			/* Process the read event */
 			return this->OnDataReady();
@@ -678,17 +587,15 @@ BufferedSocketState BufferedSocket::GetState()
 	return this->state;
 }
 
-int BufferedSocket::GetFd()
-{
-	return this->fd;
-}
-
 bool BufferedSocket::OnConnected() { return true; }
 void BufferedSocket::OnError(BufferedSocketError) { return; }
 int BufferedSocket::OnDisconnect() { return 0; }
-int BufferedSocket::OnIncomingConnection(int, char*) { return 0; }
 bool BufferedSocket::OnDataReady() { return true; }
-bool BufferedSocket::OnWriteReady() { return true; }
+bool BufferedSocket::OnWriteReady()
+{
+	// Default behaviour: just try write some.
+	return !this->FlushWriteBuffer();
+}
 void BufferedSocket::OnTimeout() { return; }
 void BufferedSocket::OnClose() { return; }
 
@@ -737,16 +644,6 @@ void BufferedSocket::HandleEvent(EventType et, int errornum)
 			}
 		break;
 		case EVENT_WRITE:
-			if (this->WaitingForWriteEvent)
-			{
-				this->WaitingForWriteEvent = false;
-				if (!this->OnWriteReady())
-				{
-					if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end())
-						this->Instance->SocketCull[this] = this;
-					return;
-				}
-			}
 			if (this->state == I_CONNECTING)
 			{
 				/* This might look wrong as if we should be actually calling
@@ -760,7 +657,7 @@ void BufferedSocket::HandleEvent(EventType et, int errornum)
 			}
 			else
 			{
-				if (this->FlushWriteBuffer())
+				if (!this->OnWriteReady())
 				{
 					if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end())
 						this->Instance->SocketCull[this] = this;