Fix bug from std::string porting, thanks ThunderHacker

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

diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 5d2471b2cd1b8333d6243c0f4bbf6e2cb525a668..63ab836230f5e0ea400d64c8fdaeb5ee5a2e26bb 100644 (file)
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -679,7 +679,7 @@ int TreeSocket::OnIncomingConnection(int newsock, char* ip)
        {
                for (std::vector<std::string>::iterator i = Utils->ValidIPs.begin(); i != Utils->ValidIPs.end(); i++)
                {
-                       if ((*i) == "*" || irc::sockets::MatchCIDR(ip, (*i).c_str()))
+                       if (*i == "*" || irc::sockets::MatchCIDR(ip, *i))
                        {
                                found = true;
                                break;
@@ -689,6 +689,7 @@ int TreeSocket::OnIncomingConnection(int newsock, char* ip)
                if (!found)
                {
                        Utils->Creator->RemoteMessage(NULL,"Server connection from %s denied (no link blocks with that IP address)", ip);
+                       Instance->Logs->Log("m_spanningtree", DEBUG, "There are %lu allowed ips in the ValidIPs list", ValidIPs.size());
                        Instance->SE->Close(newsock);
                        return false;
                }

diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index cfbb9add0b8e308a1d404f3964ee2f4b459c0f5d..388725637e001c207b96a28ac1fef439b68c86e9 100644 (file)
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -348,7 +348,7 @@ void SpanningTreeUtilities::RefreshIPCache()
        ValidIPs.clear();
        for (std::vector<Link>::iterator L = LinkBlocks.begin(); L != LinkBlocks.end(); L++)
        {
-               if (L->IPAddr.empty() || L->RecvPass.empty() || L->SendPass.empty() || L->Name.empty() || L->Port)
+               if (L->IPAddr.empty() || L->RecvPass.empty() || L->SendPass.empty() || L->Name.empty() || !L->Port)
                {
                        if (L->Name.empty())
                        {