Optimisation of optimisation :P ty w00tie

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

diff --git a/src/socket.cpp b/src/socket.cpp
index 949cc44acc739199b9814e6191c5d9ef385df3ff..4c03c933dc98e0a634f9fa79cd4043337f816fbf 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -63,6 +63,7 @@ InspSocket::InspSocket(std::string ahost, int aport, bool listening, unsigned lo
 {
        this->fd = -1;
        this->host = ahost;
+       this->Buffer = "";
        if (listening) {
                if ((this->fd = OpenTCPSocket()) == ERROR)
                {
@@ -258,22 +259,26 @@ int InspSocket::Write(std::string data)
 
 void 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)
+               int result = 0, v = 0;
+               const char* n = Buffer.c_str();
+               v = Buffer.length();
+               if (v > 0)
                {
-                       if (result == (int)this->Buffer.length())
+                       result = write(this->fd,n,v);
+                       if (result > 0)
                        {
-                               this->Buffer = "";
-                       }
-                       else
-                       {
-                               /* If we wrote some, advance the buffer forwards */
-                               char* n = (char*)this->Buffer.c_str();
-                               n += result;
-                               this->Buffer = n;
+                               if (result == v)
+                               {
+                                       Buffer = "";
+                               }
+                               else
+                               {
+                                       /* If we wrote some, advance the buffer forwards */
+                                       n += result;
+                                       Buffer = n;
+                               }
                        }
                }
        }
@@ -303,8 +308,6 @@ bool InspSocket::Poll()
        int incoming = -1;
        bool n = true;
 
-       log(DEBUG,"InspSocket::Poll()");
-       
        switch (this->state)
        {
                case I_RESOLVING:
@@ -312,7 +315,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.
@@ -329,9 +332,7 @@ 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();