X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmain.cpp;h=c402b145a7afd76955f76bc5da68878d722502c7;hb=5d67a5fff127bf95bca69b436ef7f645f2fe3281;hp=f729743815978e63cb6de6192f04b9765a44c781;hpb=29b51086b95c86f812ac35ed7d3333f060ba5a8c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index f72974381..c402b145a 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,30 +17,30 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" -#include "wildcard.h" #include "xline.h" -#include "transport.h" +#include "../transport.h" -#include "m_spanningtree/timesynctimer.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 "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/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/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(Me, this); - command_rconnect = new cmd_rconnect(ServerInstance, this, Utils); + Utils = new SpanningTreeUtilities(ServerInstance, this); + 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); @@ -48,18 +48,20 @@ ModuleSpanningTree::ModuleSpanningTree(InspIRCd* Me) Implementation eventlist[] = { 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_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_OnWallops, I_OnUserNotice, I_OnUserMessage, I_OnBackgroundTimer, I_OnUserJoin, + I_OnChangeLocalUserHost, I_OnChangeName, 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_OnEvent, I_OnSetAway, + I_OnPostCommand, I_OnUserConnect }; - ServerInstance->Modules->Attach(eventlist, this, 29); + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); - for (std::vector::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++) - { - this->OnPostConnect((*i)); - } + delete ServerInstance->PI; + ServerInstance->PI = new SpanningTreeProtocolInterface(this, Utils, ServerInstance); + loopCall = false; + + // update our local user count + Utils->TreeRoot->SetUserCount(ServerInstance->Users->local_users.size()); } void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops) @@ -73,7 +75,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); } @@ -90,7 +92,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()); @@ -106,14 +108,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->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* const* parameters, int pcnt, User* user) +void ModuleSpanningTree::HandleLusers(const std::vector& parameters, User* user) { unsigned int n_users = ServerInstance->Users->UserCount(); @@ -129,7 +131,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++) { @@ -141,23 +143,23 @@ void ModuleSpanningTree::HandleLusers(const char* const* parameters, int pcnt, U } } } - user->WriteServ("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->WriteServ("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->WriteServ("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->WriteServ("254 %s %d :channels formed",user->nick,ServerInstance->ChannelCount()); - - user->WriteServ("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->WriteServ("265 %s :Current Local Users: %d Max: %d",user->nick,ServerInstance->Users->LocalUserCount(),max_local); - user->WriteServ("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; } @@ -177,63 +179,84 @@ 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; + + // 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()); + + 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); - 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 - * XXX this should probably not do this until server has been bursting for, say, 60 seconds or something - */ - for (server_hash::iterator i = Utils->serverlist.begin(); i != Utils->serverlist.end(); i++) - { - if (i->second->bursting) - { - ServerInstance->SNO->WriteToSnoMask('l',"Server \002%s\002 has not finished burst, forcing end of burst.", i->second->GetName().c_str()); - i->second->FinishBurst(); - } - } } 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; if (strchr(x->IPAddr.c_str(),':')) { @@ -242,7 +265,6 @@ void ModuleSpanningTree::ConnectServer(Link* x) ipvalid = false; } else -#endif { in_addr n; if (inet_aton(x->IPAddr.c_str(),&n) < 1) @@ -255,14 +277,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); @@ -278,7 +300,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); } } @@ -314,14 +336,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->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); @@ -329,30 +375,15 @@ int ModuleSpanningTree::HandleVersion(const char* const* parameters, int pcnt, 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; } -/* 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; - - std::deque params; char text[MAXBUF]; va_list argsPtr; @@ -360,36 +391,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) { @@ -404,7 +423,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; } @@ -421,7 +440,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)); @@ -431,7 +450,7 @@ void ModuleSpanningTree::OnUserInvite(User* source,User* dest,Channel* channel, void ModuleSpanningTree::OnPostLocalTopicChange(User* user, Channel* chan, const std::string &topic) { - std::deque params; + parameterlist params; params.push_back(chan->name); params.push_back(":"+topic); Utils->DoOneToMany(user->uuid,"TOPIC",params); @@ -441,7 +460,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); } @@ -449,13 +468,16 @@ 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; 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); @@ -487,7 +509,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); @@ -497,6 +519,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 @@ -504,8 +530,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); @@ -537,7 +562,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); @@ -549,46 +574,56 @@ void ModuleSpanningTree::OnBackgroundTimer(time_t curtime) { AutoConnectServers(curtime); DoPingChecks(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(User* user, Channel* channel, bool sync, bool &silent, bool created) { // 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); - } + 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)); + 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; - std::deque params; + return 0; + + parameterlist params; params.push_back(newhost); Utils->DoOneToMany(user->uuid,"FHOST",params); + return 0; } void ModuleSpanningTree::OnChangeName(User* user, const std::string &gecos) @@ -596,16 +631,17 @@ 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, const std::string &partmessage, bool &silent) +void ModuleSpanningTree::OnUserPart(User* user, Channel* channel, std::string &partmessage, bool &silent) { if (IS_LOCAL(user)) { - std::deque params; + parameterlist params; params.push_back(channel->name); if (!partmessage.empty()) params.push_back(":"+partmessage); @@ -613,36 +649,11 @@ 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)) { - std::deque params; + parameterlist params; if (oper_message != reason) { @@ -666,12 +677,12 @@ 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! */ - 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)); @@ -681,27 +692,26 @@ 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 ((source) && (IS_LOCAL(source))) + parameterlist params; + params.push_back(chan->name); + params.push_back(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_FAKE(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) { - std::deque params; + if (!IS_LOCAL(source)) + return; // Only start routing if we're origin. + + parameterlist params; params.push_back(":"+reason); Utils->DoOneToMany(dest->uuid,"OPERQUIT",params); params.clear(); @@ -711,22 +721,51 @@ void ModuleSpanningTree::OnRemoteKill(User* source, User* dest, const std::strin Utils->DoOneToMany(source->uuid,"KILL",params); } -void ModuleSpanningTree::OnRehash(User* user, const std::string ¶meter) +void ModuleSpanningTree::OnPreRehash(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] != '-') { - std::deque params; + parameterlist 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->SNO->WriteToSnoMask('A', "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->ServerName); } +} + +void ModuleSpanningTree::OnRehash(User* user) +{ + // Re-read config stuff Utils->ReadConfiguration(true); - InitializeDisabledCommands(ServerInstance->Config->DisabledCommands, ServerInstance); +} + +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 @@ -736,7 +775,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); } @@ -744,13 +783,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(), + 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; + parameterlist params; params.push_back(data); if (!user) @@ -772,7 +811,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) @@ -787,15 +826,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) { @@ -817,41 +856,42 @@ 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()) + { + parameterlist params; + params.clear(); + Utils->DoOneToMany(user->uuid,"AWAY",params); + } + else + { + parameterlist 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) +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 + 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); @@ -859,7 +899,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) @@ -883,107 +923,24 @@ 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 (params->size() < 3) - return; - (*params)[2] = ":" + (*params)[2]; - Utils->DoOneToMany(ServerInstance->Config->GetSID(),"METADATA",*params); - } - else if (event->GetEventID() == "send_topic") + 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() < 2) - return; - (*params)[1] = ":" + (*params)[1]; - params->insert(params->begin() + 1,ServerInstance->Config->ServerName); - params->insert(params->begin() + 1,ConvToStr(ServerInstance->Time())); - 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* c = ServerInstance->FindChan((*params)[0]); - if (c) - { - ourTS = c->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() { + delete ServerInstance->PI; + ServerInstance->PI = new ProtocolInterface(ServerInstance); + /* This will also free the listeners */ delete Utils; + delete command_rconnect; + delete command_rsquit; + ServerInstance->Timers->DelTimer(RefreshTimer); ServerInstance->Modules->DoneWithInterface("BufferedSocketHook"); @@ -991,7 +948,7 @@ ModuleSpanningTree::~ModuleSpanningTree() Version ModuleSpanningTree::GetVersion() { - return Version(1,1,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 @@ -1003,7 +960,7 @@ Version ModuleSpanningTree::GetVersion() */ void ModuleSpanningTree::Prioritize() { - ServerInstance->Modules->SetPriority(this, PRIO_LAST); + ServerInstance->Modules->SetPriority(this, PRIORITY_LAST); } MODULE_INIT(ModuleSpanningTree)