Erase local users from UserManager::local_list in QuitUser()

[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 8154016e719965bf0b29f2d1b4d1609a550ab1d4..979048d65fd9f08e98d0efa4a8fc0200b1c3822d 100644 (file)
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -33,13 +33,14 @@
 #include "link.h"
 #include "treesocket.h"
 #include "commands.h"
-#include "protocolinterface.h"
 
 ModuleSpanningTree::ModuleSpanningTree()
        : rconnect(this), rsquit(this), map(this)
        , commands(NULL)
        , currmembid(0)
        , DNS(this, "DNS")
+       , loopCall(false)
+       , SplitInProgress(false)
 {
 }
 
@@ -49,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)
 {
 }
 
@@ -58,6 +59,8 @@ 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)
@@ -71,7 +74,7 @@ namespace
                for (LocalUserList::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;
                }
        }
@@ -87,17 +90,10 @@ void ModuleSpanningTree::init()
        Utils->TreeRoot = new TreeServer;
        commands = new SpanningTreeCommands(this);
 
-       delete ServerInstance->PI;
-       ServerInstance->PI = new SpanningTreeProtocolInterface;
+       ServerInstance->PI = &protocolinterface;
 
        delete ServerInstance->FakeClient->server;
        SetLocalUsersServer(Utils->TreeRoot);
-
-       loopCall = false;
-       SplitInProgress = false;
-
-       // update our local user count
-       Utils->TreeRoot->UserCount = ServerInstance->Users->local_users.size();
 }
 
 void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops)
@@ -195,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
@@ -365,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
@@ -624,6 +626,9 @@ void ModuleSpanningTree::OnUserKick(User* source, Membership* memb, const std::s
        CmdBuilder params(source, "KICK");
        params.push_back(memb->chan->name);
        params.push_back(memb->user->uuid);
+       // If a remote user is being kicked by us then send the membership id in the kick too
+       if (!IS_LOCAL(memb->user))
+               params.push_int(memb->id);
        params.push_last(reason);
        params.Broadcast();
 }
@@ -646,6 +651,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
        {
@@ -756,8 +771,7 @@ CullResult ModuleSpanningTree::cull()
 
 ModuleSpanningTree::~ModuleSpanningTree()
 {
-       delete ServerInstance->PI;
-       ServerInstance->PI = new ProtocolInterface;
+       ServerInstance->PI = &ServerInstance->DefaultProtocolInterface;
 
        Server* newsrv = new Server(ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc);
        SetLocalUsersServer(newsrv);