Change "CAP *" reply to "CAP $nick", which is the intended use of the parameter

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

diff --git a/src/socket.cpp b/src/socket.cpp
index 049d3a2379b6d81e91bb387e94f9d52a824a9574..3ee9961935d2c1b8260c131e6180c6cd30ce2523 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -86,8 +86,9 @@ int InspIRCd::BindPorts(FailedPortList &failed_ports)
                while (0 != (portno = portrange.GetToken()))
                {
                        irc::sockets::sockaddrs bindspec;
-                       irc::sockets::aptosa(Addr, portno, bindspec);
-                       std::string bind_readable = irc::sockets::satouser(bindspec);
+                       if (!irc::sockets::aptosa(Addr, portno, bindspec))
+                               continue;
+                       std::string bind_readable = bindspec.str();
 
                        bool skip = false;
                        for (std::vector<ListenSocket*>::iterator n = old_ports.begin(); n != old_ports.end(); ++n)
@@ -101,7 +102,8 @@ int InspIRCd::BindPorts(FailedPortList &failed_ports)
                        }
                        if (!skip)
                        {
-                               ListenSocket *ll = new ListenSocket(tag, Addr, portno);
+                               ListenSocket* ll = new ListenSocket(tag, bindspec);
+
                                if (ll->GetFd() > -1)
                                {
                                        bound++;
@@ -123,7 +125,7 @@ int InspIRCd::BindPorts(FailedPortList &failed_ports)
                        n++;
                if (n == ports.end())
                {
-                       this->Logs->Log("SOCKET",ERROR,"Port bindings slipped out of vector, aborting close!");
+                       this->Logs->Log("SOCKET",DEFAULT,"Port bindings slipped out of vector, aborting close!");
                        break;
                }
 
@@ -143,13 +145,16 @@ bool irc::sockets::aptosa(const std::string& addr, int port, irc::sockets::socka
        memset(&sa, 0, sizeof(sa));
        if (addr.empty() || addr.c_str()[0] == '*')
        {
-#ifdef IPV6
-               sa.in6.sin6_family = AF_INET6;
-               sa.in6.sin6_port = htons(port);
-#else
-               sa.in4.sin_family = AF_INET;
-               sa.in4.sin_port = htons(port);
-#endif
+               if (ServerInstance->Config->WildcardIPv6)
+               {
+                       sa.in6.sin6_family = AF_INET6;
+                       sa.in6.sin6_port = htons(port);
+               }
+               else
+               {
+                       sa.in4.sin_family = AF_INET;
+                       sa.in4.sin_port = htons(port);
+               }
                return true;
        }
        else if (inet_pton(AF_INET, addr.c_str(), &sa.in4.sin_addr) > 0)
@@ -208,35 +213,17 @@ std::string irc::sockets::sockaddrs::str() const
        char buffer[MAXBUF];
        if (sa.sa_family == AF_INET)
        {
-#ifndef IPV6
-               if (in4.sin_addr.s_addr == 0)
-               {
-                       sprintf(buffer, "*:%u", ntohs(in4.sin_port));
-               }
-               else
-#endif
-               {
-                       const uint8_t* bits = reinterpret_cast<const uint8_t*>(&in4.sin_addr);
-                       sprintf(buffer, "%d.%d.%d.%d:%u", bits[0], bits[1], bits[2], bits[3], ntohs(in4.sin_port));
-               }
+               const uint8_t* bits = reinterpret_cast<const uint8_t*>(&in4.sin_addr);
+               sprintf(buffer, "%d.%d.%d.%d:%u", bits[0], bits[1], bits[2], bits[3], ntohs(in4.sin_port));
        }
        else if (sa.sa_family == AF_INET6)
        {
-#ifdef IPV6
-               if (!memcmp(all_zero, &in6.sin6_addr, 16))
-               {
-                       sprintf(buffer, "*:%u", ntohs(in6.sin6_port));
-               }
-               else
-#endif
-               {
-                       buffer[0] = '[';
-                       if (!inet_ntop(AF_INET6, &in6.sin6_addr, buffer+1, MAXBUF - 10))
-                               return "<unknown>"; // should never happen, buffer is large enough
-                       int len = strlen(buffer);
-                       // no need for snprintf, buffer has at least 9 chars left, max short len = 5
-                       sprintf(buffer + len, "]:%u", ntohs(in6.sin6_port));
-               }
+               buffer[0] = '[';
+               if (!inet_ntop(AF_INET6, &in6.sin6_addr, buffer+1, MAXBUF - 10))
+                       return "<unknown>"; // should never happen, buffer is large enough
+               int len = strlen(buffer);
+               // no need for snprintf, buffer has at least 9 chars left, max short len = 5
+               sprintf(buffer + len, "]:%u", ntohs(in6.sin6_port));
        }
        else
                return "<unknown>";
@@ -329,7 +316,7 @@ std::string irc::sockets::cidr_mask::str() const
        else
                return "";
        memcpy(base, bits, len);
-       return sa.addr() + "/" + ConvToStr(length);
+       return sa.addr() + "/" + ConvToStr((int)length);
 }
 
 bool irc::sockets::cidr_mask::operator==(const cidr_mask& other) const