X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmain.cpp;h=b38929ad00b2b6a935aa5f80c36964cf7c0fdf0e;hb=828f256a9bd8278540bf4beede36c485e2c3e86f;hp=0cfa53a14552e5255ab7a6688496bf172f1f8e51;hpb=6c8a6700b898067a63b5044f5d21f7e67964a915;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index 0cfa53a14..b38929ad0 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. @@ -17,11 +17,10 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" -#include "wildcard.h" #include "xline.h" #include "transport.h" -#include "m_spanningtree/timesynctimer.h" +#include "m_spanningtree/cachetimer.h" #include "m_spanningtree/resolvers.h" #include "m_spanningtree/main.h" #include "m_spanningtree/utils.h" @@ -32,16 +31,16 @@ #include "m_spanningtree/rsquit.h" #include "m_spanningtree/protocolinterface.h" -/* $ModDep: m_spanningtree/timesynctimer.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 */ +/* $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) { ServerInstance->Modules->UseInterface("BufferedSocketHook"); Utils = new SpanningTreeUtilities(ServerInstance, this); - command_rconnect = new cmd_rconnect(ServerInstance, this, Utils); + command_rconnect = new CommandRConnect(ServerInstance, this, Utils); ServerInstance->AddCommand(command_rconnect); - command_rsquit = new cmd_rsquit(ServerInstance, this, Utils); + command_rsquit = new CommandRSQuit(ServerInstance, this, Utils); ServerInstance->AddCommand(command_rsquit); RefreshTimer = new CacheRefreshTimer(ServerInstance, Utils); ServerInstance->Timers->AddTimer(RefreshTimer); @@ -50,19 +49,20 @@ ModuleSpanningTree::ModuleSpanningTree(InspIRCd* Me) { I_OnPreCommand, I_OnGetServerDescription, I_OnUserInvite, I_OnPostLocalTopicChange, I_OnWallops, I_OnUserNotice, I_OnUserMessage, I_OnBackgroundTimer, - I_OnUserJoin, I_OnChangeHost, I_OnChangeName, I_OnUserPart, I_OnPostConnect, + I_OnUserJoin, I_OnChangeLocalUserHost, I_OnChangeName, I_OnUserPart, I_OnUnloadModule, I_OnUserQuit, I_OnUserPostNick, I_OnUserKick, I_OnRemoteKill, I_OnRehash, - I_OnOper, I_OnAddLine, I_OnDelLine, I_ProtoSendMode, I_OnMode, + I_OnOper, I_OnAddLine, I_OnDelLine, I_ProtoSendMode, I_OnMode, I_OnLoadModule, I_OnStats, I_ProtoSendMetaData, I_OnEvent, I_OnSetAway, I_OnPostCommand }; - ServerInstance->Modules->Attach(eventlist, this, 28); + ServerInstance->Modules->Attach(eventlist, this, 29); delete ServerInstance->PI; ServerInstance->PI = new SpanningTreeProtocolInterface(this, Utils, ServerInstance); + loopCall = false; for (std::vector::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++) { - this->OnPostConnect((*i)); + ServerInstance->PI->Introduce(*i); } } @@ -77,7 +77,7 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops) { if ((Current->GetChild(q)->Hidden) || ((Utils->HideULines) && (ServerInstance->ULine(Current->GetChild(q)->GetName().c_str())))) { - if (*user->oper) + if (IS_OPER(user)) { ShowLinks(Current->GetChild(q),user,hops+1); } @@ -94,7 +94,7 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops) else if ((Current->Hidden) && (!IS_OPER(user))) return; - user->WriteNumeric(364, "%s %s %s :%d %s", user->nick,Current->GetName().c_str(), + 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))) ? 0 : hops, Current->GetDesc().c_str()); @@ -110,14 +110,14 @@ int ModuleSpanningTree::CountServs() return Utils->serverlist.size(); } -void ModuleSpanningTree::HandleLinks(const char* const* parameters, int pcnt, User* user) +void ModuleSpanningTree::HandleLinks(const std::vector& parameters, User* user) { ShowLinks(Utils->TreeRoot,user,0); - user->WriteNumeric(365, "%s * :End of /LINKS list.",user->nick); + user->WriteNumeric(365, "%s * :End of /LINKS list.",user->nick.c_str()); return; } -void ModuleSpanningTree::HandleLusers(const char* const* parameters, int pcnt, User* user) +void ModuleSpanningTree::HandleLusers(const std::vector& parameters, User* user) { unsigned int n_users = ServerInstance->Users->UserCount(); @@ -133,7 +133,7 @@ void ModuleSpanningTree::HandleLusers(const char* const* parameters, int pcnt, U /* If ulined are hidden and we're not an oper, count the number of ulined servers hidden, * locally and globally (locally means directly connected to us) */ - if ((Utils->HideULines) && (!*user->oper)) + if ((Utils->HideULines) && (!IS_OPER(user))) { for (server_hash::iterator q = Utils->serverlist.begin(); q != Utils->serverlist.end(); q++) { @@ -145,23 +145,23 @@ void ModuleSpanningTree::HandleLusers(const char* const* parameters, int pcnt, U } } } - user->WriteNumeric(251, "%s :There are %d users and %d invisible on %d servers",user->nick, + user->WriteNumeric(251, "%s :There are %d users and %d invisible on %d servers",user->nick.c_str(), n_users-ServerInstance->Users->ModeCount('i'), ServerInstance->Users->ModeCount('i'), ulined_count ? this->CountServs() - ulined_count : this->CountServs()); if (ServerInstance->Users->OperCount()) - user->WriteNumeric(252, "%s %d :operator(s) online",user->nick,ServerInstance->Users->OperCount()); + user->WriteNumeric(252, "%s %d :operator(s) online",user->nick.c_str(),ServerInstance->Users->OperCount()); if (ServerInstance->Users->UnregisteredUserCount()) - user->WriteNumeric(253, "%s %d :unknown connections",user->nick,ServerInstance->Users->UnregisteredUserCount()); - + user->WriteNumeric(253, "%s %d :unknown connections",user->nick.c_str(),ServerInstance->Users->UnregisteredUserCount()); + if (ServerInstance->ChannelCount()) - user->WriteNumeric(254, "%s %ld :channels formed",user->nick,ServerInstance->ChannelCount()); - - user->WriteNumeric(255, "%s :I have %d clients and %d servers",user->nick,ServerInstance->Users->LocalUserCount(),ulined_local_count ? this->CountLocalServs() - ulined_local_count : this->CountLocalServs()); - user->WriteNumeric(265, "%s :Current Local Users: %d Max: %d",user->nick,ServerInstance->Users->LocalUserCount(),max_local); - user->WriteNumeric(266, "%s :Current Global Users: %d Max: %d",user->nick,n_users,max_global); + user->WriteNumeric(254, "%s %ld :channels formed",user->nick.c_str(),ServerInstance->ChannelCount()); + + user->WriteNumeric(255, "%s :I have %d clients and %d servers",user->nick.c_str(),ServerInstance->Users->LocalUserCount(),ulined_local_count ? this->CountLocalServs() - ulined_local_count : this->CountLocalServs()); + user->WriteNumeric(265, "%s :Current Local Users: %d Max: %d",user->nick.c_str(),ServerInstance->Users->LocalUserCount(),max_local); + user->WriteNumeric(266, "%s :Current Global Users: %d Max: %d",user->nick.c_str(),n_users,max_global); return; } @@ -193,15 +193,11 @@ void ModuleSpanningTree::DoPingChecks(time_t curtime) { TreeServer *s = i->second; - if (s->bursting) - { - unsigned long bursttime = ts - s->StartBurst; - if (bursttime > 60000) // A minute - { - ServerInstance->SNO->WriteToSnoMask('l',"Server \002%s\002 has not finished burst, forcing end of burst.", s->GetName().c_str()); - s->FinishBurst(); - } - } + // 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()); @@ -221,7 +217,7 @@ void ModuleSpanningTree::DoPingChecks(time_t curtime) // ... if we can find a proper route to them if (tsock) { - tsock->WriteLine(std::string(":") + ServerInstance->Config->GetSID() + " PING " + + tsock->WriteLine(std::string(":") + ServerInstance->Config->GetSID() + " PING " + ServerInstance->Config->GetSID() + " " + s->GetID()); s->LastPingMsec = ts; } @@ -255,6 +251,13 @@ void ModuleSpanningTree::DoPingChecks(time_t curtime) void ModuleSpanningTree::ConnectServer(Link* x) { bool ipvalid = true; + + if (InspIRCd::Match(ServerInstance->Config->ServerName, assign(x->Name))) + { + this->ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Not connecting to myself."); + return; + } + QueryType start_type = DNS_QUERY_A; #ifdef IPV6 start_type = DNS_QUERY_AAAA; @@ -278,14 +281,14 @@ void ModuleSpanningTree::ConnectServer(Link* x) /* 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,false,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, 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()]); if (newsocket->GetFd() > -1) { /* Handled automatically on success */ } else { - RemoteMessage(NULL, "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(),strerror(errno)); + this->ServerInstance->SNO->WriteToSnoMask('l', "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); @@ -301,7 +304,7 @@ void ModuleSpanningTree::ConnectServer(Link* x) } catch (ModuleException& e) { - RemoteMessage(NULL, "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(), e.GetReason()); + this->ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(), e.GetReason()); Utils->DoFailOver(x); } } @@ -337,14 +340,38 @@ void ModuleSpanningTree::AutoConnectServers(time_t curtime) } } -int ModuleSpanningTree::HandleVersion(const char* const* parameters, int pcnt, User* user) +void ModuleSpanningTree::DoConnectTimeout(time_t curtime) +{ + std::vector failovers; + for (std::map >::iterator i = Utils->timeoutlist.begin(); i != Utils->timeoutlist.end(); i++) + { + TreeSocket* s = i->first; + std::pair p = i->second; + 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); + s->Close(); + Link* MyLink = Utils->FindLink(p.first); + if (MyLink) + failovers.push_back(MyLink); + } + } + /* 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) { // we've already checked if pcnt > 0, so this is safe TreeServer* found = Utils->FindServerMask(parameters[0]); if (found) { std::string Version = found->GetVersion(); - user->WriteNumeric(351, "%s :%s",user->nick,Version.c_str()); + user->WriteNumeric(351, "%s :%s",user->nick.c_str(),Version.c_str()); if (found == Utils->TreeRoot) { ServerInstance->Config->Send005(user); @@ -352,32 +379,15 @@ int ModuleSpanningTree::HandleVersion(const char* const* parameters, int pcnt, U } else { - user->WriteNumeric(402, "%s %s :No such server",user->nick,parameters[0]); + user->WriteNumeric(402, "%s %s :No such server",user->nick.c_str(),parameters[0].c_str()); } return 1; } -/* 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'. - * - * XXX: this should be migrated to use the protocol interface code, most likely. -- w00t +/* 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; - - std::deque params; char text[MAXBUF]; va_list argsPtr; @@ -385,36 +395,24 @@ 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); - params.push_back("l"); - params.push_back(std::string(":") + text); - Utils->DoOneToMany(ServerInstance->Config->GetSID(), "SNONOTICE", params); - } + 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, text); - else - { - params.push_back(user->uuid); - params.push_back(std::string("::") + ServerInstance->Config->ServerName + " NOTICE " + user->nick + " :*** From " + - ServerInstance->Config->ServerName+ ": " + text); - Utils->DoOneToMany(ServerInstance->Config->GetSID(), "PUSH", params); - } - } - - SendingRemoteMessage = false; + ServerInstance->PI->SendUserNotice(user, text); } - -int ModuleSpanningTree::HandleConnect(const char* const* parameters, int pcnt, User* user) + +int ModuleSpanningTree::HandleConnect(const std::vector& parameters, User* user) { for (std::vector::iterator x = Utils->LinkBlocks.begin(); x < Utils->LinkBlocks.end(); x++) { - if (ServerInstance->MatchText(x->Name.c_str(),parameters[0])) + 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; + } + TreeServer* CheckDupe = Utils->FindServer(x->Name.c_str()); if (!CheckDupe) { @@ -429,7 +427,7 @@ int ModuleSpanningTree::HandleConnect(const char* const* parameters, int pcnt, U } } } - RemoteMessage(user, "*** CONNECT: No server matching \002%s\002 could be found in the config file.",parameters[0]); + RemoteMessage(user, "*** CONNECT: No server matching \002%s\002 could be found in the config file.",parameters[0].c_str()); return 1; } @@ -582,6 +580,7 @@ void ModuleSpanningTree::OnBackgroundTimer(time_t curtime) { AutoConnectServers(curtime); DoPingChecks(curtime); + DoConnectTimeout(curtime); } void ModuleSpanningTree::OnUserJoin(User* user, Channel* channel, bool sync, bool &silent) @@ -589,36 +588,27 @@ void ModuleSpanningTree::OnUserJoin(User* user, Channel* channel, bool sync, boo // Only do this for local users if (IS_LOCAL(user)) { - if (channel->GetUserCounter() == 1) - { - std::deque 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)); - Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FJOIN",params); - } - else - { - std::deque params; - params.push_back(channel->name); - params.push_back(ConvToStr(channel->age)); - Utils->DoOneToMany(user->uuid,"JOIN",params); - } + std::deque 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)); + Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FJOIN",params); } } -void ModuleSpanningTree::OnChangeHost(User* user, const std::string &newhost) +int ModuleSpanningTree::OnChangeLocalUserHost(User* user, const std::string &newhost) { - // only occurs for local clients if (user->registered != REG_ALL) - return; + return 0; + std::deque params; params.push_back(newhost); Utils->DoOneToMany(user->uuid,"FHOST",params); + return 0; } void ModuleSpanningTree::OnChangeName(User* user, const std::string &gecos) @@ -626,12 +616,13 @@ void ModuleSpanningTree::OnChangeName(User* user, const std::string &gecos) // only occurs for local clients if (user->registered != REG_ALL) return; + std::deque params; params.push_back(gecos); Utils->DoOneToMany(user->uuid,"FNAME",params); } -void ModuleSpanningTree::OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent) +void ModuleSpanningTree::OnUserPart(User* user, Channel* channel, std::string &partmessage, bool &silent) { if (IS_LOCAL(user)) { @@ -643,31 +634,6 @@ void ModuleSpanningTree::OnUserPart(User* user, Channel* channel, const std::str } } -void ModuleSpanningTree::OnPostConnect(User* user) -{ - if (IS_LOCAL(user)) - { - std::deque 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("+"+std::string(user->FormatModes())); - params.push_back(user->GetIPString()); - params.push_back(ConvToStr(user->signon)); - params.push_back(":"+std::string(user->fullname)); - Utils->DoOneToMany(ServerInstance->Config->GetSID(), "UID", params); - } - - TreeServer* SourceServer = Utils->FindServer(user->server); - if (SourceServer) - { - SourceServer->SetUserCount(1); // increment by 1 - } -} - void ModuleSpanningTree::OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) { if ((IS_LOCAL(user)) && (user->registered == REG_ALL)) @@ -701,7 +667,7 @@ void ModuleSpanningTree::OnUserPostNick(User* user, const std::string &oldnick) /** IMPORTANT: We don't update the TS if the oldnick is just a case change of the newnick! */ - if (irc::string(user->nick) != assign(oldnick)) + if (irc::string(user->nick.c_str()) != assign(oldnick)) user->age = ServerInstance->Time(); params.push_back(ConvToStr(user->age)); @@ -711,6 +677,8 @@ void ModuleSpanningTree::OnUserPostNick(User* user, const std::string &oldnick) void ModuleSpanningTree::OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent) { + if (loopCall) + return; if ((source) && (IS_LOCAL(source))) { std::deque params; @@ -731,6 +699,9 @@ void ModuleSpanningTree::OnUserKick(User* source, User* user, Channel* chan, con 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); Utils->DoOneToMany(dest->uuid,"OPERQUIT",params); @@ -751,13 +722,41 @@ void ModuleSpanningTree::OnRehash(User* user, const std::string ¶meter) ServerInstance->Logs->Log("remoterehash", DEBUG, "sending out lol"); std::deque params; params.push_back(parameter); - Utils->DoOneToAllButSender(user ? user->uuid : ServerInstance->Config->GetSID(), "REHASH", params, user ? user->server : ServerInstance->Config->GetSID()); /// Can this take SID? + Utils->DoOneToAllButSender(user ? user->uuid : ServerInstance->Config->GetSID(), "REHASH", params, user ? user->server : ServerInstance->Config->ServerName); } // Re-read config stuff Utils->ReadConfiguration(true); } +void ModuleSpanningTree::OnLoadModule(Module* mod, const std::string &name) +{ + this->RedoConfig(mod, name); +} + +void ModuleSpanningTree::OnUnloadModule(Module* mod, const std::string &name) +{ + this->RedoConfig(mod, name); +} + +void ModuleSpanningTree::RedoConfig(Module* mod, const std::string &name) +{ + /* 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 (name == "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. @@ -773,11 +772,11 @@ 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(), + 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; params.push_back(data); @@ -816,7 +815,7 @@ 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 std::deque &text, const std::deque &translate) { if ((IS_LOCAL(user)) && (user->registered == REG_ALL)) { @@ -824,7 +823,7 @@ void ModuleSpanningTree::OnMode(User* user, void* dest, int target_type, const s 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) { @@ -867,21 +866,21 @@ int ModuleSpanningTree::OnSetAway(User* user, const std::string &awaymsg) return 0; } -void ModuleSpanningTree::ProtoSendMode(void* opaque, int target_type, void* target, const std::string &modeline) +void ModuleSpanningTree::ProtoSendMode(void* opaque, TargetTypeFlags target_type, void* target, const std::deque &modeline, const std::deque &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 + 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); @@ -889,7 +888,7 @@ void ModuleSpanningTree::ProtoSendMode(void* opaque, int target_type, void* targ } } -void ModuleSpanningTree::ProtoSendMetaData(void* opaque, int target_type, void* target, const std::string &extname, const std::string &extdata) +void ModuleSpanningTree::ProtoSendMetaData(void* opaque, TargetTypeFlags target_type, void* target, const std::string &extname, const std::string &extdata) { TreeSocket* s = (TreeSocket*)opaque; if (target) @@ -922,10 +921,10 @@ void ModuleSpanningTree::OnEvent(Event* event) ModuleSpanningTree::~ModuleSpanningTree() { - /* This will also free the listeners */ delete ServerInstance->PI; ServerInstance->PI = new ProtocolInterface(ServerInstance); + /* This will also free the listeners */ delete Utils; ServerInstance->Timers->DelTimer(RefreshTimer); @@ -935,7 +934,7 @@ ModuleSpanningTree::~ModuleSpanningTree() Version ModuleSpanningTree::GetVersion() { - return Version(1,2,0,2,VF_VENDOR,API_VERSION); + return Version("$Id$", VF_VENDOR, API_VERSION); } /* It is IMPORTANT that m_spanningtree is the last module in the chain @@ -947,7 +946,7 @@ Version ModuleSpanningTree::GetVersion() */ void ModuleSpanningTree::Prioritize() { - ServerInstance->Modules->SetPriority(this, PRIO_LAST); + ServerInstance->Modules->SetPriority(this, PRIORITY_LAST); } MODULE_INIT(ModuleSpanningTree)