Convert more modules

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

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 3face10f6f462ea16cdf76e2006920f608931161..63964c1eaecf1831bcd1a56811a7bbf89b8456f3 100644 (file)
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -79,6 +79,7 @@ InspSocket::InspSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool
                        else
                        {
                                this->state = I_LISTENING;
+                               this->port = aport;
                                if (this->fd > -1)
                                {
                                        if (!this->Instance->SE->AddFd(this))
@@ -106,16 +107,12 @@ InspSocket::InspSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool
                                ipvalid = false;
                }
                else
+#endif
                {
                        in_addr n;
                        if (inet_aton(host,&n) < 1)
                                ipvalid = false;
                }
-#else
-               in_addr n;
-               if (inet_aton(host,&n) < 1)
-                       ipvalid = false;
-#endif
                if (!ipvalid)
                {
                        this->Instance->Log(DEBUG,"BUG: Hostname passed to InspSocket, rather than an IP address!");
@@ -152,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 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.
@@ -180,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
@@ -202,6 +199,7 @@ bool InspSocket::BindAddr(const std::string &ip)
                                        }
                                }
                                else
+#endif
                                {
                                        in_addr n;
                                        if (inet_aton(IP.c_str(), &n) > 0)
@@ -217,21 +215,6 @@ bool InspSocket::BindAddr(const std::string &ip)
                                                continue;
                                        }
                                }
-#else
-                               in_addr n;
-                               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
-                               {
-                                       delete[] s;
-                                       j++;
-                                       continue;
-                               }
-#endif
 
                                if (bind(this->fd, s, size) < 0)
                                {
@@ -273,6 +256,7 @@ bool InspSocket::DoConnect()
                }
        }
        else
+#endif
        {
                this->fd = socket(AF_INET, SOCK_STREAM, 0);
                if (this->fd > -1)
@@ -284,17 +268,6 @@ bool InspSocket::DoConnect()
                        }
                }
        }
-#else
-       this->fd = socket(AF_INET, SOCK_STREAM, 0);
-       if (this->fd > -1)
-       {
-               if (!this->BindAddr(this->cbindip))
-               {
-                       delete[] addr;
-                       return false;
-               }
-       }
-#endif
 
        if (this->fd == -1)
        {
@@ -317,6 +290,7 @@ bool InspSocket::DoConnect()
                }
        }
        else
+#endif
        {
                in_addr addy;
                if (inet_aton(this->host, &addy) > 0)
@@ -326,19 +300,13 @@ bool InspSocket::DoConnect()
                        ((sockaddr_in*)addr)->sin_port = htons(this->port);
                }
        }
-#else
-       in_addr addy;
-       if (inet_aton(this->host, &addy) > 0)
-       {
-               ((sockaddr_in*)addr)->sin_family = AF_INET;
-               ((sockaddr_in*)addr)->sin_addr = addy;
-               ((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)
@@ -402,7 +370,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;
@@ -515,7 +487,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())
@@ -589,6 +565,11 @@ 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;
 
@@ -596,13 +577,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 +592,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 +617,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, ':'))
                        {
@@ -640,12 +625,8 @@ bool InspSocket::Poll()
                                recvip = inet_ntop(AF_INET6, &((sockaddr_in6*)client)->sin6_addr, buf, sizeof(buf));
                        }
                        else
-                       {
-                               recvip = inet_ntoa(((sockaddr_in*)client)->sin_addr);
-                       }
-#else
-                       recvip = inet_ntoa(((sockaddr_in*)client)->sin_addr);
 #endif
+                       recvip = inet_ntoa(((sockaddr_in*)client)->sin_addr);
                        this->OnIncomingConnection(incoming, (char*)recvip.c_str());
 
                        if (this->IsIOHooked)