Remove a load of unneeded debugging output

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

diff --git a/src/socket.cpp b/src/socket.cpp
index 174df4a1b19a72d1ebbc191e2c4f06f9135df3f1..767e2c468be3eb61a31484ca96c24db5841eec8f 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -55,14 +55,15 @@ 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)
 {
+       strlcpy(host,ahost.c_str(),MAXBUF);
        this->ClosePending = false;
        if (listening) {
                if ((this->fd = OpenTCPSocket()) == ERROR)
@@ -70,17 +71,19 @@ 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;
                }
                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;
                                this->state = I_ERROR;
                                this->OnError(I_ERR_BIND);
+                               this->ClosePending = true;
                                log(DEBUG,"BindSocket() error %s",strerror(errno));
                                return;
                        }
@@ -96,12 +99,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);
@@ -112,8 +115,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();
                }
@@ -139,7 +142,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
@@ -149,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();
@@ -169,8 +173,8 @@ bool InspSocket::DoConnect()
                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);
@@ -185,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;
                }
        }
@@ -208,6 +213,7 @@ void InspSocket::Close()
                shutdown(this->fd,2);
                close(this->fd);
                socket_ref[this->fd] = NULL;
+               this->ClosePending = true;
                this->fd = -1;
        }
 }
@@ -256,15 +262,15 @@ int InspSocket::Write(const std::string &data)
        if (this->ClosePending)
                return false;
 
-       int result = write(this->fd,data.c_str(),data.length());
+       /*int result = write(this->fd,data.c_str(),data.length());
        if (result < 1)
                return false;
-       return true;
+       return true;*/
 
        /* Try and append the data to the back of the queue, and send it on its way
         */
-       //outbuffer.push_back(data);
-       //return (!this->FlushWriteBuffer());
+       outbuffer.push_back(data);
+       return (!this->FlushWriteBuffer());
 }
 
 bool InspSocket::FlushWriteBuffer()
@@ -272,29 +278,24 @@ bool InspSocket::FlushWriteBuffer()
        if (this->ClosePending)
                return true;
 
-       /*if ((this->fd > -1) && (this->state == I_CONNECTED))
+       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)
+                                       /* 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
                                {
-                                       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))
@@ -305,7 +306,7 @@ bool InspSocket::FlushWriteBuffer()
                                return true;
                        }
                }
-       }*/
+       }
        return false;
 }