m_spanningtree Remove now unused TreeServer::Tidy()

[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 a17fb203c42cc73d561700bce68ea192bb9adee3..e3814a88598e6983a1224b36f47812a3024fccda 100644 (file)
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -51,7 +51,7 @@ SpanningTreeCommands::SpanningTreeCommands(ModuleSpanningTree* module)
        away(module), addline(module), delline(module), encap(module), idle(module),
        nick(module), ping(module), pong(module), push(module), save(module),
        server(module), squit(module), snonotice(module),
-       burst(module), endburst(module), sinfo(module)
+       endburst(module), sinfo(module)
 {
 }
 
@@ -604,12 +604,9 @@ void ModuleSpanningTree::OnUserPostNick(User* user, const std::string &oldnick)
                params.push_back(ConvToStr(user->age));
                params.Broadcast();
        }
-       else if (!loopCall && user->nick == user->uuid)
+       else if (!loopCall)
        {
-               CmdBuilder params("SAVE");
-               params.push_back(user->uuid);
-               params.push_back(ConvToStr(user->age));
-               params.Broadcast();
+               ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "WARNING: Changed nick of remote user %s from %s to %s TS %lu by ourselves!", user->uuid.c_str(), oldnick.c_str(), user->nick.c_str(), (unsigned long) user->age);
        }
 }
 
@@ -694,6 +691,7 @@ void ModuleSpanningTree::OnUnloadModule(Module* mod)
                return;
        ServerInstance->PI->SendMetaData("modules", "-" + mod->ModuleSourceFile);
 
+restart:
        // Close all connections which use an IO hook provided by this module
        const TreeServer::ChildServers& list = Utils->TreeRoot->GetChildren();
        for (TreeServer::ChildServers::const_iterator i = list.begin(); i != list.end(); ++i)
@@ -703,6 +701,8 @@ void ModuleSpanningTree::OnUnloadModule(Module* mod)
                {
                        sock->SendError("SSL module unloaded");
                        sock->Close();
+                       // XXX: The list we're iterating is modified by TreeServer::SQuit() which is called by Close()
+                       goto restart;
                }
        }