Fixes :P

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

diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index a71dd30bf0eae3372891db3cd9a70c2340866d7a..78c37c5848f22354897eefe7427d0772afa4cea7 100644 (file)
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -1410,26 +1410,32 @@ class TreeSocket : public InspSocket
                 */
                std::string burst = "BURST "+ConvToStr(time(NULL));
                std::string endburst = "ENDBURST";
-               Srv->SendOpers("*** Bursting to \2"+s->GetName()+"\2.");
+               // Because by the end of the netburst, it  could be gone!
+               std::string name = s->GetName();
+               Srv->SendOpers("*** Bursting to \2"+name+"\2.");
                this->WriteLine(burst);
                ServerInstance->DoOneIteration(false);
                /* send our version string */
                this->WriteLine(":"+Srv->GetServerName()+" VERSION :"+Srv->GetVersion());
                /* Send server tree */
-               this->SendServers(TreeRoot,s,1);
+               if (FindServer(name))
+                       this->SendServers(TreeRoot,s,1);
                ServerInstance->DoOneIteration(false);
                /* Send users and their oper status */
-               this->SendUsers(s);
+               if (FindServer(name))
+                       this->SendUsers(s);
                ServerInstance->DoOneIteration(false);
                /* Send everything else (channel modes, xlines etc) */
-               this->SendChannelModes(s);
+               if (FindServer(name))
+                       this->SendChannelModes(s);
                ServerInstance->DoOneIteration(false);
-               this->SendXLines(s);
+               if (FindServer(name))
+                       this->SendXLines(s);
                ServerInstance->DoOneIteration(false);
                FOREACH_MOD(I_OnSyncOtherMetaData,OnSyncOtherMetaData((Module*)TreeProtocolModule,(void*)this));
                ServerInstance->DoOneIteration(false);
                this->WriteLine(endburst);
-               Srv->SendOpers("*** Finished bursting to \2"+s->GetName()+"\2.");
+               Srv->SendOpers("*** Finished bursting to \2"+name+"\2.");
        }
 
        /* This function is called when we receive data from a remote
@@ -3361,7 +3367,7 @@ class ModuleSpanningTree : public Module
                return 0;
        }
 
-       virtual int OnPreCommand(std::string command, char **parameters, int pcnt, userrec *user, bool validated)
+       virtual int OnPreCommand(const std::string &command, char **parameters, int pcnt, userrec *user, bool validated)
        {
                /* If the command doesnt appear to be valid, we dont want to mess with it. */
                if (!validated)
@@ -3433,7 +3439,7 @@ class ModuleSpanningTree : public Module
                return 0;
        }
 
-       virtual void OnGetServerDescription(std::string servername,std::string &description)
+       virtual void OnGetServerDescription(const std::string &servername,std::string &description)
        {
                TreeServer* s = FindServer(servername);
                if (s)
@@ -3453,7 +3459,7 @@ class ModuleSpanningTree : public Module
                }
        }
 
-       virtual void OnPostLocalTopicChange(userrec* user, chanrec* chan, std::string topic)
+       virtual void OnPostLocalTopicChange(userrec* user, chanrec* chan, const std::string &topic)
        {
                std::deque<std::string> params;
                params.push_back(chan->name);
@@ -3461,7 +3467,7 @@ class ModuleSpanningTree : public Module
                DoOneToMany(user->nick,"TOPIC",params);
        }
 
-       virtual void OnWallops(userrec* user, std::string text)
+       virtual void OnWallops(userrec* user, const std::string &text)
        {
                if (user->fd > -1)
                {
@@ -3471,7 +3477,7 @@ class ModuleSpanningTree : public Module
                }
        }
 
-       virtual void OnUserNotice(userrec* user, void* dest, int target_type, std::string text, char status)
+       virtual void OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status)
        {
                if (target_type == TYPE_USER)
                {
@@ -3506,7 +3512,7 @@ class ModuleSpanningTree : public Module
                }
        }
 
-       virtual void OnUserMessage(userrec* user, void* dest, int target_type, std::string text, char status)
+       virtual void OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status)
        {
                if (target_type == TYPE_USER)
                {
@@ -3582,7 +3588,7 @@ class ModuleSpanningTree : public Module
                }
        }
 
-       virtual void OnChangeHost(userrec* user, std::string newhost)
+       virtual void OnChangeHost(userrec* user, const std::string &newhost)
        {
                // only occurs for local clients
                if (user->registered != 7)
@@ -3592,7 +3598,7 @@ class ModuleSpanningTree : public Module
                DoOneToMany(user->nick,"FHOST",params);
        }
 
-       virtual void OnChangeName(userrec* user, std::string gecos)
+       virtual void OnChangeName(userrec* user, const std::string &gecos)
        {
                // only occurs for local clients
                if (user->registered != 7)
@@ -3602,7 +3608,7 @@ class ModuleSpanningTree : public Module
                DoOneToMany(user->nick,"FNAME",params);
        }
 
-       virtual void OnUserPart(userrec* user, chanrec* channel, std::string partmessage)
+       virtual void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage)
        {
                if (user->fd > -1)
                {
@@ -3641,7 +3647,7 @@ class ModuleSpanningTree : public Module
                }
        }
 
-       virtual void OnUserQuit(userrec* user, std::string reason)
+       virtual void OnUserQuit(userrec* user, const std::string &reason)
        {
                if ((user->fd > -1) && (user->registered == 7))
                {
@@ -3658,7 +3664,7 @@ class ModuleSpanningTree : public Module
 
        }
 
-       virtual void OnUserPostNick(userrec* user, std::string oldnick)
+       virtual void OnUserPostNick(userrec* user, const std::string &oldnick)
        {
                if (user->fd > -1)
                {
@@ -3668,7 +3674,7 @@ class ModuleSpanningTree : public Module
                }
        }
 
-       virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, std::string reason)
+       virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason)
        {
                if ((source) && (source->fd > -1))
                {
@@ -3688,7 +3694,7 @@ class ModuleSpanningTree : public Module
                }
        }
 
-       virtual void OnRemoteKill(userrec* source, userrec* dest, std::string reason)
+       virtual void OnRemoteKill(userrec* source, userrec* dest, const std::string &reason)
        {
                std::deque<std::string> params;
                params.push_back(dest->nick);
@@ -3696,7 +3702,7 @@ class ModuleSpanningTree : public Module
                DoOneToMany(source->nick,"KILL",params);
        }
 
-       virtual void OnRehash(std::string parameter)
+       virtual void OnRehash(const std::string &parameter)
        {
                if (parameter != "")
                {
@@ -3716,7 +3722,7 @@ class ModuleSpanningTree : public Module
        // note: the protocol does not allow direct umode +o except
        // via NICK with 8 params. sending OPERTYPE infers +o modechange
        // locally.
-       virtual void OnOper(userrec* user, std::string opertype)
+       virtual void OnOper(userrec* user, const std::string &opertype)
        {
                if (user->fd > -1)
                {
@@ -3726,7 +3732,7 @@ class ModuleSpanningTree : public Module
                }
        }
 
-       void OnLine(userrec* source, std::string host, bool adding, char linetype, long duration, std::string reason)
+       void OnLine(userrec* source, const std::string &host, bool adding, char linetype, long duration, const std::string &reason)
        {
                if (source->fd > -1)
                {
@@ -3752,47 +3758,47 @@ class ModuleSpanningTree : public Module
                }
        }
 
-       virtual void OnAddGLine(long duration, userrec* source, std::string reason, std::string hostmask)
+       virtual void OnAddGLine(long duration, userrec* source, const std::string &reason, const std::string &hostmask)
        {
                OnLine(source,hostmask,true,'G',duration,reason);
        }
        
-       virtual void OnAddZLine(long duration, userrec* source, std::string reason, std::string ipmask)
+       virtual void OnAddZLine(long duration, userrec* source, const std::string &reason, const std::string &ipmask)
        {
                OnLine(source,ipmask,true,'Z',duration,reason);
        }
 
-       virtual void OnAddQLine(long duration, userrec* source, std::string reason, std::string nickmask)
+       virtual void OnAddQLine(long duration, userrec* source, const std::string &reason, const std::string &nickmask)
        {
                OnLine(source,nickmask,true,'Q',duration,reason);
        }
 
-       virtual void OnAddELine(long duration, userrec* source, std::string reason, std::string hostmask)
+       virtual void OnAddELine(long duration, userrec* source, const std::string &reason, const std::string &hostmask)
        {
                OnLine(source,hostmask,true,'E',duration,reason);
        }
 
-       virtual void OnDelGLine(userrec* source, std::string hostmask)
+       virtual void OnDelGLine(userrec* source, const std::string &hostmask)
        {
                OnLine(source,hostmask,false,'G',0,"");
        }
 
-       virtual void OnDelZLine(userrec* source, std::string ipmask)
+       virtual void OnDelZLine(userrec* source, const std::string &ipmask)
        {
                OnLine(source,ipmask,false,'Z',0,"");
        }
 
-       virtual void OnDelQLine(userrec* source, std::string nickmask)
+       virtual void OnDelQLine(userrec* source, const std::string &nickmask)
        {
                OnLine(source,nickmask,false,'Q',0,"");
        }
 
-       virtual void OnDelELine(userrec* source, std::string hostmask)
+       virtual void OnDelELine(userrec* source, const std::string &hostmask)
        {
                OnLine(source,hostmask,false,'E',0,"");
        }
 
-       virtual void OnMode(userrec* user, void* dest, int target_type, std::string text)
+       virtual void OnMode(userrec* user, void* dest, int target_type, const std::string &text)
        {
                if ((user->fd > -1) && (user->registered == 7))
                {
@@ -3835,7 +3841,7 @@ class ModuleSpanningTree : public Module
                }
        }
 
-       virtual void ProtoSendMode(void* opaque, int target_type, void* target, std::string modeline)
+       virtual void ProtoSendMode(void* opaque, int target_type, void* target, const std::string &modeline)
        {
                TreeSocket* s = (TreeSocket*)opaque;
                if (target)
@@ -3853,7 +3859,7 @@ class ModuleSpanningTree : public Module
                }
        }
 
-       virtual void ProtoSendMetaData(void* opaque, int target_type, void* target, std::string extname, std::string extdata)
+       virtual void ProtoSendMetaData(void* opaque, int target_type, void* target, const std::string &extname, const std::string &extdata)
        {
                TreeSocket* s = (TreeSocket*)opaque;
                if (target)