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

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index d412b961c..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)
 	{
@@ -116,7 +113,7 @@ BufferedSocket::BufferedSocket(InspIRCd* SI, const std::string &ipaddr, int apor
 		}
 		if (!ipvalid)
 		{
-			this->Instance->Log(DEBUG,"BUG: Hostname passed to BufferedSocket, rather than an IP address!");
+			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;
@@ -236,7 +233,7 @@ bool BufferedSocket::BindAddr(const std::string &ip)
 		}
 		j++;
 	}
-	Instance->Log(DEBUG,"nothing in the config to bind()!");
+	Instance->Logs->Log("SOCKET", DEBUG,"nothing in the config to bind()!");
 	return true;
 }
 
@@ -345,7 +342,7 @@ bool BufferedSocket::DoConnect()
 		this->SetQueues(this->fd);
 	}
 
-	Instance->Log(DEBUG,"BufferedSocket::DoConnect success");
+	Instance->Logs->Log("SOCKET", DEBUG,"BufferedSocket::DoConnect success");
 	return true;
 }
 
@@ -359,15 +356,16 @@ void BufferedSocket::Close()
 	int save = errno;
 	if (this->fd > -1)
 	{
-		if (this->IsIOHooked && Instance->Config->GetIOHook(this))
+		if (this->GetIOHook())
 		{
 			try
 			{
-				Instance->Config->GetIOHook(this)->OnRawSocketClose(this->fd);
+				if (this->state != I_LISTENING)
+					this->GetIOHook()->OnRawSocketClose(this->fd);
 			}
 			catch (CoreException& modexcept)
 			{
-				Instance->Log(DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+				Instance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
 			}
 		}
 		Instance->SE->Shutdown(this, 2);
@@ -385,24 +383,25 @@ std::string BufferedSocket::GetIP()
 	return this->IP;
 }
 
-char* BufferedSocket::Read()
+const char* BufferedSocket::Read()
 {
 	if (!Instance->SE->BoundsCheckFd(this))
 		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)
 		{
-			Instance->Log(DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+			Instance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
 		}
 		if (MOD_RESULT < 0)
 		{
@@ -416,13 +415,19 @@ 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
 	{
@@ -434,21 +439,25 @@ char* BufferedSocket::Read()
 	}
 }
 
-void BufferedSocket::MarkAsClosed()
-{
-}
-
-// 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 BufferedSocket::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)
 {
-	/* 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);
+
+	/* Mark ourselves as wanting write */
 	this->Instance->SE->WantWrite(this);
-	return (!this->FlushWriteBuffer());
 }
 
 bool BufferedSocket::FlushWriteBuffer()
@@ -456,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))
 			{
@@ -465,12 +474,12 @@ 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)
 				{
-					Instance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+					Instance->Logs->Log("SOCKET", DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
 					return true;
 				}
 			}
@@ -536,7 +545,7 @@ bool BufferedSocket::FlushWriteBuffer()
 
 void SocketTimeout::Tick(time_t)
 {
-	ServerInstance->Log(DEBUG,"SocketTimeout::Tick");
+	ServerInstance->Logs->Log("SOCKET", DEBUG,"SocketTimeout::Tick");
 
 	if (ServerInstance->SE->GetRef(this->sfd) != this->sock)
 		return;
@@ -592,16 +601,16 @@ bool BufferedSocket::Poll()
 #endif
 			this->SetState(I_CONNECTED);
 
-			if (Instance->Config->GetIOHook(this))
+			if (this->GetIOHook())
 			{
-				Instance->Log(DEBUG,"Hook for raw connect");
+				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)
 				{
-					Instance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+					Instance->Logs->Log("SOCKET",DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
 				}
 			}
 			return this->OnConnected();
@@ -635,15 +644,15 @@ 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)
 				{
-					Instance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+					Instance->Logs->Log("SOCKET",DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
 				}
 			}