m_namedmodes Only show chan key to members and opers with channels/auspex

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

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 81e61f051416fcf72d515fe077f7d8e62ee052b1..356904f741b35e8efbcfe5bac61cdaf98721f31e 100644 (file)
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -56,7 +56,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);
        }
 }
@@ -82,16 +82,6 @@ BufferedSocketError BufferedSocket::BeginConnect(const std::string &ipaddr, int
        return BeginConnect(addr, bind, maxtime);
 }
 
-static void IncreaseOSBuffers(int fd)
-{
-       // attempt to increase socket sendq and recvq as high as its possible
-       int sendbuf = 32768;
-       int recvbuf = 32768;
-       setsockopt(fd,SOL_SOCKET,SO_SNDBUF,(const char *)&sendbuf,sizeof(sendbuf));
-       setsockopt(fd,SOL_SOCKET,SO_RCVBUF,(const char *)&recvbuf,sizeof(recvbuf));
-       // on failure, do nothing. I'm a little sick of people trying to interpret this message as a result of why their incorrect setups don't work.
-}
-
 BufferedSocketError BufferedSocket::BeginConnect(const irc::sockets::sockaddrs& dest, const irc::sockets::sockaddrs& bind, unsigned long timeout)
 {
        if (fd < 0)
@@ -210,7 +200,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);
                }
@@ -220,7 +210,7 @@ void StreamSocket::DoRead()
                }
                else
                {
-                       error = strerror(errno);
+                       error = SocketEngine::LastError();
                        ServerInstance->SE->ChangeEventMask(this, FD_WANT_NO_READ | FD_WANT_NO_WRITE);
                }
        }
@@ -258,11 +248,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();
@@ -301,16 +293,16 @@ 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)
                                        {
                                                ServerInstance->SE->ChangeEventMask(this, FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK);
-                                               front = front.substr(itemlen - rv);
+                                               front = front.substr(rv);
                                                sendq_len -= rv;
                                                return;
                                        }
@@ -398,7 +390,7 @@ void StreamSocket::DoWrite()
                        {
                                error = "Connection closed";
                        }
-                       else if (errno == EAGAIN)
+                       else if (SocketEngine::IgnoreError())
                        {
                                eventChange = FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK;
                        }
@@ -409,7 +401,7 @@ void StreamSocket::DoWrite()
                        }
                        else
                        {
-                               error = strerror(errno);
+                               error = SocketEngine::LastError();
                        }
                }
                if (!error.empty())
@@ -504,7 +496,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: