Use a set to mark client SSL ports rather than going by textual IP/port pairs

This theoretically speeds up accepting connections. Visible changes are proper
IPv6 port text in 005 output and no possibility of incorrect SSL on addresses
that mismatch an incoming port (possible with IPv4 wildcard SSL and IPv6
plaintext on the same port, not that anyone would do such a thing). Bind ports
also now tell which SSL module they use in /stats p.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11629 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 10 insertions, 4 deletions

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index 663f912e6..df252f18b 100644
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -25,12 +25,18 @@ ListenSocketBase::ListenSocketBase(InspIRCd* Instance, int port, const std::stri
 {
 	irc::sockets::sockaddrs bind_to;
 
-	bind_addr = addr;
-	bind_port = port;
-
 	// canonicalize address if it is defined
-	if (!addr.empty() && irc::sockets::aptosa(addr.c_str(), port, &bind_to))
+	if (irc::sockets::aptosa(addr.c_str(), port, &bind_to))
+	{
 		irc::sockets::satoap(&bind_to, bind_addr, bind_port);
+		bind_desc = irc::sockets::satouser(&bind_to);
+	}
+	else
+	{
+		bind_addr = addr;
+		bind_port = port;
+		bind_desc = addr + ":" + ConvToStr(port);
+	}
 
 	this->SetFd(irc::sockets::OpenTCPSocket(bind_addr.c_str()));
 	if (this->GetFd() > -1)