Give feedback to remote users

[user/henk/code/inspircd.git] / src / inspsocket.cpp

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index d412b961cd373ad76fed689853d8758c50336d08..c096d9076faf2ab26eb07dc94c017e39079909e1 100644 (file)
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -11,7 +11,7 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDinspsocket */
+/* $Core */
 
 #include "socket.h"
 #include "inspstring.h"
@@ -116,7 +116,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 +236,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 +345,7 @@ bool BufferedSocket::DoConnect()
                this->SetQueues(this->fd);
        }
 
-       Instance->Log(DEBUG,"BufferedSocket::DoConnect success");
+       Instance->Logs->Log("SOCKET", DEBUG,"BufferedSocket::DoConnect success");
        return true;
 }
 
@@ -363,11 +363,12 @@ void BufferedSocket::Close()
                {
                        try
                        {
-                               Instance->Config->GetIOHook(this)->OnRawSocketClose(this->fd);
+                               if (this->state != I_LISTENING)
+                                       Instance->Config->GetIOHook(this)->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,12 +386,13 @@ 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)
        {
@@ -398,11 +400,11 @@ char* BufferedSocket::Read()
                int MOD_RESULT = 0;
                try
                {
-                       MOD_RESULT = Instance->Config->GetIOHook(this)->OnRawSocketRead(this->fd,this->ibuf,sizeof(this->ibuf),result2);
+                       MOD_RESULT = Instance->Config->GetIOHook(this)->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 +418,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 +442,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()
@@ -470,7 +482,7 @@ bool BufferedSocket::FlushWriteBuffer()
                                }
                                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 +548,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;
@@ -594,14 +606,14 @@ bool BufferedSocket::Poll()
 
                        if (Instance->Config->GetIOHook(this))
                        {
-                               Instance->Log(DEBUG,"Hook for raw connect");
+                               Instance->Logs->Log("SOCKET",DEBUG,"Hook for raw connect");
                                try
                                {
                                        Instance->Config->GetIOHook(this)->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();
@@ -643,7 +655,7 @@ bool BufferedSocket::Poll()
                                }
                                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());
                                }
                        }