Convert more modules

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

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 43eaec04a76a1bb02b97aad506a81ab5870bdbe6..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!");
@@ -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,21 +300,12 @@ 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);
+       unsigned long flags = 0;
+       ioctlsocket(this->fd, FIONBIO, &flags);
 #endif
        if (connect(this->fd, (sockaddr*)addr, size) == -1)
        {
@@ -525,7 +490,7 @@ bool InspSocket::FlushWriteBuffer()
 #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);
+                               int result = send(this->fd,outbuffer[0].c_str(),outbuffer[0].length(), 0);
 #endif
                                if (result > 0)
                                {
@@ -660,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)