X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmain.cpp;h=b91d76836edaef9ebabb006ecb800f9681dcdcd1;hb=ada434820d2d81d8e4bcf633ebcbfef20606b51c;hp=6a629b803513e4341377d365326cbd0dd82e5791;hpb=9b78e250567982e23116537d94d7c17b16c5de82;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index 6a629b803..b91d76836 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -30,26 +30,19 @@ #include "m_spanningtree/treesocket.h" #include "m_spanningtree/rconnect.h" #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 */ +/* $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 */ ModuleSpanningTree::ModuleSpanningTree(InspIRCd* Me) : Module(Me), max_local(0), max_global(0) { ServerInstance->Modules->UseInterface("BufferedSocketHook"); - Utils = new SpanningTreeUtilities(Me, this); + Utils = new SpanningTreeUtilities(ServerInstance, this); command_rconnect = new cmd_rconnect(ServerInstance, this, Utils); ServerInstance->AddCommand(command_rconnect); command_rsquit = new cmd_rsquit(ServerInstance, this, Utils); ServerInstance->AddCommand(command_rsquit); - if (Utils->EnableTimeSync) - { - SyncTimer = new TimeSyncTimer(ServerInstance, this); - ServerInstance->Timers->AddTimer(SyncTimer); - } - else - SyncTimer = NULL; - RefreshTimer = new CacheRefreshTimer(ServerInstance, Utils); ServerInstance->Timers->AddTimer(RefreshTimer); @@ -57,12 +50,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_OnUserConnect, + I_OnUserJoin, I_OnChangeHost, 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_OnCancelAway, I_OnPostCommand + I_OnStats, I_ProtoSendMetaData, I_OnEvent, I_OnSetAway, I_OnPostCommand }; - ServerInstance->Modules->Attach(eventlist, this, 29); + ServerInstance->Modules->Attach(eventlist, this, 27); + + delete ServerInstance->PI; + ServerInstance->PI = new SpanningTreeProtocolInterface(this, Utils, ServerInstance); + + for (std::vector::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++) + { + ServerInstance->PI->Introduce(*i); + } } void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops) @@ -76,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); } @@ -93,7 +94,7 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops) else if ((Current->Hidden) && (!IS_OPER(user))) return; - user->WriteServ("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()); @@ -109,20 +110,20 @@ int ModuleSpanningTree::CountServs() return Utils->serverlist.size(); } -void ModuleSpanningTree::HandleLinks(const char** parameters, int pcnt, User* user) +void ModuleSpanningTree::HandleLinks(const std::vector& parameters, User* user) { ShowLinks(Utils->TreeRoot,user,0); - user->WriteServ("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** parameters, int pcnt, User* user) +void ModuleSpanningTree::HandleLusers(const std::vector& parameters, User* user) { - unsigned int n_users = ServerInstance->UserCount(); + unsigned int n_users = ServerInstance->Users->UserCount(); /* Only update these when someone wants to see them, more efficient */ - if ((unsigned int)ServerInstance->LocalUserCount() > max_local) - max_local = ServerInstance->LocalUserCount(); + if ((unsigned int)ServerInstance->Users->LocalUserCount() > max_local) + max_local = ServerInstance->Users->LocalUserCount(); if (n_users > max_global) max_global = n_users; @@ -132,7 +133,7 @@ void ModuleSpanningTree::HandleLusers(const char** parameters, int pcnt, User* 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++) { @@ -144,23 +145,23 @@ void ModuleSpanningTree::HandleLusers(const char** parameters, int pcnt, User* u } } } - user->WriteServ("251 %s :There are %d users and %d invisible on %d servers",user->nick, - n_users-ServerInstance->ModeCount('i'), - ServerInstance->ModeCount('i'), + 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->OperCount()) - user->WriteServ("252 %s %d :operator(s) online",user->nick,ServerInstance->OperCount()); + if (ServerInstance->Users->OperCount()) + user->WriteNumeric(252, "%s %d :operator(s) online",user->nick.c_str(),ServerInstance->Users->OperCount()); - if (ServerInstance->UnregisteredUserCount()) - user->WriteServ("253 %s %d :unknown connections",user->nick,ServerInstance->UnregisteredUserCount()); + if (ServerInstance->Users->UnregisteredUserCount()) + user->WriteNumeric(253, "%s %d :unknown connections",user->nick.c_str(),ServerInstance->Users->UnregisteredUserCount()); if (ServerInstance->ChannelCount()) - user->WriteServ("254 %s %d :channels formed",user->nick,ServerInstance->ChannelCount()); + user->WriteNumeric(254, "%s %ld :channels formed",user->nick.c_str(),ServerInstance->ChannelCount()); - user->WriteServ("255 %s :I have %d clients and %d servers",user->nick,ServerInstance->LocalUserCount(),ulined_local_count ? this->CountLocalServs() - ulined_local_count : this->CountLocalServs()); - user->WriteServ("265 %s :Current Local Users: %d Max: %d",user->nick,ServerInstance->LocalUserCount(),max_local); - user->WriteServ("266 %s :Current Global Users: %d Max: %d",user->nick,n_users,max_global); + 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; } @@ -180,49 +181,75 @@ std::string ModuleSpanningTree::TimeToStr(time_t secs) void ModuleSpanningTree::DoPingChecks(time_t curtime) { - for (unsigned int j = 0; j < Utils->TreeRoot->ChildCount(); j++) + /* + * Cancel remote burst mode on any servers which still have it enabled due to latency/lack of data. + * This prevents lost REMOTECONNECT notices + */ + timeval t; + gettimeofday(&t, NULL); + long ts = (t.tv_sec * 1000) + (t.tv_usec / 1000); + + for (server_hash::iterator i = Utils->serverlist.begin(); i != Utils->serverlist.end(); i++) { - TreeServer* serv = Utils->TreeRoot->GetChild(j); - TreeSocket* sock = serv->GetSocket(); - if (sock) + 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(); + } + } + + // Now do PING checks on all servers + TreeServer *mts = Utils->BestRouteTo(s->GetID()); + + if (mts) { - if (curtime >= serv->NextPingTime()) + // Only ping if this server needs one + if (curtime >= s->NextPingTime()) { - if (serv->AnsweredLastPing()) + // And if they answered the last + if (s->AnsweredLastPing()) { - sock->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" PING "+serv->GetID()); - serv->SetNextPingTime(curtime + Utils->PingFreq); - serv->LastPing = curtime; - timeval t; - gettimeofday(&t, NULL); - long ts = (t.tv_sec * 1000) + (t.tv_usec / 1000); - serv->LastPingMsec = ts; - serv->Warned = false; + // They did, send a ping to them + s->SetNextPingTime(curtime + Utils->PingFreq); + TreeSocket *tsock = mts->GetSocket(); + + // ... if we can find a proper route to them + if (tsock) + { + tsock->WriteLine(std::string(":") + ServerInstance->Config->GetSID() + " PING " + + ServerInstance->Config->GetSID() + " " + s->GetID()); + s->LastPingMsec = ts; + } } else { - /* they didnt answer, boot them */ - sock->SendError("Ping timeout"); - sock->Squit(serv,"Ping timeout"); - ServerInstance->SE->DelFd(sock); - sock->Close(); - return; + // They didn't answer the last ping, if they are locally connected, get rid of them. + TreeSocket *sock = s->GetSocket(); + if (sock) + { + sock->SendError("Ping timeout"); + sock->Squit(s,"Ping timeout"); + ServerInstance->SE->DelFd(sock); + sock->Close(); + return; + } } } - else if ((Utils->PingWarnTime) && (!serv->Warned) && (curtime >= serv->NextPingTime() - (Utils->PingFreq - Utils->PingWarnTime)) && (!serv->AnsweredLastPing())) + + // If warn on ping enabled and not warned and the difference is sufficient and they didn't answer the last ping... + 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.", serv->GetName().c_str(), Utils->PingWarnTime); - serv->Warned = true; + ServerInstance->SNO->WriteToSnoMask('l',"Server \002%s\002 has not responded to PING for %d seconds, high latency.", s->GetName().c_str(), Utils->PingWarnTime); + s->Warned = true; } } } - - /* Cancel remote burst mode on any servers which still have it enabled due to latency/lack of data. - * This prevents lost REMOTECONNECT notices - */ - for (server_hash::iterator i = Utils->serverlist.begin(); i != Utils->serverlist.end(); i++) - Utils->SetRemoteBursting(i->second, false); } void ModuleSpanningTree::ConnectServer(Link* x) @@ -310,14 +337,14 @@ void ModuleSpanningTree::AutoConnectServers(time_t curtime) } } -int ModuleSpanningTree::HandleVersion(const char** parameters, int pcnt, User* user) +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->WriteServ("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); @@ -325,7 +352,7 @@ int ModuleSpanningTree::HandleVersion(const char** parameters, int pcnt, User* u } else { - user->WriteServ("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; } @@ -348,7 +375,6 @@ void ModuleSpanningTree::RemoteMessage(User* user, const char* format, ...) return; SendingRemoteMessage = true; - std::deque params; char text[MAXBUF]; va_list argsPtr; @@ -360,27 +386,19 @@ void ModuleSpanningTree::RemoteMessage(User* user, const char* format, ...) { /* 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); } else { if (IS_LOCAL(user)) - user->WriteServ("NOTICE %s :%s", user->nick, text); + user->WriteServ("NOTICE %s :%s", user->nick.c_str(), 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); - } + ServerInstance->PI->SendUserNotice(user, text); } SendingRemoteMessage = false; } -int ModuleSpanningTree::HandleConnect(const char** 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++) { @@ -400,21 +418,10 @@ int ModuleSpanningTree::HandleConnect(const char** parameters, int pcnt, User* 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; } -void ModuleSpanningTree::BroadcastTimeSync() -{ - if (Utils->MasterTime) - { - std::deque params; - params.push_back(ConvToStr(ServerInstance->Time(false))); - params.push_back("FORCE"); - Utils->DoOneToMany(ServerInstance->Config->GetSID(), "TIMESET", params); - } -} - void ModuleSpanningTree::OnGetServerDescription(const std::string &servername,std::string &description) { TreeServer* s = Utils->FindServer(servername); @@ -424,13 +431,14 @@ void ModuleSpanningTree::OnGetServerDescription(const std::string &servername,st } } -void ModuleSpanningTree::OnUserInvite(User* source,User* dest,Channel* channel) +void ModuleSpanningTree::OnUserInvite(User* source,User* dest,Channel* channel, time_t expiry) { if (IS_LOCAL(source)) { std::deque params; params.push_back(dest->uuid); params.push_back(channel->name); + params.push_back(ConvToStr(expiry)); Utils->DoOneToMany(source->uuid,"INVITE",params); } } @@ -455,6 +463,10 @@ void ModuleSpanningTree::OnWallops(User* user, const std::string &text) void ModuleSpanningTree::OnUserNotice(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list) { + /* Server origin */ + if (user == NULL) + return; + if (target_type == TYPE_USER) { User* d = (User*)dest; @@ -503,6 +515,10 @@ void ModuleSpanningTree::OnUserNotice(User* user, void* dest, int target_type, c void ModuleSpanningTree::OnUserMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list) { + /* Server origin */ + if (user == NULL) + return; + if (target_type == TYPE_USER) { // route private messages which are targetted at clients only to the server @@ -562,28 +578,15 @@ 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->GetAllPrefixChars(user))+","+std::string(user->uuid)); - Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FJOIN",params); - /* First user in, sync the modes for the channel */ - params.pop_back(); - params.push_back(std::string("+") + channel->ChanModes(true)); - Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FMODE",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); } } @@ -619,31 +622,6 @@ void ModuleSpanningTree::OnUserPart(User* user, Channel* channel, const std::str } } -void ModuleSpanningTree::OnUserConnect(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); - // User is Local, change needs to be reflected! - TreeServer* SourceServer = Utils->FindServer(user->server); - if (SourceServer) - { - SourceServer->AddUserCount(); - } - } -} - void ModuleSpanningTree::OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) { if ((IS_LOCAL(user)) && (user->registered == REG_ALL)) @@ -659,11 +637,12 @@ void ModuleSpanningTree::OnUserQuit(User* user, const std::string &reason, const params.push_back(":"+reason); Utils->DoOneToMany(user->uuid,"QUIT",params); } + // Regardless, We need to modify the user Counts.. TreeServer* SourceServer = Utils->FindServer(user->server); if (SourceServer) { - SourceServer->DelUserCount(); + SourceServer->SetUserCount(-1); // decrement by 1 } } @@ -676,8 +655,8 @@ 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)) - user->age = ServerInstance->Time(true); + if (irc::string(user->nick.c_str()) != assign(oldnick)) + user->age = ServerInstance->Time(); params.push_back(ConvToStr(user->age)); Utils->DoOneToMany(user->uuid,"NICK",params); @@ -718,20 +697,19 @@ void ModuleSpanningTree::OnRemoteKill(User* source, User* dest, const std::strin void ModuleSpanningTree::OnRehash(User* user, const std::string ¶meter) { - if (!parameter.empty()) + 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; params.push_back(parameter); - Utils->DoOneToMany(user ? user->nick : ServerInstance->Config->GetSID(), "REHASH", params); - // check for self - if (ServerInstance->MatchText(ServerInstance->Config->ServerName,parameter)) - { - ServerInstance->WriteOpers("*** Remote rehash initiated locally by \002%s\002", user ? user->nick : ServerInstance->Config->ServerName); - ServerInstance->RehashServer(); - } + Utils->DoOneToAllButSender(user ? user->uuid : ServerInstance->Config->GetSID(), "REHASH", params, user ? user->server : ServerInstance->Config->GetSID()); /// Can this take SID? } - Utils->ReadConfiguration(false); - InitializeDisabledCommands(ServerInstance->Config->DisabledCommands, ServerInstance); + + // Re-read config stuff + Utils->ReadConfiguration(true); } // note: the protocol does not allow direct umode +o except @@ -747,14 +725,14 @@ void ModuleSpanningTree::OnOper(User* user, const std::string &opertype) } } -void ModuleSpanningTree::OnAddLine(XLine* line, User* user) +void ModuleSpanningTree::OnAddLine(User* user, XLine *x) { - if (line->type == "K") + if (!x->IsBurstable()) return; char data[MAXBUF]; - snprintf(data,MAXBUF,"%s %s %s %lu %lu :%s", line->type.c_str(), line->Displayable(), ServerInstance->Config->ServerName, line->set_time, - line->duration, line->reason); + 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); @@ -770,13 +748,13 @@ void ModuleSpanningTree::OnAddLine(XLine* line, User* user) } } -void ModuleSpanningTree::OnDelLine(XLine* line, User* user) +void ModuleSpanningTree::OnDelLine(User* user, XLine *x) { - if (line->type == "K") + if (x->type == "K") return; char data[MAXBUF]; - snprintf(data,MAXBUF,"%s %s", line->type.c_str(), line->Displayable()); + snprintf(data,MAXBUF,"%s %s", x->type.c_str(), x->Displayable()); std::deque params; params.push_back(data); @@ -822,24 +800,25 @@ void ModuleSpanningTree::OnMode(User* user, void* dest, int target_type, const s } } -void ModuleSpanningTree::OnSetAway(User* user) +int ModuleSpanningTree::OnSetAway(User* user, const std::string &awaymsg) { if (IS_LOCAL(user)) { - std::deque params; - params.push_back(":"+std::string(user->awaymsg)); - Utils->DoOneToMany(user->uuid,"AWAY",params); + if (awaymsg.empty()) + { + std::deque params; + params.clear(); + Utils->DoOneToMany(user->uuid,"AWAY",params); + } + else + { + std::deque params; + params.push_back(":" + awaymsg); + Utils->DoOneToMany(user->uuid,"AWAY",params); + } } -} -void ModuleSpanningTree::OnCancelAway(User* user) -{ - if (IS_LOCAL(user)) - { - std::deque params; - params.clear(); - Utils->DoOneToMany(user->uuid,"AWAY",params); - } + return 0; } void ModuleSpanningTree::ProtoSendMode(void* opaque, int target_type, void* target, const std::string &modeline) @@ -888,108 +867,20 @@ void ModuleSpanningTree::ProtoSendMetaData(void* opaque, int target_type, void* void ModuleSpanningTree::OnEvent(Event* event) { - std::deque* params = (std::deque*)event->GetData(); - if (event->GetEventID() == "send_metadata") + 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")) { - if (params->size() < 3) - return; - (*params)[2] = ":" + (*params)[2]; - Utils->DoOneToMany(ServerInstance->Config->GetSID(),"METADATA",*params); - } - else if (event->GetEventID() == "send_topic") - { - if (params->size() < 2) - return; - (*params)[1] = ":" + (*params)[1]; - params->insert(params->begin() + 1,ServerInstance->Config->ServerName); - params->insert(params->begin() + 1,ConvToStr(ServerInstance->Time(true))); - Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FTOPIC",*params); - } - else if (event->GetEventID() == "send_mode") - { - if (params->size() < 2) - return; - // Insert the TS value of the object, either User or Channel - time_t ourTS = 0; - std::string output_text; - - /* Warning: in-place translation is only safe for type TR_NICK */ - for (size_t n = 0; n < params->size(); n++) - ServerInstance->Parser->TranslateUIDs(TR_NICK, (*params)[n], (*params)[n]); - - User* a = ServerInstance->FindNick((*params)[0]); - if (a) - { - ourTS = a->age; - Utils->DoOneToMany(ServerInstance->Config->GetSID(),"MODE",*params); - return; - } - else - { - Channel* a = ServerInstance->FindChan((*params)[0]); - if (a) - { - ourTS = a->age; - params->insert(params->begin() + 1,ConvToStr(ourTS)); - Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FMODE",*params); - } - } - } - else if (event->GetEventID() == "send_mode_explicit") - { - if (params->size() < 2) - return; - std::string output_text; - - /* Warning: in-place translation is only safe for type TR_NICK */ - for (size_t n = 0; n < params->size(); n++) - ServerInstance->Parser->TranslateUIDs(TR_NICK, (*params)[n], (*params)[n]); - - Utils->DoOneToMany(ServerInstance->Config->GetSID(),"MODE",*params); - } - else if (event->GetEventID() == "send_opers") - { - if (params->size() < 1) - return; - (*params)[0] = ":" + (*params)[0]; - Utils->DoOneToMany(ServerInstance->Config->GetSID(),"OPERNOTICE",*params); - } - else if (event->GetEventID() == "send_modeset") - { - if (params->size() < 2) - return; - (*params)[1] = ":" + (*params)[1]; - Utils->DoOneToMany(ServerInstance->Config->GetSID(),"MODENOTICE",*params); - } - else if (event->GetEventID() == "send_snoset") - { - if (params->size() < 2) - return; - (*params)[1] = ":" + (*params)[1]; - Utils->DoOneToMany(ServerInstance->Config->GetSID(),"SNONOTICE",*params); - } - else if (event->GetEventID() == "send_push") - { - if (params->size() < 2) - return; - - User *a = ServerInstance->FindNick((*params)[0]); - - if (!a) - return; - - (*params)[0] = a->uuid; - (*params)[1] = ":" + (*params)[1]; - Utils->DoOneToOne(ServerInstance->Config->GetSID(), "PUSH", *params, a->server); + ServerInstance->Logs->Log("m_spanningtree", DEBUG, "WARNING: Deprecated use of old 1.1 style m_spanningtree event ignored, type '"+event->GetEventID()+"'!"); } } ModuleSpanningTree::~ModuleSpanningTree() { /* This will also free the listeners */ + delete ServerInstance->PI; + ServerInstance->PI = new ProtocolInterface(ServerInstance); + delete Utils; - if (SyncTimer) - ServerInstance->Timers->DelTimer(SyncTimer); ServerInstance->Timers->DelTimer(RefreshTimer); @@ -998,7 +889,7 @@ ModuleSpanningTree::~ModuleSpanningTree() Version ModuleSpanningTree::GetVersion() { - return Version(1,1,0,2,VF_VENDOR,API_VERSION); + return Version(1,2,0,2,VF_VENDOR,API_VERSION); } /* It is IMPORTANT that m_spanningtree is the last module in the chain