X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmain.cpp;h=e46c2d320188b8bb7e2262b49c9b77ed247ab20c;hb=9db7af579c46a9f0379fdf71fb773a0a76a94846;hp=42547fbdc8c57bb27c947ebdb991a5c0592eb67a;hpb=adf20f648638da7ceece0268e1684b16fe4277b8;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index 42547fbdc..e46c2d320 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -14,55 +14,51 @@ /* $ModDesc: Provides a spanning tree server link protocol */ #include "inspircd.h" -#include "commands/cmd_whois.h" -#include "commands/cmd_stats.h" #include "socket.h" #include "xline.h" -#include "transport.h" - -#include "m_spanningtree/cachetimer.h" -#include "m_spanningtree/resolvers.h" -#include "m_spanningtree/main.h" -#include "m_spanningtree/utils.h" -#include "m_spanningtree/treeserver.h" -#include "m_spanningtree/link.h" -#include "m_spanningtree/treesocket.h" -#include "m_spanningtree/rconnect.h" -#include "m_spanningtree/rsquit.h" -#include "m_spanningtree/protocolinterface.h" + +#include "cachetimer.h" +#include "resolvers.h" +#include "main.h" +#include "utils.h" +#include "treeserver.h" +#include "link.h" +#include "treesocket.h" +#include "rconnect.h" +#include "rsquit.h" +#include "protocolinterface.h" /* $ModDep: m_spanningtree/cachetimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/rconnect.h m_spanningtree/rsquit.h m_spanningtree/protocolinterface.h */ -ModuleSpanningTree::ModuleSpanningTree(InspIRCd* Me) - : Module(Me), max_local(0), max_global(0) +ModuleSpanningTree::ModuleSpanningTree() + : max_local(0), max_global(0) { ServerInstance->Modules->UseInterface("BufferedSocketHook"); - Utils = new SpanningTreeUtilities(ServerInstance, this); - command_rconnect = new cmd_rconnect(ServerInstance, this, Utils); + Utils = new SpanningTreeUtilities(this); + command_rconnect = new CommandRConnect(this, Utils); ServerInstance->AddCommand(command_rconnect); - command_rsquit = new cmd_rsquit(ServerInstance, this, Utils); + command_rsquit = new CommandRSQuit(this, Utils); ServerInstance->AddCommand(command_rsquit); - RefreshTimer = new CacheRefreshTimer(ServerInstance, Utils); + RefreshTimer = new CacheRefreshTimer(Utils); ServerInstance->Timers->AddTimer(RefreshTimer); Implementation eventlist[] = { - I_OnPreCommand, I_OnGetServerDescription, I_OnUserInvite, I_OnPostLocalTopicChange, - I_OnWallops, I_OnUserNotice, I_OnUserMessage, I_OnBackgroundTimer, - I_OnUserJoin, I_OnChangeLocalUserHost, I_OnChangeName, I_OnUserPart, - I_OnUserQuit, I_OnUserPostNick, I_OnUserKick, I_OnRemoteKill, I_OnRehash, - I_OnOper, I_OnAddLine, I_OnDelLine, I_ProtoSendMode, I_OnMode, - I_OnStats, I_ProtoSendMetaData, I_OnEvent, I_OnSetAway, I_OnPostCommand + I_OnPreCommand, I_OnGetServerDescription, I_OnUserInvite, I_OnPostTopicChange, + I_OnWallops, I_OnUserNotice, I_OnUserMessage, I_OnBackgroundTimer, I_OnUserJoin, + I_OnChangeLocalUserHost, I_OnChangeName, I_OnChangeIdent, I_OnUserPart, I_OnUnloadModule, + I_OnUserQuit, I_OnUserPostNick, I_OnUserKick, I_OnRemoteKill, I_OnRehash, I_OnPreRehash, + I_OnOper, I_OnAddLine, I_OnDelLine, I_OnMode, I_OnLoadModule, I_OnStats, + I_OnSetAway, I_OnPostCommand, I_OnUserConnect }; - ServerInstance->Modules->Attach(eventlist, this, 27); + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); delete ServerInstance->PI; - ServerInstance->PI = new SpanningTreeProtocolInterface(this, Utils, ServerInstance); + ServerInstance->PI = new SpanningTreeProtocolInterface(this, Utils); + loopCall = false; - for (std::vector::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++) - { - ServerInstance->PI->Introduce(*i); - } + // update our local user count + Utils->TreeRoot->SetUserCount(ServerInstance->Users->local_users.size()); } void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops) @@ -94,7 +90,7 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops) 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 : Parent.c_str(), + (Utils->FlatLinks && (!IS_OPER(user))) ? ServerInstance->Config->ServerName.c_str() : Parent.c_str(), (Utils->FlatLinks && (!IS_OPER(user))) ? 0 : hops, Current->GetDesc().c_str()); } @@ -192,6 +188,12 @@ void ModuleSpanningTree::DoPingChecks(time_t curtime) { TreeServer *s = i->second; + // Fix for bug #792, do not ping servers that are not connected yet! + // Remote servers have Socket == NULL and local connected servers have + // Socket->LinkState == CONNECTED + if (s->GetSocket() && s->GetSocket()->GetLinkState() != CONNECTED) + continue; + // Now do PING checks on all servers TreeServer *mts = Utils->BestRouteTo(s->GetID()); @@ -241,18 +243,54 @@ void ModuleSpanningTree::DoPingChecks(time_t curtime) } } -void ModuleSpanningTree::ConnectServer(Link* x) +void ModuleSpanningTree::ConnectServer(Autoconnect* a, bool on_timer) +{ + if (!a) + return; + for(unsigned int j=0; j < a->servers.size(); j++) + { + if (Utils->FindServer(a->servers[j])) + { + // found something in this block. Should the server fail, + // we want to start at the start of the list, not in the + // middle where we left off + a->position = -1; + return; + } + } + if (on_timer && a->position >= 0) + return; + if (!on_timer && a->position < 0) + return; + + a->position++; + while (a->position < (int)a->servers.size()) + { + Link* x = Utils->FindLink(a->servers[a->position]); + if (x) + { + ServerInstance->SNO->WriteToSnoMask('l', "AUTOCONNECT: Auto-connecting server \002%s\002", x->Name.c_str()); + ConnectServer(x, a); + return; + } + a->position++; + } + // Autoconnect chain has been fully iterated; start at the beginning on the + // next AutoConnectServers run + a->position = -1; +} + +void ModuleSpanningTree::ConnectServer(Link* x, Autoconnect* y) { bool ipvalid = true; if (InspIRCd::Match(ServerInstance->Config->ServerName, assign(x->Name))) { - RemoteMessage(NULL, "CONNECT: Not connecting to myself."); + ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Not connecting to myself."); return; } QueryType start_type = DNS_QUERY_A; -#ifdef IPV6 start_type = DNS_QUERY_AAAA; if (strchr(x->IPAddr.c_str(),':')) { @@ -261,7 +299,6 @@ void ModuleSpanningTree::ConnectServer(Link* x) ipvalid = false; } else -#endif { in_addr n; if (inet_aton(x->IPAddr.c_str(),&n) < 1) @@ -272,19 +309,16 @@ void ModuleSpanningTree::ConnectServer(Link* x) if (ipvalid) { /* Gave a hook, but it wasnt one we know */ - if ((!x->Hook.empty()) && (Utils->hooks.find(x->Hook.c_str()) == Utils->hooks.end())) - return; - TreeSocket* newsocket = new TreeSocket(Utils, ServerInstance, x->IPAddr,x->Port, x->Timeout ? x->Timeout : 10,x->Name.c_str(), x->Bind, x->Hook.empty() ? NULL : Utils->hooks[x->Hook.c_str()]); + TreeSocket* newsocket = new TreeSocket(Utils, x->IPAddr, x->Port, x->Timeout ? x->Timeout : 10, + x->Name.c_str(), x->Bind, y, x->Hook); if (newsocket->GetFd() > -1) { /* Handled automatically on success */ } else { - RemoteMessage(NULL, "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(),strerror(errno)); - if (ServerInstance->SocketCull.find(newsocket) == ServerInstance->SocketCull.end()) - ServerInstance->SocketCull[newsocket] = newsocket; - Utils->DoFailOver(x); + ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(),strerror(errno)); + ServerInstance->GlobalCulls.AddItem(newsocket); } } else @@ -292,72 +326,50 @@ void ModuleSpanningTree::ConnectServer(Link* x) try { bool cached; - ServernameResolver* snr = new ServernameResolver((Module*)this, Utils, ServerInstance,x->IPAddr, *x, cached, start_type); + ServernameResolver* snr = new ServernameResolver(Utils, x->IPAddr, x, cached, start_type, y); ServerInstance->AddResolver(snr, cached); } catch (ModuleException& e) { - RemoteMessage(NULL, "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(), e.GetReason()); - Utils->DoFailOver(x); + ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(), e.GetReason()); + ConnectServer(y, false); } } } void ModuleSpanningTree::AutoConnectServers(time_t curtime) { - for (std::vector::iterator x = Utils->LinkBlocks.begin(); x < Utils->LinkBlocks.end(); x++) + for (std::vector >::iterator i = Utils->AutoconnectBlocks.begin(); i < Utils->AutoconnectBlocks.end(); ++i) { - if ((x->AutoConnect) && (curtime >= x->NextConnectTime)) + Autoconnect* x = *i; + if (curtime >= x->NextConnectTime) { - x->NextConnectTime = curtime + x->AutoConnect; - TreeServer* CheckDupe = Utils->FindServer(x->Name.c_str()); - if (x->FailOver.length()) - { - TreeServer* CheckFailOver = Utils->FindServer(x->FailOver.c_str()); - if (CheckFailOver) - { - /* The failover for this server is currently a member of the network. - * The failover probably succeeded, where the main link did not. - * Don't try the main link until the failover is gone again. - */ - continue; - } - } - if (!CheckDupe) - { - // an autoconnected server is not connected. Check if its time to connect it - ServerInstance->SNO->WriteToSnoMask('l',"AUTOCONNECT: Auto-connecting server \002%s\002 (%lu seconds until next attempt)",x->Name.c_str(),x->AutoConnect); - this->ConnectServer(&(*x)); - } + x->NextConnectTime = curtime + x->Period; + ConnectServer(x, true); } } } void ModuleSpanningTree::DoConnectTimeout(time_t curtime) { - std::vector failovers; - for (std::map >::iterator i = Utils->timeoutlist.begin(); i != Utils->timeoutlist.end(); i++) + std::map >::iterator i = Utils->timeoutlist.begin(); + while (i != Utils->timeoutlist.end()) { TreeSocket* s = i->first; std::pair p = i->second; + std::map >::iterator me = i; + i++; if (curtime > s->age + p.second) { ServerInstance->SNO->WriteToSnoMask('l',"CONNECT: Error connecting \002%s\002 (timeout of %d seconds)",p.first.c_str(),p.second); - ServerInstance->SE->DelFd(s); + Utils->timeoutlist.erase(me); s->Close(); - Link* MyLink = Utils->FindLink(p.first); - if (MyLink) - failovers.push_back(MyLink); + ServerInstance->GlobalCulls.AddItem(s); } } - /* Trigger failover for each timed out socket */ - for (std::vector::const_iterator n = failovers.begin(); n != failovers.end(); ++n) - { - Utils->DoFailOver(*n); - } } -int ModuleSpanningTree::HandleVersion(const std::vector& parameters, User* user) +ModResult ModuleSpanningTree::HandleVersion(const std::vector& parameters, User* user) { // we've already checked if pcnt > 0, so this is safe TreeServer* found = Utils->FindServerMask(parameters[0]); @@ -374,27 +386,13 @@ int ModuleSpanningTree::HandleVersion(const std::vector& parameters { user->WriteNumeric(402, "%s %s :No such server",user->nick.c_str(),parameters[0].c_str()); } - return 1; + return MOD_RES_DENY; } -/* This method will attempt to get a link message out to as many people as is required. - * If a user is provided, and that user is local, then the user is sent the message using - * WriteServ (they are the local initiator of that message). If the user is remote, they are - * sent that message remotely via PUSH. - * If the user is NULL, then the notice is sent locally via WriteToSnoMask with snomask 'l', - * and remotely via SNONOTICE with mask 'l'. +/* This method will attempt to get a message to a remote user. */ void ModuleSpanningTree::RemoteMessage(User* user, const char* format, ...) { - /* This could cause an infinite loop, because DoOneToMany() will, on error, - * call TreeSocket::OnError(), which in turn will call this function to - * notify everyone of the error. So, drop any messages that are generated - * during the sending of another message. -Special */ - static bool SendingRemoteMessage = false; - if (SendingRemoteMessage) - return; - SendingRemoteMessage = true; - char text[MAXBUF]; va_list argsPtr; @@ -402,50 +400,41 @@ void ModuleSpanningTree::RemoteMessage(User* user, const char* format, ...) vsnprintf(text, MAXBUF, format, argsPtr); va_end(argsPtr); - if (!user) - { - /* No user, target it generically at everyone */ - ServerInstance->SNO->WriteToSnoMask('l', "%s", text); - } + if (IS_LOCAL(user)) + user->WriteServ("NOTICE %s :%s", user->nick.c_str(), text); else - { - if (IS_LOCAL(user)) - user->WriteServ("NOTICE %s :%s", user->nick.c_str(), text); - else - ServerInstance->PI->SendUserNotice(user, text); - } - - SendingRemoteMessage = false; + ServerInstance->PI->SendUserNotice(user, text); } -int ModuleSpanningTree::HandleConnect(const std::vector& parameters, User* user) +ModResult ModuleSpanningTree::HandleConnect(const std::vector& parameters, User* user) { - for (std::vector::iterator x = Utils->LinkBlocks.begin(); x < Utils->LinkBlocks.end(); x++) + for (std::vector >::iterator i = Utils->LinkBlocks.begin(); i < Utils->LinkBlocks.end(); i++) { + Link* x = *i; if (InspIRCd::Match(x->Name.c_str(),parameters[0])) { if (InspIRCd::Match(ServerInstance->Config->ServerName, assign(x->Name))) { RemoteMessage(user, "*** CONNECT: Server \002%s\002 is ME, not connecting.",x->Name.c_str()); - return 1; + return MOD_RES_DENY; } TreeServer* CheckDupe = Utils->FindServer(x->Name.c_str()); if (!CheckDupe) { RemoteMessage(user, "*** CONNECT: Connecting to server: \002%s\002 (%s:%d)",x->Name.c_str(),(x->HiddenFromStats ? "" : x->IPAddr.c_str()),x->Port); - ConnectServer(&(*x)); - return 1; + ConnectServer(x); + return MOD_RES_DENY; } 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()); - return 1; + return MOD_RES_DENY; } } } RemoteMessage(user, "*** CONNECT: No server matching \002%s\002 could be found in the config file.",parameters[0].c_str()); - return 1; + return MOD_RES_DENY; } void ModuleSpanningTree::OnGetServerDescription(const std::string &servername,std::string &description) @@ -461,7 +450,7 @@ void ModuleSpanningTree::OnUserInvite(User* source,User* dest,Channel* channel, { if (IS_LOCAL(source)) { - std::deque params; + parameterlist params; params.push_back(dest->uuid); params.push_back(channel->name); params.push_back(ConvToStr(expiry)); @@ -469,9 +458,13 @@ void ModuleSpanningTree::OnUserInvite(User* source,User* dest,Channel* channel, } } -void ModuleSpanningTree::OnPostLocalTopicChange(User* user, Channel* chan, const std::string &topic) +void ModuleSpanningTree::OnPostTopicChange(User* user, Channel* chan, const std::string &topic) { - std::deque params; + // Drop remote events on the floor. + if (!IS_LOCAL(user)) + return; + + parameterlist params; params.push_back(chan->name); params.push_back(":"+topic); Utils->DoOneToMany(user->uuid,"TOPIC",params); @@ -481,7 +474,7 @@ void ModuleSpanningTree::OnWallops(User* user, const std::string &text) { if (IS_LOCAL(user)) { - std::deque params; + parameterlist params; params.push_back(":"+text); Utils->DoOneToMany(user->uuid,"WALLOPS",params); } @@ -498,8 +491,7 @@ void ModuleSpanningTree::OnUserNotice(User* user, void* dest, int target_type, c User* d = (User*)dest; if ((d->GetFd() < 0) && (IS_LOCAL(user))) { - std::deque params; - params.clear(); + parameterlist params; params.push_back(d->uuid); params.push_back(":"+text); Utils->DoOneToOne(user->uuid,"NOTICE",params,d->server); @@ -531,7 +523,7 @@ void ModuleSpanningTree::OnUserNotice(User* user, void* dest, int target_type, c if (IS_LOCAL(user)) { char* target = (char*)dest; - std::deque par; + parameterlist par; par.push_back(target); par.push_back(":"+text); Utils->DoOneToMany(user->uuid,"NOTICE",par); @@ -552,8 +544,7 @@ void ModuleSpanningTree::OnUserMessage(User* user, void* dest, int target_type, User* d = (User*)dest; if ((d->GetFd() < 0) && (IS_LOCAL(user))) { - std::deque params; - params.clear(); + parameterlist params; params.push_back(d->uuid); params.push_back(":"+text); Utils->DoOneToOne(user->uuid,"PRIVMSG",params,d->server); @@ -585,7 +576,7 @@ void ModuleSpanningTree::OnUserMessage(User* user, void* dest, int target_type, if (IS_LOCAL(user)) { char* target = (char*)dest; - std::deque par; + parameterlist par; par.push_back(target); par.push_back(":"+text); Utils->DoOneToMany(user->uuid,"PRIVMSG",par); @@ -600,29 +591,53 @@ void ModuleSpanningTree::OnBackgroundTimer(time_t curtime) DoConnectTimeout(curtime); } -void ModuleSpanningTree::OnUserJoin(User* user, Channel* channel, bool sync, bool &silent) +void ModuleSpanningTree::OnUserConnect(User* user) +{ + if (user->quitting) + return; + + parameterlist params; + params.push_back(user->uuid); + params.push_back(ConvToStr(user->age)); + params.push_back(user->nick); + params.push_back(user->host); + params.push_back(user->dhost); + params.push_back(user->ident); + 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)); + Utils->DoOneToMany(ServerInstance->Config->GetSID(), "UID", params); + + Utils->TreeRoot->SetUserCount(1); // increment by 1 +} + +void ModuleSpanningTree::OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts) { // Only do this for local users - if (IS_LOCAL(user)) + if (IS_LOCAL(memb->user)) { - std::deque params; + parameterlist params; // set up their permissions and the channel TS with FJOIN. // All users are FJOINed now, because a module may specify // new joining permissions for the user. - params.push_back(channel->name); - params.push_back(ConvToStr(channel->age)); - params.push_back(std::string("+") + channel->ChanModes(true)); - params.push_back(ServerInstance->Modes->ModeString(user, channel, false)+","+std::string(user->uuid)); + 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)); Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FJOIN",params); } } -int ModuleSpanningTree::OnChangeLocalUserHost(User* user, const std::string &newhost) +ModResult ModuleSpanningTree::OnChangeLocalUserHost(User* user, const std::string &newhost) { - std::deque params; + if (user->registered != REG_ALL) + return MOD_RES_PASSTHRU; + + parameterlist params; params.push_back(newhost); Utils->DoOneToMany(user->uuid,"FHOST",params); - return 0; + return MOD_RES_PASSTHRU; } void ModuleSpanningTree::OnChangeName(User* user, const std::string &gecos) @@ -630,20 +645,32 @@ void ModuleSpanningTree::OnChangeName(User* user, const std::string &gecos) // only occurs for local clients if (user->registered != REG_ALL) return; - std::deque params; + + parameterlist params; params.push_back(gecos); Utils->DoOneToMany(user->uuid,"FNAME",params); } -void ModuleSpanningTree::OnUserPart(User* user, Channel* channel, std::string &partmessage, bool &silent) +void ModuleSpanningTree::OnChangeIdent(User* user, const std::string &ident) { - if (IS_LOCAL(user)) + // only occurs for local clients + if (user->registered != REG_ALL) + return; + + parameterlist params; + params.push_back(ident); + Utils->DoOneToMany(user->uuid,"FIDENT",params); +} + +void ModuleSpanningTree::OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts) +{ + if (IS_LOCAL(memb->user)) { - std::deque params; - params.push_back(channel->name); + parameterlist params; + params.push_back(memb->chan->name); if (!partmessage.empty()) params.push_back(":"+partmessage); - Utils->DoOneToMany(user->uuid,"PART",params); + Utils->DoOneToMany(memb->user->uuid,"PART",params); } } @@ -651,7 +678,7 @@ void ModuleSpanningTree::OnUserQuit(User* user, const std::string &reason, const { if ((IS_LOCAL(user)) && (user->registered == REG_ALL)) { - std::deque params; + parameterlist params; if (oper_message != reason) { @@ -675,7 +702,7 @@ void ModuleSpanningTree::OnUserPostNick(User* user, const std::string &oldnick) { if (IS_LOCAL(user)) { - std::deque params; + parameterlist params; params.push_back(user->nick); /** IMPORTANT: We don't update the TS if the oldnick is just a case change of the newnick! @@ -686,58 +713,93 @@ void ModuleSpanningTree::OnUserPostNick(User* user, const std::string &oldnick) params.push_back(ConvToStr(user->age)); Utils->DoOneToMany(user->uuid,"NICK",params); } + else if (!loopCall && user->nick == user->uuid) + { + parameterlist params; + params.push_back(user->uuid); + params.push_back(ConvToStr(user->age)); + Utils->DoOneToMany(ServerInstance->Config->GetSID(),"SAVE",params); + } } -void ModuleSpanningTree::OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent) +void ModuleSpanningTree::OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) { - if ((source) && (IS_LOCAL(source))) + parameterlist params; + params.push_back(memb->chan->name); + params.push_back(memb->user->uuid); + params.push_back(":"+reason); + if (IS_LOCAL(source)) { - std::deque params; - params.push_back(chan->name); - params.push_back(user->uuid); - params.push_back(":"+reason); Utils->DoOneToMany(source->uuid,"KICK",params); } - else if (!source) + else if (IS_SERVER(source) && source != Utils->ServerUser) { - std::deque params; - params.push_back(chan->name); - params.push_back(user->uuid); - params.push_back(":"+reason); Utils->DoOneToMany(ServerInstance->Config->GetSID(),"KICK",params); } } void ModuleSpanningTree::OnRemoteKill(User* source, User* dest, const std::string &reason, const std::string &operreason) { - if (!IS_LOCAL(source)) return; // Only start routing if we're origin. - std::deque params; - params.push_back(":"+reason); + if (!IS_LOCAL(source)) + return; // Only start routing if we're origin. + + ServerInstance->OperQuit.set(dest, operreason); + parameterlist params; + params.push_back(":"+operreason); Utils->DoOneToMany(dest->uuid,"OPERQUIT",params); params.clear(); params.push_back(dest->uuid); params.push_back(":"+reason); - dest->SetOperQuit(operreason); Utils->DoOneToMany(source->uuid,"KILL",params); } -void ModuleSpanningTree::OnRehash(User* user, const std::string ¶meter) +void ModuleSpanningTree::OnPreRehash(User* user, const std::string ¶meter) { ServerInstance->Logs->Log("remoterehash", DEBUG, "called with param %s", parameter.c_str()); // Send out to other servers if (!parameter.empty() && parameter[0] != '-') { - ServerInstance->Logs->Log("remoterehash", DEBUG, "sending out lol"); - std::deque params; + parameterlist params; params.push_back(parameter); Utils->DoOneToAllButSender(user ? user->uuid : ServerInstance->Config->GetSID(), "REHASH", params, user ? user->server : ServerInstance->Config->ServerName); } +} +void ModuleSpanningTree::OnRehash(User* user) +{ // Re-read config stuff Utils->ReadConfiguration(true); } +void ModuleSpanningTree::OnLoadModule(Module* mod) +{ + this->RedoConfig(mod); +} + +void ModuleSpanningTree::OnUnloadModule(Module* mod) +{ + this->RedoConfig(mod); +} + +void ModuleSpanningTree::RedoConfig(Module* mod) +{ + /* If m_sha256.so is loaded (we use this for HMAC) or any module implementing a BufferedSocket interface is loaded, + * then we need to re-read our config again taking this into account. + */ + modulelist* ml = ServerInstance->Modules->FindInterface("BufferedSocketHook"); + bool IsBufferSocketModule = false; + + /* Did we find any modules? */ + if (ml && std::find(ml->begin(), ml->end(), mod) != ml->end()) + IsBufferSocketModule = true; + + if (mod->ModuleSourceFile == "m_sha256.so" || IsBufferSocketModule) + { + Utils->ReadConfiguration(true); + } +} + // note: the protocol does not allow direct umode +o except // via NICK with 8 params. sending OPERTYPE infers +o modechange // locally. @@ -745,7 +807,7 @@ void ModuleSpanningTree::OnOper(User* user, const std::string &opertype) { if (IS_LOCAL(user)) { - std::deque params; + parameterlist params; params.push_back(opertype); Utils->DoOneToMany(user->uuid,"OPERTYPE",params); } @@ -753,13 +815,13 @@ void ModuleSpanningTree::OnOper(User* user, const std::string &opertype) void ModuleSpanningTree::OnAddLine(User* user, XLine *x) { - if (!x->IsBurstable()) + 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, (unsigned long)x->set_time, (unsigned long)x->duration, x->reason); - std::deque params; + ServerInstance->Config->ServerName.c_str(), (unsigned long)x->set_time, (unsigned long)x->duration, x->reason.c_str()); + parameterlist params; params.push_back(data); if (!user) @@ -781,7 +843,7 @@ void ModuleSpanningTree::OnDelLine(User* user, XLine *x) char data[MAXBUF]; snprintf(data,MAXBUF,"%s %s", x->type.c_str(), x->Displayable()); - std::deque params; + parameterlist params; params.push_back(data); if (!user) @@ -796,15 +858,15 @@ void ModuleSpanningTree::OnDelLine(User* user, XLine *x) } } -void ModuleSpanningTree::OnMode(User* user, void* dest, int target_type, const std::string &text) +void ModuleSpanningTree::OnMode(User* user, void* dest, int target_type, const parameterlist &text, const std::vector &translate) { if ((IS_LOCAL(user)) && (user->registered == REG_ALL)) { - std::deque params; + parameterlist params; std::string command; std::string output_text; - ServerInstance->Parser->TranslateUIDs(TR_SPACENICKLIST, text, output_text); + ServerInstance->Parser->TranslateUIDs(translate, text, output_text); if (target_type == TYPE_USER) { @@ -826,40 +888,40 @@ void ModuleSpanningTree::OnMode(User* user, void* dest, int target_type, const s } } -int ModuleSpanningTree::OnSetAway(User* user, const std::string &awaymsg) +ModResult ModuleSpanningTree::OnSetAway(User* user, const std::string &awaymsg) { if (IS_LOCAL(user)) { if (awaymsg.empty()) { - std::deque params; - params.clear(); + parameterlist params; Utils->DoOneToMany(user->uuid,"AWAY",params); } else { - std::deque params; + parameterlist params; + params.push_back(ConvToStr(user->awaytime)); params.push_back(":" + awaymsg); Utils->DoOneToMany(user->uuid,"AWAY",params); } } - return 0; + return MOD_RES_PASSTHRU; } -void ModuleSpanningTree::ProtoSendMode(void* opaque, TargetTypeFlags target_type, void* target, const std::string &modeline) +void ModuleSpanningTree::ProtoSendMode(void* opaque, TargetTypeFlags target_type, void* target, const parameterlist &modeline, const std::vector &translate) { TreeSocket* s = (TreeSocket*)opaque; std::string output_text; - ServerInstance->Parser->TranslateUIDs(TR_SPACENICKLIST, modeline, output_text); + ServerInstance->Parser->TranslateUIDs(translate, modeline, output_text); if (target) { if (target_type == TYPE_USER) { User* u = (User*)target; - s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" FMODE "+u->uuid+" "+ConvToStr(u->age)+" "+output_text); + s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" MODE "+u->uuid+" "+output_text); } else if (target_type == TYPE_CHANNEL) { @@ -869,53 +931,42 @@ void ModuleSpanningTree::ProtoSendMode(void* opaque, TargetTypeFlags target_type } } -void ModuleSpanningTree::ProtoSendMetaData(void* opaque, TargetTypeFlags target_type, void* target, const std::string &extname, const std::string &extdata) +void ModuleSpanningTree::ProtoSendMetaData(void* opaque, Extensible* target, const std::string &extname, const std::string &extdata) { - TreeSocket* s = (TreeSocket*)opaque; - if (target) - { - if (target_type == TYPE_USER) - { - User* u = (User*)target; - s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA "+u->uuid+" "+extname+" :"+extdata); - } - else if (target_type == TYPE_CHANNEL) - { - Channel* c = (Channel*)target; - s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA "+c->name+" "+extname+" :"+extdata); - } - } - if (target_type == TYPE_OTHER) - { + TreeSocket* s = static_cast(opaque); + User* u = dynamic_cast(target); + Channel* c = dynamic_cast(target); + if (u) + s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA "+u->uuid+" "+extname+" :"+extdata); + else if (c) + s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA "+c->name+" "+extname+" :"+extdata); + else if (!target) s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA * "+extname+" :"+extdata); - } } -void ModuleSpanningTree::OnEvent(Event* event) +CullResult ModuleSpanningTree::cull() { - if ((event->GetEventID() == "send_encap") || (event->GetEventID() == "send_metadata") || (event->GetEventID() == "send_topic") || (event->GetEventID() == "send_mode") || (event->GetEventID() == "send_mode_explicit") || (event->GetEventID() == "send_opers") - || (event->GetEventID() == "send_modeset") || (event->GetEventID() == "send_snoset") || (event->GetEventID() == "send_push")) - { - ServerInstance->Logs->Log("m_spanningtree", DEBUG, "WARNING: Deprecated use of old 1.1 style m_spanningtree event ignored, type '"+event->GetEventID()+"'!"); - } + Utils->cull(); + ServerInstance->Timers->DelTimer(RefreshTimer); + ServerInstance->Modules->DoneWithInterface("BufferedSocketHook"); + return this->Module::cull(); } ModuleSpanningTree::~ModuleSpanningTree() { delete ServerInstance->PI; - ServerInstance->PI = new ProtocolInterface(ServerInstance); + ServerInstance->PI = new ProtocolInterface; /* This will also free the listeners */ delete Utils; - ServerInstance->Timers->DelTimer(RefreshTimer); - - ServerInstance->Modules->DoneWithInterface("BufferedSocketHook"); + delete command_rconnect; + delete command_rsquit; } Version ModuleSpanningTree::GetVersion() { - return Version("$Id$", VF_VENDOR, API_VERSION); + return Version("Allows servers to be linked", VF_VENDOR); } /* It is IMPORTANT that m_spanningtree is the last module in the chain @@ -927,7 +978,7 @@ Version ModuleSpanningTree::GetVersion() */ void ModuleSpanningTree::Prioritize() { - ServerInstance->Modules->SetPriority(this, PRIO_LAST); + ServerInstance->Modules->SetPriority(this, PRIORITY_LAST); } MODULE_INIT(ModuleSpanningTree)