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

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 2fb811508..3b28cc3bd 100644
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -11,7 +11,7 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDinspsocket */
+/* $Core */
 
 #include "socket.h"
 #include "inspstring.h"
@@ -32,7 +32,6 @@ BufferedSocket::BufferedSocket(InspIRCd* SI)
 	this->fd = -1;
 	this->WaitingForWriteEvent = false;
 	this->Instance = SI;
-	this->IsIOHooked = false;
 }
 
 BufferedSocket::BufferedSocket(InspIRCd* SI, int newfd, const char* ip)
@@ -43,7 +42,6 @@ BufferedSocket::BufferedSocket(InspIRCd* SI, int newfd, const char* ip)
 	strlcpy(this->IP,ip,MAXBUF);
 	this->WaitingForWriteEvent = false;
 	this->Instance = SI;
-	this->IsIOHooked = false;
 	if (this->fd > -1)
 		this->Instance->SE->AddFd(this);
 }
@@ -55,7 +53,6 @@ BufferedSocket::BufferedSocket(InspIRCd* SI, const std::string &ipaddr, int apor
 	this->Instance = SI;
 	strlcpy(host,ipaddr.c_str(),MAXBUF);
 	this->WaitingForWriteEvent = false;
-	this->IsIOHooked = false;
 	this->Timeout = NULL;
 	if (listening)
 	{
@@ -359,12 +356,12 @@ 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 +389,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 +415,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 +465,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 +474,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)
@@ -597,12 +601,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)
 				{
@@ -640,11 +644,11 @@ bool BufferedSocket::Poll()
 
 			this->OnIncomingConnection(incoming, (char*)recvip.c_str());
 
-			if (this->IsIOHooked)
+			if (this->GetIOHook())
 			{
 				try
 				{
-					Instance->Config->GetIOHook(this)->OnRawSocketAccept(incoming, recvip.c_str(), this->port);
+					this->GetIOHook()->OnRawSocketAccept(incoming, recvip.c_str(), this->port);
 				}
 				catch (CoreException& modexcept)
 				{