Convert ISUPPORT to use a map instead of a string.

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

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 761343bb1a9948ee7f63ae53d0edd731d3a935c3..efd899c44b3f07063548cee3a5a587b73d32e508 100644 (file)
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -83,7 +83,7 @@ void ModuleSpanningTree::init()
        ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 
        delete ServerInstance->PI;
-       ServerInstance->PI = new SpanningTreeProtocolInterface(this, Utils);
+       ServerInstance->PI = new SpanningTreeProtocolInterface(Utils);
        loopCall = false;
 
        // update our local user count
@@ -101,7 +101,7 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops)
        {
                if ((Current->GetChild(q)->Hidden) || ((Utils->HideULines) && (ServerInstance->ULine(Current->GetChild(q)->GetName()))))
                {
-                       if (IS_OPER(user))
+                       if (user->IsOper())
                        {
                                 ShowLinks(Current->GetChild(q),user,hops+1);
                        }
@@ -112,16 +112,16 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops)
                }
        }
        /* Don't display the line if its a uline, hide ulines is on, and the user isnt an oper */
-       if ((Utils->HideULines) && (ServerInstance->ULine(Current->GetName())) && (!IS_OPER(user)))
+       if ((Utils->HideULines) && (ServerInstance->ULine(Current->GetName())) && (!user->IsOper()))
                return;
        /* Or if the server is hidden and they're not an oper */
-       else if ((Current->Hidden) && (!IS_OPER(user)))
+       else if ((Current->Hidden) && (!user->IsOper()))
                return;
 
        std::string servername = Current->GetName();
        user->WriteNumeric(364, "%s %s %s :%d %s",      user->nick.c_str(), servername.c_str(),
-                       (Utils->FlatLinks && (!IS_OPER(user))) ? ServerInstance->Config->ServerName.c_str() : Parent.c_str(),
-                       (Utils->FlatLinks && (!IS_OPER(user))) ? 0 : hops,
+                       (Utils->FlatLinks && (!user->IsOper())) ? ServerInstance->Config->ServerName.c_str() : Parent.c_str(),
+                       (Utils->FlatLinks && (!user->IsOper())) ? 0 : hops,
                        Current->GetDesc().c_str());
 }
 
@@ -306,7 +306,7 @@ void ModuleSpanningTree::ConnectServer(Link* x, Autoconnect* y)
        {
                try
                {
-                       bool cached;
+                       bool cached = false;
                        ServernameResolver* snr = new ServernameResolver(Utils, x->IPAddr, x, cached, start_type, y);
                        ServerInstance->AddResolver(snr, cached);
                }
@@ -360,12 +360,13 @@ ModResult ModuleSpanningTree::HandleVersion(const std::vector<std::string>& para
        TreeServer* found = Utils->FindServerMask(parameters[0]);
        if (found)
        {
-               std::string Version = found->GetVersion();
-               user->WriteNumeric(351, "%s :%s",user->nick.c_str(),Version.c_str());
                if (found == Utils->TreeRoot)
                {
-                       ServerInstance->Config->Send005(user);
+                       // Pass to default VERSION handler.
+                       return MOD_RES_PASSTHRU;
                }
+               std::string Version = found->GetVersion();
+               user->WriteNumeric(351, "%s :%s",user->nick.c_str(),Version.c_str());
        }
        else
        {
@@ -595,7 +596,7 @@ void ModuleSpanningTree::OnUserConnect(LocalUser* user)
        params.push_back(":"+user->fullname);
        Utils->DoOneToMany(ServerInstance->Config->GetSID(), "UID", params);
 
-       if (IS_OPER(user))
+       if (user->IsOper())
        {
                params.clear();
                params.push_back(user->oper->name);
@@ -754,6 +755,9 @@ void ModuleSpanningTree::OnRemoteKill(User* source, User* dest, const std::strin
 
 void ModuleSpanningTree::OnPreRehash(User* user, const std::string &parameter)
 {
+       if (loopCall)
+               return; // Don't generate a REHASH here if we're in the middle of processing a message that generated this one
+
        ServerInstance->Logs->Log("remoterehash", DEBUG, "called with param %s", parameter.c_str());
 
        // Send out to other servers