publish "JSON-RPC" interface

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

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 80e916c00f992a32852d6e1d3f103b24bdd5ca7d..f29366c73bad71ab7b400309f0b939f0ff9feabc 100644 (file)
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -177,7 +177,7 @@ bool InspSocket::BindAddr(const std::string &ip)
                std::string IP = ip.empty() ? Conf.ReadValue("bind","address",j) : ip;
                if (!ip.empty() || Conf.ReadValue("bind","type",j) == "servers")
                {
-                       if (!ip.empty() || ((IP != "*") && (IP != "127.0.0.1") && (IP != "") && (IP != "::1")))
+                       if (!ip.empty() || ((IP != "*") && (IP != "127.0.0.1") && (!IP.empty()) && (IP != "::1")))
                        {
                                sockaddr* s = new sockaddr[2];
 #ifdef IPV6
@@ -359,6 +359,9 @@ void InspSocket::Close()
                this->OnClose();
                shutdown(this->fd,2);
                close(this->fd);
+
+               if (Instance->SocketCull.find(this) == Instance->SocketCull.end())
+                       Instance->SocketCull[this] = this;
        }
        errno = save;
 }
@@ -449,28 +452,11 @@ bool InspSocket::FlushWriteBuffer()
                        {
                                try
                                {
-                                       int result = Instance->Config->GetIOHook(this)->OnRawSocketWrite(this->fd, outbuffer[0].c_str(), outbuffer[0].length());
-                                       if (result > 0)
-                                       {
-                                               if ((unsigned int)result >= outbuffer[0].length())
-                                               {
-                                                       outbuffer.pop_front();
-                                               }
-                                               else
-                                               {
-                                                       std::string temp = outbuffer[0].substr(result);
-                                                       outbuffer[0] = temp;
-                                                       errno = EAGAIN;
-                                               }
-                                       }
-                                       else if (((result == -1) && (errno != EAGAIN)) || (result == 0))
-                                       {
-                                               this->OnError(I_ERR_WRITE);
-                                               this->state = I_ERROR;
-                                               this->Instance->SE->DelFd(this);
-                                               this->Close();
-                                               return true;
-                                       }
+                                       /* XXX: The lack of buffering here is NOT a bug, modules implementing this interface have to
+                                        * implement their own buffering mechanisms
+                                        */
+                                       Instance->Config->GetIOHook(this)->OnRawSocketWrite(this->fd, outbuffer[0].c_str(), outbuffer[0].length());
+                                       outbuffer.pop_front();
                                }
                                catch (CoreException& modexcept)
                                {
@@ -595,8 +581,10 @@ bool InspSocket::Poll()
 #else
                        this->SetState(I_CONNECTED);
 #endif
+                       Instance->Log(DEBUG,"Inspsocket I_CONNECTING state");
                        if (Instance->Config->GetIOHook(this))
                        {
+                               Instance->Log(DEBUG,"Hook for raw connect");
                                try
                                {
                                        Instance->Config->GetIOHook(this)->OnRawSocketConnect(this->fd);