m_spanningtree Fix IS_LOCAL() check in OnRehash handler

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

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 1254dc58bfd430a2440a9cb87ccbdebd1fc90a38..d78ace31891601d3b5d7d61179aefe8fabea2f9f 100644 (file)
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -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)
@@ -122,8 +112,6 @@ BufferedSocketError BufferedSocket::BeginConnect(const irc::sockets::sockaddrs&
        this->Timeout = new SocketTimeout(this->GetFd(), this, timeout, ServerInstance->Time());
        ServerInstance->Timers->AddTimer(this->Timeout);
 
-       IncreaseOSBuffers(fd);
-
        ServerInstance->Logs->Log("SOCKET", DEBUG,"BufferedSocket::DoConnect success");
        return I_ERR_NONE;
 }
@@ -194,7 +182,7 @@ void StreamSocket::DoRead()
        else
        {
                char* ReadBuffer = ServerInstance->GetReadBuffer();
-               int n = recv(fd, ReadBuffer, ServerInstance->Config->NetBufferSize, 0);
+               int n = ServerInstance->SE->Recv(this, ReadBuffer, ServerInstance->Config->NetBufferSize, 0);
                if (n == ServerInstance->Config->NetBufferSize)
                {
                        ServerInstance->SE->ChangeEventMask(this, FD_WANT_FAST_READ | FD_ADD_TRIAL_READ);
@@ -212,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);
                }
@@ -303,7 +291,7 @@ 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));
@@ -312,7 +300,7 @@ void StreamSocket::DoWrite()
                                        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;
                                        }
@@ -400,7 +388,7 @@ void StreamSocket::DoWrite()
                        {
                                error = "Connection closed";
                        }
-                       else if (errno == EAGAIN)
+                       else if (SocketEngine::IgnoreError())
                        {
                                eventChange = FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK;
                        }