Destroy Memberships of a quitting user in QuitUser() instead of in cull()

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

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 5f2da23419b2db00b86cff7549f82479c0919832..798cde9b01dd3ad2c10bb9a94657cacb3a78e1ce 100644 (file)
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -26,6 +26,7 @@
 #include "socket.h"
 #include "inspstring.h"
 #include "socketengine.h"
+#include "iohook.h"
 
 #ifndef DISABLE_WRITEV
 #include <sys/uio.h>
@@ -56,7 +57,7 @@ void BufferedSocket::DoConnect(const std::string &ipaddr, int aport, unsigned lo
        if (err != I_ERR_NONE)
        {
                state = I_ERROR;
-               SetError(strerror(errno));
+               SetError(SocketEngine::LastError());
                OnError(err);
        }
 }
@@ -98,7 +99,7 @@ BufferedSocketError BufferedSocket::BeginConnect(const irc::sockets::sockaddrs&
 
        ServerInstance->SE->NonBlocking(fd);
 
-       if (ServerInstance->SE->Connect(this, &dest.sa, sa_size(dest)) == -1)
+       if (ServerInstance->SE->Connect(this, &dest.sa, dest.sa_size()) == -1)
        {
                if (errno != EINPROGRESS)
                        return I_ERR_CONNECT;
@@ -112,7 +113,7 @@ BufferedSocketError BufferedSocket::BeginConnect(const irc::sockets::sockaddrs&
        this->Timeout = new SocketTimeout(this->GetFd(), this, timeout, ServerInstance->Time());
        ServerInstance->Timers->AddTimer(this->Timeout);
 
-       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG,"BufferedSocket::DoConnect success");
+       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BufferedSocket::DoConnect success");
        return I_ERR_NONE;
 }
 
@@ -122,18 +123,19 @@ void StreamSocket::Close()
        {
                // final chance, dump as much of the sendq as we can
                DoWrite();
-               if (IOHook)
+               if (GetIOHook())
                {
                        try
                        {
-                               IOHook->OnStreamSocketClose(this);
+                               GetIOHook()->OnStreamSocketClose(this);
                        }
                        catch (CoreException& modexcept)
                        {
-                               ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT,"%s threw an exception: %s",
-                                       modexcept.GetSource(), modexcept.GetReason());
+                               ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "%s threw an exception: %s",
+                                       modexcept.GetSource().c_str(), modexcept.GetReason().c_str());
                        }
-                       IOHook = NULL;
+                       delete iohook;
+                       DelIOHook();
                }
                ServerInstance->SE->Shutdown(this, 2);
                ServerInstance->SE->DelFd(this);
@@ -161,17 +163,17 @@ bool StreamSocket::GetNextLine(std::string& line, char delim)
 
 void StreamSocket::DoRead()
 {
-       if (IOHook)
+       if (GetIOHook())
        {
                int rv = -1;
                try
                {
-                       rv = IOHook->OnStreamSocketRead(this, recvq);
+                       rv = GetIOHook()->OnStreamSocketRead(this, recvq);
                }
                catch (CoreException& modexcept)
                {
                        ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "%s threw an exception: %s",
-                               modexcept.GetSource(), modexcept.GetReason());
+                               modexcept.GetSource().c_str(), modexcept.GetReason().c_str());
                        return;
                }
                if (rv > 0)
@@ -200,7 +202,7 @@ void StreamSocket::DoRead()
                        error = "Connection closed";
                        ServerInstance->SE->ChangeEventMask(this, FD_WANT_NO_READ | FD_WANT_NO_WRITE);
                }
-               else if (errno == EAGAIN)
+               else if (SocketEngine::IgnoreError())
                {
                        ServerInstance->SE->ChangeEventMask(this, FD_WANT_FAST_READ | FD_READ_WILL_BLOCK);
                }
@@ -210,7 +212,7 @@ void StreamSocket::DoRead()
                }
                else
                {
-                       error = strerror(errno);
+                       error = SocketEngine::LastError();
                        ServerInstance->SE->ChangeEventMask(this, FD_WANT_NO_READ | FD_WANT_NO_WRITE);
                }
        }
@@ -230,7 +232,7 @@ void StreamSocket::DoWrite()
        }
 
 #ifndef DISABLE_WRITEV
-       if (IOHook)
+       if (GetIOHook())
 #endif
        {
                int rv = -1;
@@ -248,17 +250,19 @@ void StreamSocket::DoWrite()
                                        // The length limit of 1024 is to prevent merging strings
                                        // more than once when writes begin to block.
                                        std::string tmp;
-                                       tmp.reserve(sendq_len);
-                                       for(unsigned int i=0; i < sendq.size(); i++)
-                                               tmp.append(sendq[i]);
-                                       sendq.clear();
-                                       sendq.push_back(tmp);
+                                       tmp.reserve(1280);
+                                       while (!sendq.empty() && tmp.length() < 1024)
+                                       {
+                                               tmp.append(sendq.front());
+                                               sendq.pop_front();
+                                       }
+                                       sendq.push_front(tmp);
                                }
                                std::string& front = sendq.front();
                                int itemlen = front.length();
-                               if (IOHook)
+                               if (GetIOHook())
                                {
-                                       rv = IOHook->OnStreamSocketWrite(this, front);
+                                       rv = GetIOHook()->OnStreamSocketWrite(this, front);
                                        if (rv > 0)
                                        {
                                                // consumed the entire string, and is ready for more
@@ -291,10 +295,10 @@ void StreamSocket::DoWrite()
                                        }
                                        else if (rv < 0)
                                        {
-                                               if (errno == EAGAIN || errno == EINTR)
+                                               if (errno == EINTR || SocketEngine::IgnoreError())
                                                        ServerInstance->SE->ChangeEventMask(this, FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK);
                                                else
-                                                       SetError(strerror(errno));
+                                                       SetError(SocketEngine::LastError());
                                                return;
                                        }
                                        else if (rv < itemlen)
@@ -317,8 +321,8 @@ void StreamSocket::DoWrite()
                }
                catch (CoreException& modexcept)
                {
-                       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG,"%s threw an exception: %s",
-                               modexcept.GetSource(), modexcept.GetReason());
+                       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "%s threw an exception: %s",
+                               modexcept.GetSource().c_str(), modexcept.GetReason().c_str());
                }
        }
 #ifndef DISABLE_WRITEV
@@ -388,7 +392,7 @@ void StreamSocket::DoWrite()
                        {
                                error = "Connection closed";
                        }
-                       else if (errno == EAGAIN)
+                       else if (SocketEngine::IgnoreError())
                        {
                                eventChange = FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK;
                        }
@@ -399,7 +403,7 @@ void StreamSocket::DoWrite()
                        }
                        else
                        {
-                               error = strerror(errno);
+                               error = SocketEngine::LastError();
                        }
                }
                if (!error.empty())
@@ -433,7 +437,7 @@ void StreamSocket::WriteData(const std::string &data)
 
 bool SocketTimeout::Tick(time_t)
 {
-       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG,"SocketTimeout::Tick");
+       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "SocketTimeout::Tick");
 
        if (ServerInstance->SE->GetRef(this->sfd) != this->sock)
                return false;
@@ -464,9 +468,7 @@ void BufferedSocket::DoWrite()
        {
                state = I_CONNECTED;
                this->OnConnected();
-               if (GetIOHook())
-                       GetIOHook()->OnStreamSocketConnect(this);
-               else
+               if (!GetIOHook())
                        ServerInstance->SE->ChangeEventMask(this, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE);
        }
        this->StreamSocket::DoWrite();
@@ -495,7 +497,7 @@ void StreamSocket::HandleEvent(EventType et, int errornum)
                                if (errornum == 0)
                                        SetError("Connection closed");
                                else
-                                       SetError(strerror(errornum));
+                                       SetError(SocketEngine::GetError(errornum));
                                switch (errornum)
                                {
                                        case ETIMEDOUT:
@@ -530,7 +532,7 @@ void StreamSocket::HandleEvent(EventType et, int errornum)
        catch (CoreException& ex)
        {
                ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "Caught exception in socket processing on FD %d - '%s'",
-                       fd, ex.GetReason());
+                       fd, ex.GetReason().c_str());
                SetError(ex.GetReason());
        }
        if (!error.empty())
@@ -539,4 +541,3 @@ void StreamSocket::HandleEvent(EventType et, int errornum)
                OnError(errcode);
        }
 }
-