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 e217720f24de3a20ac0aa66920a114684910fc89..df018bb4749418474ebdc501134f4dadcccdf2e5 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -71,6 +71,7 @@ InspSocket::InspSocket(const std::string &ahost, int aport, bool listening, unsi
                        this->fd = -1;
                        this->state = I_ERROR;
                        this->OnError(I_ERR_SOCKET);
+                       this->ClosePending = true;
                        log(DEBUG,"OpenTCPSocket() error");
                         return;
                }
@@ -82,6 +83,7 @@ InspSocket::InspSocket(const std::string &ahost, int aport, bool listening, unsi
                                this->fd = -1;
                                this->state = I_ERROR;
                                this->OnError(I_ERR_BIND);
+                               this->ClosePending = true;
                                log(DEBUG,"BindSocket() error %s",strerror(errno));
                                return;
                        }
@@ -150,6 +152,7 @@ bool InspSocket::DoResolve()
                        this->state = I_ERROR;
                        this->OnError(I_ERR_RESOLVE);
                        this->fd = -1;
+                       this->ClosePending = true;
                        return false;
                }
                return this->DoConnect();
@@ -186,9 +189,10 @@ 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;
                }
        }
@@ -209,6 +213,7 @@ void InspSocket::Close()
                shutdown(this->fd,2);
                close(this->fd);
                socket_ref[this->fd] = NULL;
+               this->ClosePending = true;
                this->fd = -1;
        }
 }
@@ -302,7 +307,7 @@ bool InspSocket::FlushWriteBuffer()
                        }
                }
        }
-       return false;
+       return (fd < 0);
 }
 
 bool InspSocket::Timeout(time_t current)
@@ -376,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;