Fixes found by removing User inheritance from StreamSocket

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / utils.cpp

diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index e5012dcba5378a44744940eaa9d312bd4876f4f0..da3417de9735d60a8c5a85d047e507a20b8c1869 100644 (file)
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -29,34 +29,19 @@ ModResult ModuleSpanningTree::OnAcceptConnection(int newsock, ListenSocket* from
        if (from->bind_tag->getString("type") != "servers")
                return MOD_RES_PASSTHRU;
 
-       bool found = false;
-       int port;
-       std::string incomingip;
-       irc::sockets::satoap(*client, incomingip, port);
+       std::string incomingip = client->addr();
 
-       found = (std::find(Utils->ValidIPs.begin(), Utils->ValidIPs.end(), incomingip) != Utils->ValidIPs.end());
-       if (!found)
+       for (std::vector<std::string>::iterator i = Utils->ValidIPs.begin(); i != Utils->ValidIPs.end(); i++)
        {
-               for (std::vector<std::string>::iterator i = Utils->ValidIPs.begin(); i != Utils->ValidIPs.end(); i++)
+               if (*i == "*" || *i == incomingip || irc::sockets::cidr_mask(*i).match(*client))
                {
-                       if (*i == "*" || irc::sockets::MatchCIDR(incomingip, *i))
-                       {
-                               found = true;
-                               break;
-                       }
-               }
-
-               if (!found)
-               {
-                       ServerInstance->SNO->WriteToSnoMask('l', "Server connection from %s denied (no link blocks with that IP address)", incomingip.c_str());
-                       return MOD_RES_DENY;
+                       /* we don't need to do anything with the pointer, creating it stores it in the necessary places */
+                       new TreeSocket(Utils, newsock, from, client, server);
+                       return MOD_RES_ALLOW;
                }
        }
-
-       /* we don't need to do anything with the pointer, creating it stores it in the necessary places */
-
-       new TreeSocket(Utils, newsock, from, client, server);
-       return MOD_RES_ALLOW;
+       ServerInstance->SNO->WriteToSnoMask('l', "Server connection from %s denied (no link blocks with that IP address)", incomingip.c_str());
+       return MOD_RES_DENY;
 }
 
 /** Yay for fast searches!
@@ -147,8 +132,6 @@ SpanningTreeUtilities::SpanningTreeUtilities(ModuleSpanningTree* C) : Creator(C)
        ServerInstance->Logs->Log("m_spanningtree",DEBUG,"***** Using SID for hash: %s *****", ServerInstance->Config->GetSID().c_str());
 
        this->TreeRoot = new TreeServer(this, ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc, ServerInstance->Config->GetSID());
-       ServerUser = new FakeUser(TreeRoot->GetID());
-
        this->ReadConfiguration();
 }
 
@@ -170,10 +153,8 @@ CullResult SpanningTreeUtilities::cull()
                TreeSocket* s = i->first;
                ServerInstance->GlobalCulls.AddItem(s);
        }
+       TreeRoot->cull();
 
-       ServerUser->uuid = TreeRoot->GetID();
-       ServerUser->cull();
-       delete ServerUser;
        return classbase::cull();
 }