More verbose error output

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

diff --git a/src/socket.cpp b/src/socket.cpp
index e1f0d2c23ba6783274f3c5a5eb7c0499abf6bc41..1b2683257d4bd471e4d7bb92afccdac7bafa5c88 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -189,8 +189,8 @@ bool InspSocket::DoConnect()
                {
                        log(DEBUG,"Error connect() %d: %s",this->fd,strerror(errno));
                        this->OnError(I_ERR_CONNECT);
-                       this->state = I_ERROR;
                        this->Close();
+                       this->state = I_ERROR;
                        this->fd = -1;
                        this->ClosePending = true;
                        return false;
@@ -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 false;
+       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,9 @@ bool InspSocket::Poll()
                         * Both FlushWriteBuffer AND the return result of OnDataReady must
                         * return true for this to be ok.
                         */
-                       return (n && !this->FlushWriteBuffer());
+                       if (this->FlushWriteBuffer())
+                               return false;
+                       return n;
                break;
                default:
                break;