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 f639a748d5e411917cdae7b3d74bd5ff119f960d..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
@@ -99,9 +99,9 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops)
        }
        for (unsigned int q = 0; q < Current->ChildCount(); q++)
        {
-               if ((Current->GetChild(q)->Hidden) || ((Utils->HideULines) && (ServerInstance->ULine(Current->GetChild(q)->GetName().c_str()))))
+               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,15 +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().c_str())) && (!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;
 
-       user->WriteNumeric(364, "%s %s %s :%d %s",      user->nick.c_str(),Current->GetName().c_str(),
-                       (Utils->FlatLinks && (!IS_OPER(user))) ? ServerInstance->Config->ServerName.c_str() : Parent.c_str(),
-                       (Utils->FlatLinks && (!IS_OPER(user))) ? 0 : hops,
+       std::string servername = Current->GetName();
+       user->WriteNumeric(364, "%s %s %s :%d %s",      user->nick.c_str(), servername.c_str(),
+                       (Utils->FlatLinks && (!user->IsOper())) ? ServerInstance->Config->ServerName.c_str() : Parent.c_str(),
+                       (Utils->FlatLinks && (!user->IsOper())) ? 0 : hops,
                        Current->GetDesc().c_str());
 }
 
@@ -144,9 +145,9 @@ std::string ModuleSpanningTree::TimeToStr(time_t secs)
        secs = secs % 60;
        mins_up = mins_up % 60;
        hours_up = hours_up % 24;
-       return ((days_up ? (ConvToStr(days_up) + "d") : std::string(""))
-                       + (hours_up ? (ConvToStr(hours_up) + "h") : std::string(""))
-                       + (mins_up ? (ConvToStr(mins_up) + "m") : std::string(""))
+       return ((days_up ? (ConvToStr(days_up) + "d") : "")
+                       + (hours_up ? (ConvToStr(hours_up) + "h") : "")
+                       + (mins_up ? (ConvToStr(mins_up) + "m") : "")
                        + ConvToStr(secs) + "s");
 }
 
@@ -162,7 +163,7 @@ restart:
        for (server_hash::iterator i = Utils->serverlist.begin(); i != Utils->serverlist.end(); i++)
        {
                TreeServer *s = i->second;
-               
+
                if (s->GetSocket() && s->GetSocket()->GetLinkState() == DYING)
                {
                        s->GetSocket()->Close();
@@ -193,7 +194,7 @@ restart:
                                        // ... if we can find a proper route to them
                                        if (tsock)
                                        {
-                                               tsock->WriteLine(std::string(":") + ServerInstance->Config->GetSID() + " PING " +
+                                               tsock->WriteLine(":" + ServerInstance->Config->GetSID() + " PING " +
                                                                ServerInstance->Config->GetSID() + " " + s->GetID());
                                                s->LastPingMsec = ts;
                                        }
@@ -215,7 +216,8 @@ restart:
                        if ((Utils->PingWarnTime) && (!s->Warned) && (curtime >= s->NextPingTime() - (Utils->PingFreq - Utils->PingWarnTime)) && (!s->AnsweredLastPing()))
                        {
                                /* The server hasnt responded, send a warning to opers */
-                               ServerInstance->SNO->WriteToSnoMask('l',"Server \002%s\002 has not responded to PING for %d seconds, high latency.", s->GetName().c_str(), Utils->PingWarnTime);
+                               std::string servername = s->GetName();
+                               ServerInstance->SNO->WriteToSnoMask('l',"Server \002%s\002 has not responded to PING for %d seconds, high latency.", servername.c_str(), Utils->PingWarnTime);
                                s->Warned = true;
                        }
                }
@@ -304,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);
                }
@@ -358,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
        {
@@ -411,7 +414,8 @@ ModResult ModuleSpanningTree::HandleConnect(const std::vector<std::string>& para
                        }
                        else
                        {
-                               RemoteMessage(user, "*** CONNECT: Server \002%s\002 already exists on the network and is connected via \002%s\002",x->Name.c_str(),CheckDupe->GetParent()->GetName().c_str());
+                               std::string servername = CheckDupe->GetParent()->GetName();
+                               RemoteMessage(user, "*** CONNECT: Server \002%s\002 already exists on the network and is connected via \002%s\002", x->Name.c_str(), servername.c_str());
                                return MOD_RES_DENY;
                        }
                }
@@ -589,10 +593,10 @@ void ModuleSpanningTree::OnUserConnect(LocalUser* user)
        params.push_back(user->GetIPString());
        params.push_back(ConvToStr(user->signon));
        params.push_back("+"+std::string(user->FormatModes(true)));
-       params.push_back(":"+std::string(user->fullname));
+       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);
@@ -622,7 +626,7 @@ void ModuleSpanningTree::OnUserJoin(Membership* memb, bool sync, bool created, C
                params.push_back(memb->chan->name);
                params.push_back(ConvToStr(memb->chan->age));
                params.push_back(std::string("+") + memb->chan->ChanModes(true));
-               params.push_back(memb->modes+","+std::string(memb->user->uuid));
+               params.push_back(memb->modes+","+memb->user->uuid);
                Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FJOIN",params);
        }
 }
@@ -751,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
@@ -813,10 +820,6 @@ void ModuleSpanningTree::OnUnloadModule(Module* mod)
        }
 }
 
-void ModuleSpanningTree::RedoConfig(Module* mod)
-{
-}
-
 // note: the protocol does not allow direct umode +o except
 // via NICK with 8 params. sending OPERTYPE infers +o modechange
 // locally.
@@ -834,11 +837,13 @@ void ModuleSpanningTree::OnAddLine(User* user, XLine *x)
        if (!x->IsBurstable() || loopCall)
                return;
 
-       char data[MAXBUF];
-       snprintf(data,MAXBUF,"%s %s %s %lu %lu :%s", x->type.c_str(), x->Displayable(),
-       ServerInstance->Config->ServerName.c_str(), (unsigned long)x->set_time, (unsigned long)x->duration, x->reason.c_str());
        parameterlist params;
-       params.push_back(data);
+       params.push_back(x->type);
+       params.push_back(x->Displayable());
+       params.push_back(ServerInstance->Config->ServerName);
+       params.push_back(ConvToStr(x->set_time));
+       params.push_back(ConvToStr(x->duration));
+       params.push_back(":" + x->reason);
 
        if (!user)
        {
@@ -857,10 +862,9 @@ void ModuleSpanningTree::OnDelLine(User* user, XLine *x)
        if (!x->IsBurstable() || loopCall)
                return;
 
-       char data[MAXBUF];
-       snprintf(data,MAXBUF,"%s %s", x->type.c_str(), x->Displayable());
        parameterlist params;
-       params.push_back(data);
+       params.push_back(x->type);
+       params.push_back(x->Displayable());
 
        if (!user)
        {
@@ -879,7 +883,6 @@ void ModuleSpanningTree::OnMode(User* user, void* dest, int target_type, const p
        if ((IS_LOCAL(user)) && (user->registered == REG_ALL))
        {
                parameterlist params;
-               std::string command;
                std::string output_text;
 
                ServerInstance->Parser->TranslateUIDs(translate, text, output_text);
@@ -889,7 +892,7 @@ void ModuleSpanningTree::OnMode(User* user, void* dest, int target_type, const p
                        User* u = (User*)dest;
                        params.push_back(u->uuid);
                        params.push_back(output_text);
-                       command = "MODE";
+                       Utils->DoOneToMany(user->uuid, "MODE", params);
                }
                else
                {
@@ -897,10 +900,8 @@ void ModuleSpanningTree::OnMode(User* user, void* dest, int target_type, const p
                        params.push_back(c->name);
                        params.push_back(ConvToStr(c->age));
                        params.push_back(output_text);
-                       command = "FMODE";
+                       Utils->DoOneToMany(user->uuid, "FMODE", params);
                }
-
-               Utils->DoOneToMany(user->uuid, command, params);
        }
 }
 
@@ -908,18 +909,13 @@ ModResult ModuleSpanningTree::OnSetAway(User* user, const std::string &awaymsg)
 {
        if (IS_LOCAL(user))
        {
-               if (awaymsg.empty())
-               {
-                       parameterlist params;
-                       Utils->DoOneToMany(user->uuid,"AWAY",params);
-               }
-               else
+               parameterlist params;
+               if (!awaymsg.empty())
                {
-                       parameterlist params;
                        params.push_back(ConvToStr(user->awaytime));
                        params.push_back(":" + awaymsg);
-                       Utils->DoOneToMany(user->uuid,"AWAY",params);
                }
+               Utils->DoOneToMany(user->uuid, "AWAY", params);
        }
 
        return MOD_RES_PASSTHRU;
@@ -937,12 +933,12 @@ void ModuleSpanningTree::ProtoSendMode(void* opaque, TargetTypeFlags target_type
                if (target_type == TYPE_USER)
                {
                        User* u = (User*)target;
-                       s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" MODE "+u->uuid+" "+output_text);
+                       s->WriteLine(":"+ServerInstance->Config->GetSID()+" MODE "+u->uuid+" "+output_text);
                }
                else if (target_type == TYPE_CHANNEL)
                {
                        Channel* c = (Channel*)target;
-                       s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" FMODE "+c->name+" "+ConvToStr(c->age)+" "+output_text);
+                       s->WriteLine(":"+ServerInstance->Config->GetSID()+" FMODE "+c->name+" "+ConvToStr(c->age)+" "+output_text);
                }
        }
 }
@@ -953,11 +949,11 @@ void ModuleSpanningTree::ProtoSendMetaData(void* opaque, Extensible* target, con
        User* u = dynamic_cast<User*>(target);
        Channel* c = dynamic_cast<Channel*>(target);
        if (u)
-               s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA "+u->uuid+" "+extname+" :"+extdata);
+               s->WriteLine(":"+ServerInstance->Config->GetSID()+" METADATA "+u->uuid+" "+extname+" :"+extdata);
        else if (c)
-               s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA "+c->name+" "+extname+" :"+extdata);
+               s->WriteLine(":"+ServerInstance->Config->GetSID()+" METADATA "+c->name+" "+extname+" :"+extdata);
        else if (!target)
-               s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA * "+extname+" :"+extdata);
+               s->WriteLine(":"+ServerInstance->Config->GetSID()+" METADATA * "+extname+" :"+extdata);
 }
 
 CullResult ModuleSpanningTree::cull()