Merge insp20

[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 5bf4583a4fe46333d6f97fdfc335c1f1947c15fd..ee4c4bdd8b656e3d90163ef5ca5f37b6058f90de 100644 (file)
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -50,8 +50,8 @@ SpanningTreeCommands::SpanningTreeCommands(ModuleSpanningTree* module)
        fmode(module), ftopic(module), fhost(module), fident(module), fname(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), version(module),
-       burst(module), endburst(module)
+       server(module), squit(module), snonotice(module),
+       burst(module), endburst(module), sinfo(module)
 {
 }
 
@@ -59,20 +59,22 @@ namespace
 {
        void SetLocalUsersServer(Server* newserver)
        {
+               // Does not change the server of quitting users because those are not in the list
+
                ServerInstance->FakeClient->server = newserver;
-               const LocalUserList& list = ServerInstance->Users->local_users;
-               for (LocalUserList::const_iterator i = list.begin(); i != list.end(); ++i)
+               const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
+               for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); ++i)
                        (*i)->server = newserver;
        }
 
        void ResetMembershipIds()
        {
                // Set all membership ids to 0
-               const LocalUserList& list = ServerInstance->Users->local_users;
-               for (LocalUserList::iterator i = list.begin(); i != list.end(); ++i)
+               const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
+               for (UserManager::LocalList::iterator i = list.begin(); i != list.end(); ++i)
                {
                        LocalUser* user = *i;
-                       for (UCListIter j = user->chans.begin(); j != user->chans.end(); ++j)
+                       for (User::ChanList::iterator j = user->chans.begin(); j != user->chans.end(); ++j)
                                (*j)->id = 0;
                }
        }
@@ -189,7 +191,7 @@ restart:
                        {
                                // They did, send a ping to them
                                s->SetNextPingTime(curtime + Utils->PingFreq);
-                               s->GetSocket()->WriteLine(":" + ServerInstance->Config->GetSID() + " PING " + s->GetID());
+                               s->GetSocket()->WriteLine(CmdBuilder("PING").push(s->GetID()));
                                s->LastPingMsec = ts;
                        }
                        else
@@ -359,7 +361,13 @@ ModResult ModuleSpanningTree::HandleVersion(const std::vector<std::string>& para
                        // Pass to default VERSION handler.
                        return MOD_RES_PASSTHRU;
                }
-               std::string Version = found->GetVersion();
+
+               // If an oper wants to see the version then show the full version string instead of the normal,
+               // but only if it is non-empty.
+               // If it's empty it might be that the server is still syncing (full version hasn't arrived yet)
+               // or the server is a 2.0 server and does not send a full version.
+               bool showfull = ((user->IsOper()) && (!found->GetFullVersion().empty()));
+               const std::string& Version = (showfull ? found->GetFullVersion() : found->GetVersion());
                user->WriteNumeric(RPL_VERSION, ":%s", Version.c_str());
        }
        else
@@ -413,11 +421,6 @@ ModResult ModuleSpanningTree::HandleConnect(const std::vector<std::string>& para
        return MOD_RES_DENY;
 }
 
-void ModuleSpanningTree::On005Numeric(std::map<std::string, std::string>& tokens)
-{
-       tokens["MAP"];
-}
-
 void ModuleSpanningTree::OnUserInvite(User* source,User* dest,Channel* channel, time_t expiry)
 {
        if (IS_LOCAL(source))
@@ -643,6 +646,16 @@ void ModuleSpanningTree::OnPreRehash(User* user, const std::string &parameter)
 
 void ModuleSpanningTree::ReadConfig(ConfigStatus& status)
 {
+       // Did this rehash change the description of this server?
+       const std::string& newdesc = ServerInstance->Config->ServerDesc;
+       if (newdesc != Utils->TreeRoot->GetDesc())
+       {
+               // Broadcast a SINFO desc message to let the network know about the new description. This is the description
+               // string that is sent in the SERVER message initially and shown for example in WHOIS.
+               // We don't need to update the field itself in the Server object - the core does that.
+               CommandSInfo::Builder(Utils->TreeRoot, "desc", newdesc).Broadcast();
+       }
+
        // Re-read config stuff
        try
        {
@@ -681,6 +694,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)
@@ -690,6 +704,8 @@ void ModuleSpanningTree::OnUnloadModule(Module* mod)
                {
                        sock->SendError("SSL module unloaded");
                        sock->Close();
+                       // XXX: The list we're iterating is modified by TreeSocket::Squit() which is called by Close()
+                       goto restart;
                }
        }