Remove 'validation' for server description and network name (didn't do anything)

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

diff --git a/src/socket.cpp b/src/socket.cpp
index e1f0d2c23ba6783274f3c5a5eb7c0499abf6bc41..df018bb4749418474ebdc501134f4dadcccdf2e5 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;
@@ -307,7 +307,7 @@ bool InspSocket::FlushWriteBuffer()
                        }
                }
        }
-       return false;
+       return (fd < 0);
 }
 
 bool InspSocket::Timeout(time_t current)
@@ -381,7 +381,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;