Convert more by-values to const references, optimise ConfigReader a bit

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

diff --git a/src/socket.cpp b/src/socket.cpp
index 282d3c5a72fb4355bdfe74e347a28e6d0fb45080..d4cdb0a18f41903510d1732596da69ac84af47a7 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -59,9 +59,10 @@ InspSocket::InspSocket(int newfd, char* ip)
        socket_ref[this->fd] = this;
 }
 
-InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long maxtime)
+InspSocket::InspSocket(const std::string &ahost, int aport, bool listening, unsigned long maxtime)
+ : fd(-1), host(ahost)
 {
-       this->fd = -1;
+       this->outbuffer.clear();
        if (listening) {
                if ((this->fd = OpenTCPSocket()) == ERROR)
                {
@@ -73,7 +74,7 @@ InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long
                }
                else
                {
-                       if (BindSocket(this->fd,this->client,this->server,port,(char*)host.c_str()) == ERROR)
+                       if (BindSocket(this->fd,this->client,this->server,aport,(char*)ahost.c_str()) == ERROR)
                        {
                                this->Close();
                                this->fd = -1;
@@ -94,8 +95,8 @@ InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long
        }
        else
        {
-               this->host = host;
-               this->port = port;
+               this->host = ahost;
+               this->port = aport;
 
                if (!inet_aton(host.c_str(),&addy))
                {
@@ -230,7 +231,7 @@ char* InspSocket::Read()
                }
                else
                {
-                       log(DEBUG,"EOF or error on socket");
+                       log(DEBUG,"EOF or error on socket: %s",strerror(errno));
                        return NULL;
                }
        }
@@ -240,42 +241,45 @@ char* InspSocket::Read()
 // 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(std::string data)
+int InspSocket::Write(const std::string &data)
 {
-       try
-       {
-               if ((data != "") && (this->Buffer.length() + data.length() < this->Buffer.max_size()))
-                       this->Buffer.append(data);
-       }
-       catch (std::length_error)
-       {
-               log(DEBUG,"std::length_error exception caught while appending to socket buffer!");
-               return 0;
-       }
-       return data.length();
+       /* Try and append the data to the back of the queue, and send it on its way
+        */
+       outbuffer.push_back(data);
+       return (!this->FlushWriteBuffer());
 }
 
-void InspSocket::FlushWriteBuffer()
+bool InspSocket::FlushWriteBuffer()
 {
-       int result = 0;
-       if (this->Buffer.length())
+       if ((this->fd > -1) && (this->state == I_CONNECTED))
        {
-               result = send(this->fd,this->Buffer.c_str(),this->Buffer.length(),0);
-               if (result > 0)
+               if (outbuffer.size())
                {
-                       if (result == (int)this->Buffer.length())
+                       int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length());
+                       if (result > 0)
                        {
-                               this->Buffer = "";
+                               if ((unsigned int)result == outbuffer[0].length())
+                               {
+                                       /* The whole block was written (usually a line)
+                                        * Pop the block off the front of the queue
+                                        */
+                                       outbuffer.pop_front();
+                               }
+                               else
+                               {
+                                       outbuffer[0] = outbuffer[0].substr(result + 1,outbuffer[0].length());
+                               }
                        }
-                       else
+                       else if ((result == -1) && (errno != EAGAIN))
                        {
-                               /* If we wrote some, advance the buffer forwards */
-                               char* n = (char*)this->Buffer.c_str();
-                               n += result;
-                               this->Buffer = n;
+                               log(DEBUG,"Write error on socket: %s",strerror(errno));
+                               this->OnError(I_ERR_WRITE);
+                               this->state = I_ERROR;
+                               return true;
                        }
                }
        }
+       return false;
 }
 
 bool InspSocket::Timeout(time_t current)
@@ -293,8 +297,7 @@ bool InspSocket::Timeout(time_t current)
                this->state = I_ERROR;
                return true;
        }
-       this->FlushWriteBuffer();
-       return false;
+       return this->FlushWriteBuffer();
 }
 
 bool InspSocket::Poll()
@@ -302,8 +305,6 @@ bool InspSocket::Poll()
        int incoming = -1;
        bool n = true;
 
-       log(DEBUG,"InspSocket::Poll()");
-       
        switch (this->state)
        {
                case I_RESOLVING:
@@ -311,7 +312,7 @@ bool InspSocket::Poll()
                        return this->DoResolve();
                break;
                case I_CONNECTING:
-                       log(DEBUG,"State = I_CONNECTED");
+                       log(DEBUG,"State = I_CONNECTING");
                        this->SetState(I_CONNECTED);
                        /* Our socket was in write-state, so delete it and re-add it
                         * in read-state.
@@ -328,13 +329,13 @@ bool InspSocket::Poll()
                        return true;
                break;
                case I_CONNECTED:
-                       log(DEBUG,"State = I_CONNECTED");
                        n = this->OnDataReady();
-                       log(DEBUG,"State return: %d",(int)n);
                        /* Flush any pending, but not till after theyre done with the event
-                        * so there are less write calls involved. */
-                       this->FlushWriteBuffer();
-                       return n;
+                        * so there are less write calls involved.
+                        * Both FlushWriteBuffer AND the return result of OnDataReady must
+                        * return true for this to be ok.
+                        */
+                       return (n && !this->FlushWriteBuffer());
                break;
                default:
                break;
@@ -370,4 +371,3 @@ InspSocket::~InspSocket()
 {
        this->Close();
 }
-