Regressed buffering code

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

diff --git a/src/socket.cpp b/src/socket.cpp
index d4cdb0a18f41903510d1732596da69ac84af47a7..20a447ba74e6208d4902287c4bd793f0ea2a605f 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -48,21 +48,23 @@ InspSocket::InspSocket()
 {
        this->state = I_DISCONNECTED;
        this->fd = -1;
+       this->ClosePending = false;
 }
 
 InspSocket::InspSocket(int newfd, char* ip)
 {
        this->fd = newfd;
        this->state = I_CONNECTED;
-       this->IP = ip;
+       strlcpy(this->IP,ip,MAXBUF);
+       this->ClosePending = false;
        ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE);
        socket_ref[this->fd] = this;
 }
 
-InspSocket::InspSocket(const std::string &ahost, int aport, bool listening, unsigned long maxtime)
- : fd(-1), host(ahost)
+InspSocket::InspSocket(const std::string &ahost, int aport, bool listening, unsigned long maxtime) : fd(-1)
 {
-       this->outbuffer.clear();
+       strlcpy(host,ahost.c_str(),MAXBUF);
+       this->ClosePending = false;
        if (listening) {
                if ((this->fd = OpenTCPSocket()) == ERROR)
                {
@@ -74,7 +76,7 @@ InspSocket::InspSocket(const std::string &ahost, int aport, bool listening, unsi
                }
                else
                {
-                       if (BindSocket(this->fd,this->client,this->server,aport,(char*)ahost.c_str()) == ERROR)
+                       if (!BindSocket(this->fd,this->client,this->server,aport,(char*)ahost.c_str()))
                        {
                                this->Close();
                                this->fd = -1;
@@ -95,12 +97,12 @@ InspSocket::InspSocket(const std::string &ahost, int aport, bool listening, unsi
        }
        else
        {
-               this->host = ahost;
+               strlcpy(this->host,ahost.c_str(),MAXBUF);
                this->port = aport;
 
-               if (!inet_aton(host.c_str(),&addy))
+               if (!inet_aton(host,&addy))
                {
-                       log(DEBUG,"Attempting to resolve %s",this->host.c_str());
+                       log(DEBUG,"Attempting to resolve %s",this->host);
                        /* Its not an ip, spawn the resolver */
                        this->dns.SetNS(std::string(Config->DNSServer));
                        this->dns.ForwardLookupWithFD(host,fd);
@@ -111,8 +113,8 @@ InspSocket::InspSocket(const std::string &ahost, int aport, bool listening, unsi
                }
                else
                {
-                       log(DEBUG,"No need to resolve %s",this->host.c_str());
-                       this->IP = host;
+                       log(DEBUG,"No need to resolve %s",this->host);
+                       strlcpy(this->IP,host,MAXBUF);
                        timeout_end = time(NULL) + maxtime;
                        this->DoConnect();
                }
@@ -138,7 +140,7 @@ bool InspSocket::DoResolve()
                if (res_ip != "")
                {
                        log(DEBUG,"Socket result set to %s",res_ip.c_str());
-                       this->IP = res_ip;
+                       strlcpy(this->IP,res_ip.c_str(),MAXBUF);
                        socket_ref[this->fd] = NULL;
                }
                else
@@ -147,6 +149,7 @@ bool InspSocket::DoResolve()
                        this->Close();
                        this->state = I_ERROR;
                        this->OnError(I_ERR_RESOLVE);
+                       this->fd = -1;
                        return false;
                }
                return this->DoConnect();
@@ -163,11 +166,12 @@ bool InspSocket::DoConnect()
                log(DEBUG,"Cant socket()");
                this->state = I_ERROR;
                this->OnError(I_ERR_SOCKET);
+               this->fd = -1;
                return false;
        }
 
-       log(DEBUG,"Part 2 DoConnect() %s",this->IP.c_str());
-       inet_aton(this->IP.c_str(),&addy);
+       log(DEBUG,"Part 2 DoConnect() %s",this->IP);
+       inet_aton(this->IP,&addy);
        addr.sin_family = AF_INET;
        addr.sin_addr = addy;
        addr.sin_port = htons(this->port);
@@ -184,6 +188,7 @@ bool InspSocket::DoConnect()
                        this->OnError(I_ERR_CONNECT);
                        this->state = I_ERROR;
                        this->Close();
+                       this->fd = -1;
                        return false;
                }
        }
@@ -237,12 +242,26 @@ char* InspSocket::Read()
        }
 }
 
+void InspSocket::MarkAsClosed()
+{
+       log(DEBUG,"Marked as closed");
+       this->ClosePending = true;
+}
+
 // There are two possible outcomes to this function.
 // It will either write all of the data, or an undefined amount.
 // If an undefined amount is written the connection has failed
 // and should be aborted.
 int InspSocket::Write(const std::string &data)
 {
+       if (this->ClosePending)
+               return false;
+
+       /*int result = write(this->fd,data.c_str(),data.length());
+       if (result < 1)
+               return false;
+       return true;*/
+
        /* Try and append the data to the back of the queue, and send it on its way
         */
        outbuffer.push_back(data);
@@ -251,23 +270,32 @@ int InspSocket::Write(const std::string &data)
 
 bool InspSocket::FlushWriteBuffer()
 {
+       if (this->ClosePending)
+               return true;
+
        if ((this->fd > -1) && (this->state == I_CONNECTED))
        {
                if (outbuffer.size())
                {
+                       log(DEBUG,"Writing %d to socket",outbuffer.size());
                        int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length());
                        if (result > 0)
                        {
+                               log(DEBUG,"Wrote %d to socket",result);
                                if ((unsigned int)result == outbuffer[0].length())
                                {
                                        /* The whole block was written (usually a line)
                                         * Pop the block off the front of the queue
                                         */
+                                       log(DEBUG,"Popping front item, now %d items left",outbuffer.size());
                                        outbuffer.pop_front();
                                }
                                else
                                {
-                                       outbuffer[0] = outbuffer[0].substr(result + 1,outbuffer[0].length());
+                                       log(DEBUG,"Cutting front item");
+                                       std::string temp = outbuffer[0].substr(result);
+                                       outbuffer[0] = temp;
+                                       log(DEBUG,"Front item is now: ",outbuffer[0].c_str());
                                }
                        }
                        else if ((result == -1) && (errno != EAGAIN))
@@ -284,6 +312,18 @@ bool InspSocket::FlushWriteBuffer()
 
 bool InspSocket::Timeout(time_t current)
 {
+       if (!socket_ref[this->fd] || !ServerInstance->SE->HasFd(this->fd))
+       {
+               log(DEBUG,"No FD or socket ref");
+               return false;
+       }
+
+       if (this->ClosePending)
+       {
+               log(DEBUG,"Close is pending");
+               return true;
+       }
+
        if (((this->state == I_RESOLVING) || (this->state == I_CONNECTING)) && (current > timeout_end))
        {
                log(DEBUG,"Timed out, current=%lu timeout_end=%lu");
@@ -302,9 +342,15 @@ bool InspSocket::Timeout(time_t current)
 
 bool InspSocket::Poll()
 {
+       if (!socket_ref[this->fd] || !ServerInstance->SE->HasFd(this->fd))
+               return false;
+
        int incoming = -1;
        bool n = true;
 
+       if ((fd < 0) || (fd > MAX_DESCRIPTORS) || (this->ClosePending))
+               return false;
+
        switch (this->state)
        {
                case I_RESOLVING: