Dunno why this method was static, doesnt need to be...

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

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index ce4141eaae1d827c26cd60d55601d62db0b23611..be2d99a62c03a9bed3ee33231f0cf8fedffe8300 100644 (file)
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -119,10 +119,10 @@ InspSocket::InspSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool
                if (!ipvalid)
                {
                        this->Instance->Log(DEBUG,"BUG: Hostname passed to InspSocket, rather than an IP address!");
+                       this->OnError(I_ERR_CONNECT);
                        this->Close();
                        this->fd = -1;
                        this->state = I_ERROR;
-                       this->OnError(I_ERR_RESOLVE);
                        return;
                }
                else
@@ -131,10 +131,10 @@ InspSocket::InspSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool
                        timeout_val = maxtime;
                        if (!this->DoConnect())
                        {
+                               this->OnError(I_ERR_CONNECT);
                                this->Close();
                                this->fd = -1;
                                this->state = I_ERROR;
-                               this->OnError(I_ERR_CONNECT);
                                return;
                        }
                }
@@ -152,8 +152,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 void *)&sendbuf,sizeof(sendbuf));
-       setsockopt(nfd,SOL_SOCKET,SO_RCVBUF,(const void *)&recvbuf,sizeof(sendbuf));
+       setsockopt(nfd,SOL_SOCKET,SO_SNDBUF,(const char *)&sendbuf,sizeof(sendbuf));
+       setsockopt(nfd,SOL_SOCKET,SO_RCVBUF,(const char *)&recvbuf,sizeof(sendbuf));
 }
 
 /* Most irc servers require you to specify the ip you want to bind to.
@@ -167,7 +167,6 @@ void InspSocket::SetQueues(int nfd)
 bool InspSocket::BindAddr(const std::string &ip)
 {
        ConfigReader Conf(this->Instance);
-       bool bindfail = false;
        socklen_t size = sizeof(sockaddr_in);
 #ifdef IPV6
        bool v6 = false;
@@ -191,6 +190,7 @@ bool InspSocket::BindAddr(const std::string &ip)
                                        if (inet_pton(AF_INET6, IP.c_str(), &n) > 0)
                                        {
                                                memcpy(&((sockaddr_in6*)s)->sin6_addr, &n, sizeof(n));
+                                               ((sockaddr_in6*)s)->sin6_port = 0;
                                                ((sockaddr_in6*)s)->sin6_family = AF_INET6;
                                                size = sizeof(sockaddr_in6);
                                        }
@@ -207,6 +207,7 @@ bool InspSocket::BindAddr(const std::string &ip)
                                        if (inet_aton(IP.c_str(), &n) > 0)
                                        {
                                                ((sockaddr_in*)s)->sin_addr = n;
+                                               ((sockaddr_in*)s)->sin_port = 0;
                                                ((sockaddr_in*)s)->sin_family = AF_INET;
                                        }
                                        else
@@ -221,6 +222,7 @@ bool InspSocket::BindAddr(const std::string &ip)
                                if (insp_aton(IP.c_str(), &n) > 0)
                                {
                                        ((sockaddr_in*)s)->sin_addr = n;
+                                       ((sockaddr_in*)s)->sin_port = 0;
                                        ((sockaddr_in*)s)->sin_family = AF_INET;
                                }
                                else
@@ -333,10 +335,13 @@ bool InspSocket::DoConnect()
                ((sockaddr_in*)addr)->sin_port = htons(this->port);
        }
 #endif
-
+#ifndef WIN32
        int flags = fcntl(this->fd, F_GETFL, 0);
        fcntl(this->fd, F_SETFL, flags | O_NONBLOCK);
-
+#else
+       unsigned long flags = 0;
+       ioctlsocket(this->fd, FIONBIO, &flags);
+#endif
        if (connect(this->fd, (sockaddr*)addr, size) == -1)
        {
                if (errno != EINPROGRESS)
@@ -400,7 +405,11 @@ std::string InspSocket::GetIP()
 
 char* InspSocket::Read()
 {
+#ifdef WINDOWS
+       if ((fd < 0) || (m_internalFd > MAX_DESCRIPTORS))
+#else
        if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+#endif
                return NULL;
 
        int n = 0;
@@ -513,7 +522,11 @@ bool InspSocket::FlushWriteBuffer()
                        while (outbuffer.size() && (errno != EAGAIN))
                        {
                                /* Send a line */
+#ifndef WIN32
                                int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length());
+#else
+                               int result = send(this->fd,outbuffer[0].c_str(),outbuffer[0].length(), 0);
+#endif
                                if (result > 0)
                                {
                                        if ((unsigned int)result >= outbuffer[0].length())
@@ -571,24 +584,27 @@ void SocketTimeout::Tick(time_t now)
                this->sock->OnTimeout();
                this->sock->OnError(I_ERR_TIMEOUT);
                this->sock->timeout = true;
-               ServerInstance->SE->DelFd(this->sock);
+
                /* NOTE: We must set this AFTER DelFd, as we added
                 * this socket whilst writeable. This means that we
                 * must DELETE the socket whilst writeable too!
                 */
                this->sock->state = I_ERROR;
-               this->sock->Close();
-               delete this->sock;
-               return;
-       }
-       else
-       {
-               this->sock->Timeout = NULL;
+
+               if (ServerInstance->SocketCull.find(this->sock) == ServerInstance->SocketCull.end())
+                       ServerInstance->SocketCull[this->sock] = this->sock;
        }
+
+       this->sock->Timeout = NULL;
 }
 
 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;
 
@@ -596,13 +612,14 @@ bool InspSocket::Poll()
 
        if ((fd < 0) || (fd > MAX_DESCRIPTORS))
                return false;
-
+#endif
        switch (this->state)
        {
                case I_CONNECTING:
                        /* Our socket was in write-state, so delete it and re-add it
                         * in read-state.
                         */
+#ifndef WINDOWS
                        if (this->fd > -1)
                        {
                                this->Instance->SE->DelFd(this);
@@ -610,6 +627,9 @@ bool InspSocket::Poll()
                                if (!this->Instance->SE->AddFd(this))
                                        return false;
                        }
+#else
+                       this->SetState(I_CONNECTED);
+#endif
                        if (Instance->Config->GetIOHook(this))
                        {
                                try
@@ -632,7 +652,7 @@ bool InspSocket::Poll()
                        if ((!*this->host) || strchr(this->host, ':'))
                                length = sizeof(sockaddr_in6);
 #endif
-                       incoming = accept (this->fd, client, &length);
+                       incoming = _accept (this->fd, client, &length);
 #ifdef IPV6
                        if ((!*this->host) || strchr(this->host, ':'))
                        {
@@ -715,17 +735,32 @@ void InspSocket::HandleEvent(EventType et, int errornum)
        switch (et)
        {
                case EVENT_ERROR:
-                       this->Instance->SE->DelFd(this);
-                       this->Close();
-                       delete this;
+                       switch (errornum)
+                       {
+                               case ETIMEDOUT:
+                                       this->OnError(I_ERR_TIMEOUT);
+                               break;
+                               case ECONNREFUSED:
+                               case 0:
+                                       this->OnError(this->state == I_CONNECTING ? I_ERR_CONNECT : I_ERR_WRITE);
+                               break;
+                               case EADDRINUSE:
+                                       this->OnError(I_ERR_BIND);
+                               break;
+                               case EPIPE:
+                               case EIO:
+                                       this->OnError(I_ERR_WRITE);
+                               break;
+                       }
+                       if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end())
+                               this->Instance->SocketCull[this] = this;
                        return;
                break;
                case EVENT_READ:
                        if (!this->Poll())
                        {
-                               this->Instance->SE->DelFd(this);
-                               this->Close();
-                               delete this;
+                               if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end())
+                                       this->Instance->SocketCull[this] = this;
                                return;
                        }
                break;
@@ -735,9 +770,8 @@ void InspSocket::HandleEvent(EventType et, int errornum)
                                this->WaitingForWriteEvent = false;
                                if (!this->OnWriteReady())
                                {
-                                       this->Instance->SE->DelFd(this);
-                                       this->Close();
-                                       delete this;
+                                       if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end())
+                                               this->Instance->SocketCull[this] = this;
                                        return;
                                }
                        }
@@ -756,9 +790,8 @@ void InspSocket::HandleEvent(EventType et, int errornum)
                        {
                                if (this->FlushWriteBuffer())
                                {
-                                       this->Instance->SE->DelFd(this);
-                                       this->Close();
-                                       delete this;
+                                       if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end())
+                                               this->Instance->SocketCull[this] = this;
                                        return;
                                }
                        }