Pick up a few error conditions we didnt before in the config reader, and also increme...

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

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 80e916c00f992a32852d6e1d3f103b24bdd5ca7d..96f07b6e40f8502f4da364ddff7a2b0c21de29c7 100644 (file)
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -149,8 +149,8 @@ void InspSocket::SetQueues(int nfd)
        // attempt to increase socket sendq and recvq as high as its possible
        int sendbuf = 32768;
        int recvbuf = 32768;
-       setsockopt(nfd,SOL_SOCKET,SO_SNDBUF,(const char *)&sendbuf,sizeof(sendbuf));
-       setsockopt(nfd,SOL_SOCKET,SO_RCVBUF,(const char *)&recvbuf,sizeof(sendbuf));
+       if(setsockopt(nfd,SOL_SOCKET,SO_SNDBUF,(const char *)&sendbuf,sizeof(sendbuf)) || setsockopt(nfd,SOL_SOCKET,SO_RCVBUF,(const char *)&recvbuf,sizeof(sendbuf)))
+               this->Instance->Log(DEFAULT, "Could not increase SO_SNDBUF/SO_RCVBUF for socket %u", GetFd());
 }
 
 /* Most irc servers require you to specify the ip you want to bind to.
@@ -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
@@ -320,6 +320,11 @@ bool InspSocket::DoConnect()
                this->Timeout = new SocketTimeout(this->GetFd(), this->Instance, this, timeout_val, this->Instance->Time());
                this->Instance->Timers->AddTimer(this->Timeout);
        }
+#ifdef WIN32
+       /* Set nonblocking mode after the connect() call */
+       flags = 0;
+       ioctlsocket(this->fd, FIONBIO, &flags);
+#endif
        this->state = I_CONNECTING;
        if (this->fd > -1)
        {
@@ -356,9 +361,12 @@ void InspSocket::Close()
                                Instance->Log(DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
                        }
                }
-               this->OnClose();
                shutdown(this->fd,2);
-               close(this->fd);
+               if (close(this->fd) != -1)
+                       this->OnClose();
+
+               if (Instance->SocketCull.find(this) == Instance->SocketCull.end())
+                       Instance->SocketCull[this] = this;
        }
        errno = save;
 }
@@ -370,11 +378,7 @@ std::string InspSocket::GetIP()
 
 char* InspSocket::Read()
 {
-#ifdef WINDOWS
-       if ((fd < 0) || (m_internalFd > MAX_DESCRIPTORS))
-#else
-       if ((fd < 0) || (fd > MAX_DESCRIPTORS))
-#endif
+       if (!Instance->SE->BoundsCheckFd(this))
                return NULL;
 
        int n = 0;
@@ -449,28 +453,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)
                                {
@@ -565,19 +552,16 @@ void SocketTimeout::Tick(time_t now)
 
 bool InspSocket::Poll()
 {
-#ifdef WINDOWS
-       if(Instance->SE->GetRef(this->fd) != this)
-               return false;
-       int incoming = -1;
-#else
-       if (this->Instance->SE->GetRef(this->fd) != this)
-               return false;
-
        int incoming = -1;
 
-       if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+#ifndef WINDOWS
+       if (!Instance->SE->BoundsCheckFd(this))
                return false;
 #endif
+
+       if (Instance->SE->GetRef(this->fd) != this)
+               return false;
+
        switch (this->state)
        {
                case I_CONNECTING:
@@ -588,15 +572,15 @@ bool InspSocket::Poll()
                        if (this->fd > -1)
                        {
                                this->Instance->SE->DelFd(this);
-                               this->SetState(I_CONNECTED);
                                if (!this->Instance->SE->AddFd(this))
                                        return false;
                        }
-#else
-                       this->SetState(I_CONNECTED);
 #endif
+                       this->SetState(I_CONNECTED);
+
                        if (Instance->Config->GetIOHook(this))
                        {
+                               Instance->Log(DEBUG,"Hook for raw connect");
                                try
                                {
                                        Instance->Config->GetIOHook(this)->OnRawSocketConnect(this->fd);
@@ -617,6 +601,8 @@ bool InspSocket::Poll()
                        if ((!*this->host) || strchr(this->host, ':'))
                                length = sizeof(sockaddr_in6);
 #endif
+                       void* m_acceptEvent = NULL;
+                       GetExt("windows_acceptevent", m_acceptEvent);
                        incoming = _accept (this->fd, client, &length);
 #ifdef IPV6
                        if ((!*this->host) || strchr(this->host, ':'))