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 ec528571bba2f15028daafadc5362d13a8511949..798cde9b01dd3ad2c10bb9a94657cacb3a78e1ce 100644 (file)
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -57,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);
        }
 }
@@ -132,8 +132,9 @@ void StreamSocket::Close()
                        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());
                        }
+                       delete iohook;
                        DelIOHook();
                }
                ServerInstance->SE->Shutdown(this, 2);
@@ -172,7 +173,7 @@ void StreamSocket::DoRead()
                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)
@@ -211,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);
                }
        }
@@ -249,11 +250,13 @@ 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();
@@ -295,7 +298,7 @@ void StreamSocket::DoWrite()
                                                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)
@@ -319,7 +322,7 @@ void StreamSocket::DoWrite()
                catch (CoreException& modexcept)
                {
                        ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "%s threw an exception: %s",
-                               modexcept.GetSource(), modexcept.GetReason());
+                               modexcept.GetSource().c_str(), modexcept.GetReason().c_str());
                }
        }
 #ifndef DISABLE_WRITEV
@@ -400,7 +403,7 @@ void StreamSocket::DoWrite()
                        }
                        else
                        {
-                               error = strerror(errno);
+                               error = SocketEngine::LastError();
                        }
                }
                if (!error.empty())
@@ -465,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();
@@ -496,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:
@@ -531,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())
@@ -540,4 +541,3 @@ void StreamSocket::HandleEvent(EventType et, int errornum)
                OnError(errcode);
        }
 }
-