Forge FIDENT reply to CHGIDENT to prevent ident desync with 1.2 and 2.0 servers

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

diff --git a/src/socket.cpp b/src/socket.cpp
index eb47c9cc8286dea74331485bf66ae1129f4292c4..63b373ccee362ef2f5e8b74cdaeca68f735bb512 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
@@ -36,7 +36,7 @@ bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
        else if (!irc::sockets::aptosa(addr, port, servaddr))
                return false;
 
-       ret = SE->Bind(sockfd, &servaddr.sa, sa_size(servaddr));
+       ret = SE->Bind(sockfd, servaddr);
 
        if (ret < 0)
        {
@@ -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;
                }
 
@@ -329,7 +331,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