More verbose error output

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

diff --git a/src/socket.cpp b/src/socket.cpp
index b7d102647343afa06364eaa4cadc455d0b05f3cc..1b2683257d4bd471e4d7bb92afccdac7bafa5c88 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -303,11 +303,12 @@ bool InspSocket::FlushWriteBuffer()
                                log(DEBUG,"Write error on socket: %s",strerror(errno));
                                this->OnError(I_ERR_WRITE);
                                this->state = I_ERROR;
+                               this->ClosePending = true;
                                return true;
                        }
                }
        }
-       return (fd > -1);
+       return (fd < 0);
 }
 
 bool InspSocket::Timeout(time_t current)
@@ -335,6 +336,7 @@ bool InspSocket::Timeout(time_t current)
                this->OnError(I_ERR_TIMEOUT);
                timeout = true;
                this->state = I_ERROR;
+               this->ClosePending = true;
                return true;
        }
        return this->FlushWriteBuffer();
@@ -381,7 +383,7 @@ bool InspSocket::Poll()
                         * Both FlushWriteBuffer AND the return result of OnDataReady must
                         * return true for this to be ok.
                         */
-                       if (!this->FlushWriteBuffer())
+                       if (this->FlushWriteBuffer())
                                return false;
                        return n;
                break;