X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmain.cpp;h=967b577b15d03f466df3f3df81f7d29857d8f7ae;hb=b111d5098fe1ee306d2718c82c72f969db9d183d;hp=7f152a0f504fbb1a5755597234f0a1c0c5122918;hpb=b1002b7df55f1aec5bfce48ecd07d6d326174c95;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index 7f152a0f5..967b577b1 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -1,24 +1,31 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2007-2009 Craig Edwards + * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2007 Dennis Friis * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + /* $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 "cachetimer.h" #include "resolvers.h" @@ -27,41 +34,61 @@ #include "treeserver.h" #include "link.h" #include "treesocket.h" -#include "rconnect.h" -#include "rsquit.h" +#include "commands.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() + : KeepNickTS(false) +{ + Utils = new SpanningTreeUtilities(this); + commands = new SpanningTreeCommands(this); + RefreshTimer = NULL; +} + +SpanningTreeCommands::SpanningTreeCommands(ModuleSpanningTree* module) + : rconnect(module, module->Utils), rsquit(module, module->Utils), + svsjoin(module), svspart(module), svsnick(module), metadata(module), + uid(module), opertype(module), fjoin(module), fmode(module), ftopic(module), + fhost(module), fident(module), fname(module) +{ +} -ModuleSpanningTree::ModuleSpanningTree(InspIRCd* Me) - : Module(Me), max_local(0), max_global(0) +void ModuleSpanningTree::init() { - ServerInstance->Modules->UseInterface("BufferedSocketHook"); - Utils = new SpanningTreeUtilities(ServerInstance, this); - command_rconnect = new CommandRConnect(ServerInstance, this, Utils); - ServerInstance->AddCommand(command_rconnect); - command_rsquit = new CommandRSQuit(ServerInstance, this, Utils); - ServerInstance->AddCommand(command_rsquit); - RefreshTimer = new CacheRefreshTimer(ServerInstance, Utils); + ServerInstance->Modules->AddService(commands->rconnect); + ServerInstance->Modules->AddService(commands->rsquit); + ServerInstance->Modules->AddService(commands->svsjoin); + ServerInstance->Modules->AddService(commands->svspart); + ServerInstance->Modules->AddService(commands->svsnick); + ServerInstance->Modules->AddService(commands->metadata); + ServerInstance->Modules->AddService(commands->uid); + ServerInstance->Modules->AddService(commands->opertype); + ServerInstance->Modules->AddService(commands->fjoin); + ServerInstance->Modules->AddService(commands->fmode); + ServerInstance->Modules->AddService(commands->ftopic); + ServerInstance->Modules->AddService(commands->fhost); + ServerInstance->Modules->AddService(commands->fident); + ServerInstance->Modules->AddService(commands->fname); + RefreshTimer = new CacheRefreshTimer(Utils); ServerInstance->Timers->AddTimer(RefreshTimer); Implementation eventlist[] = { - I_OnPreCommand, I_OnGetServerDescription, I_OnUserInvite, I_OnPostLocalTopicChange, + 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_OnChangeHost, 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_OnEvent, - I_OnSetAway, I_OnPostCommand, I_OnUserConnect + I_OnOper, I_OnAddLine, I_OnDelLine, I_OnMode, I_OnLoadModule, I_OnStats, + I_OnSetAway, I_OnPostCommand, I_OnUserConnect, I_OnAcceptConnection }; ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); delete ServerInstance->PI; - ServerInstance->PI = new SpanningTreeProtocolInterface(this, Utils, ServerInstance); + ServerInstance->PI = new SpanningTreeProtocolInterface(Utils); loopCall = false; // update our local user count - Utils->TreeRoot->SetUserCount(ServerInstance->Users->local_users.size()); + Utils->TreeRoot->SetUserCount(ServerInstance->Users->LocalUserCount()); } void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops) @@ -73,7 +100,7 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops) } for (unsigned int q = 0; q < Current->ChildCount(); q++) { - if ((Current->GetChild(q)->Hidden) || ((Utils->HideULines) && (ServerInstance->ULine(Current->GetChild(q)->GetName().c_str())))) + if ((Current->GetChild(q)->Hidden) || ((Utils->HideULines) && (ServerInstance->ULine(Current->GetChild(q)->GetName())))) { if (IS_OPER(user)) { @@ -86,23 +113,19 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops) } } /* Don't display the line if its a uline, hide ulines is on, and the user isnt an oper */ - if ((Utils->HideULines) && (ServerInstance->ULine(Current->GetName().c_str())) && (!IS_OPER(user))) + if ((Utils->HideULines) && (ServerInstance->ULine(Current->GetName())) && (!IS_OPER(user))) return; /* Or if the server is hidden and they're not an oper */ else if ((Current->Hidden) && (!IS_OPER(user))) 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(), + std::string servername = Current->GetName(); + user->WriteNumeric(364, "%s %s %s :%d %s", user->nick.c_str(), servername.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()); } -int ModuleSpanningTree::CountLocalServs() -{ - return Utils->TreeRoot->ChildCount(); -} - int ModuleSpanningTree::CountServs() { return Utils->serverlist.size(); @@ -115,54 +138,6 @@ void ModuleSpanningTree::HandleLinks(const std::vector& parameters, return; } -void ModuleSpanningTree::HandleLusers(const std::vector& parameters, User* user) -{ - unsigned int n_users = ServerInstance->Users->UserCount(); - - /* Only update these when someone wants to see them, more efficient */ - if ((unsigned int)ServerInstance->Users->LocalUserCount() > max_local) - max_local = ServerInstance->Users->LocalUserCount(); - if (n_users > max_global) - max_global = n_users; - - unsigned int ulined_count = 0; - unsigned int ulined_local_count = 0; - - /* 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) && (!IS_OPER(user))) - { - for (server_hash::iterator q = Utils->serverlist.begin(); q != Utils->serverlist.end(); q++) - { - if (ServerInstance->ULine(q->second->GetName().c_str())) - { - ulined_count++; - if (q->second->GetParent() == Utils->TreeRoot) - ulined_local_count++; - } - } - } - 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.c_str(),ServerInstance->Users->OperCount()); - - if (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.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; -} - std::string ModuleSpanningTree::TimeToStr(time_t secs) { time_t mins_up = secs / 60; @@ -171,9 +146,9 @@ std::string ModuleSpanningTree::TimeToStr(time_t secs) secs = secs % 60; mins_up = mins_up % 60; hours_up = hours_up % 24; - return ((days_up ? (ConvToStr(days_up) + "d") : std::string("")) - + (hours_up ? (ConvToStr(hours_up) + "h") : std::string("")) - + (mins_up ? (ConvToStr(mins_up) + "m") : std::string("")) + return ((days_up ? (ConvToStr(days_up) + "d") : "") + + (hours_up ? (ConvToStr(hours_up) + "h") : "") + + (mins_up ? (ConvToStr(mins_up) + "m") : "") + ConvToStr(secs) + "s"); } @@ -183,14 +158,19 @@ void ModuleSpanningTree::DoPingChecks(time_t curtime) * 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); + long ts = ServerInstance->Time() * 1000 + (ServerInstance->Time_ns() / 1000000); +restart: for (server_hash::iterator i = Utils->serverlist.begin(); i != Utils->serverlist.end(); i++) { TreeServer *s = i->second; + if (s->GetSocket() && s->GetSocket()->GetLinkState() == DYING) + { + s->GetSocket()->Close(); + goto restart; + } + // 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 @@ -215,7 +195,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(":" + ServerInstance->Config->GetSID() + " PING " + ServerInstance->Config->GetSID() + " " + s->GetID()); s->LastPingMsec = ts; } @@ -227,10 +207,8 @@ void ModuleSpanningTree::DoPingChecks(time_t curtime) if (sock) { sock->SendError("Ping timeout"); - sock->Squit(s,"Ping timeout"); - ServerInstance->SE->DelFd(sock); sock->Close(); - return; + goto restart; } } } @@ -239,25 +217,62 @@ void ModuleSpanningTree::DoPingChecks(time_t curtime) if ((Utils->PingWarnTime) && (!s->Warned) && (curtime >= s->NextPingTime() - (Utils->PingFreq - Utils->PingWarnTime)) && (!s->AnsweredLastPing())) { /* The server hasnt responded, send a warning to opers */ - ServerInstance->SNO->WriteToSnoMask('l',"Server \002%s\002 has not responded to PING for %d seconds, high latency.", s->GetName().c_str(), Utils->PingWarnTime); + std::string servername = s->GetName(); + ServerInstance->SNO->WriteToSnoMask('l',"Server \002%s\002 has not responded to PING for %d seconds, high latency.", servername.c_str(), Utils->PingWarnTime); s->Warned = true; } } } } -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))) + if (InspIRCd::Match(ServerInstance->Config->ServerName, assign(x->Name), rfc_case_insensitive_map)) { - this->ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Not connecting to myself."); + ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Not connecting to myself."); return; } - QueryType start_type = DNS_QUERY_A; - start_type = DNS_QUERY_AAAA; + QueryType start_type = DNS_QUERY_AAAA; if (strchr(x->IPAddr.c_str(),':')) { in6_addr n; @@ -275,89 +290,68 @@ 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, y, x->IPAddr); if (newsocket->GetFd() > -1) { /* Handled automatically on success */ } else { - 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); + ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.", + x->Name.c_str(), newsocket->getError().c_str()); + ServerInstance->GlobalCulls.AddItem(newsocket); } } else { try { - bool cached; - ServernameResolver* snr = new ServernameResolver((Module*)this, Utils, ServerInstance,x->IPAddr, *x, cached, start_type); + bool cached = false; + ServernameResolver* snr = new ServernameResolver(Utils, x->IPAddr, x, cached, start_type, y); ServerInstance->AddResolver(snr, cached); } catch (ModuleException& e) { - this->ServerInstance->SNO->WriteToSnoMask('l', "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; - if (curtime > s->age + p.second) + std::map >::iterator me = i; + i++; + if (s->GetLinkState() == DYING) + { + Utils->timeoutlist.erase(me); + s->Close(); + } + else 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); } } - /* Trigger failover for each timed out socket */ - for (std::vector::const_iterator n = failovers.begin(); n != failovers.end(); ++n) - { - Utils->DoFailOver(*n); - } } ModResult ModuleSpanningTree::HandleVersion(const std::vector& parameters, User* user) @@ -399,11 +393,12 @@ void ModuleSpanningTree::RemoteMessage(User* user, const char* format, ...) 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++) { - if (InspIRCd::Match(x->Name.c_str(),parameters[0])) + Link* x = *i; + if (InspIRCd::Match(x->Name.c_str(),parameters[0], rfc_case_insensitive_map)) { - if (InspIRCd::Match(ServerInstance->Config->ServerName, assign(x->Name))) + if (InspIRCd::Match(ServerInstance->Config->ServerName, assign(x->Name), rfc_case_insensitive_map)) { RemoteMessage(user, "*** CONNECT: Server \002%s\002 is ME, not connecting.",x->Name.c_str()); return MOD_RES_DENY; @@ -413,12 +408,13 @@ ModResult ModuleSpanningTree::HandleConnect(const std::vector& para 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)); + 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()); + std::string servername = CheckDupe->GetParent()->GetName(); + RemoteMessage(user, "*** CONNECT: Server \002%s\002 already exists on the network and is connected via \002%s\002", x->Name.c_str(), servername.c_str()); return MOD_RES_DENY; } } @@ -448,8 +444,12 @@ 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) { + // Drop remote events on the floor. + if (!IS_LOCAL(user)) + return; + parameterlist params; params.push_back(chan->name); params.push_back(":"+topic); @@ -475,7 +475,7 @@ void ModuleSpanningTree::OnUserNotice(User* user, void* dest, int target_type, c if (target_type == TYPE_USER) { User* d = (User*)dest; - if ((d->GetFd() < 0) && (IS_LOCAL(user))) + if (!IS_LOCAL(d) && IS_LOCAL(user)) { parameterlist params; params.push_back(d->uuid); @@ -528,7 +528,7 @@ void ModuleSpanningTree::OnUserMessage(User* user, void* dest, int target_type, // route private messages which are targetted at clients only to the server // which needs to receive them User* d = (User*)dest; - if ((d->GetFd() < 0) && (IS_LOCAL(user))) + if (!IS_LOCAL(d) && (IS_LOCAL(user))) { parameterlist params; params.push_back(d->uuid); @@ -577,7 +577,7 @@ void ModuleSpanningTree::OnBackgroundTimer(time_t curtime) DoConnectTimeout(curtime); } -void ModuleSpanningTree::OnUserConnect(User* user) +void ModuleSpanningTree::OnUserConnect(LocalUser* user) { if (user->quitting) return; @@ -592,55 +592,67 @@ void ModuleSpanningTree::OnUserConnect(User* user) params.push_back(user->GetIPString()); params.push_back(ConvToStr(user->signon)); params.push_back("+"+std::string(user->FormatModes(true))); - params.push_back(":"+std::string(user->fullname)); + params.push_back(":"+user->fullname); Utils->DoOneToMany(ServerInstance->Config->GetSID(), "UID", params); + if (IS_OPER(user)) + { + params.clear(); + params.push_back(user->oper->name); + Utils->DoOneToMany(user->uuid,"OPERTYPE",params); + } + + for(Extensible::ExtensibleStore::const_iterator i = user->GetExtList().begin(); i != user->GetExtList().end(); i++) + { + ExtensionItem* item = i->first; + std::string value = item->serialize(FORMAT_NETWORK, user, i->second); + if (!value.empty()) + ServerInstance->PI->SendMetaData(user, item->name, value); + } + Utils->TreeRoot->SetUserCount(1); // increment by 1 } -void ModuleSpanningTree::OnUserJoin(User* user, Channel* channel, bool sync, bool &silent, bool created) +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)) { 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+","+memb->user->uuid); Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FJOIN",params); } } -ModResult ModuleSpanningTree::OnChangeLocalUserHost(User* user, const std::string &newhost) +void ModuleSpanningTree::OnChangeHost(User* user, const std::string &newhost) { - if (user->registered != REG_ALL) - return MOD_RES_PASSTHRU; + if (user->registered != REG_ALL || !IS_LOCAL(user)) + return; parameterlist params; params.push_back(newhost); Utils->DoOneToMany(user->uuid,"FHOST",params); - return MOD_RES_PASSTHRU; } void ModuleSpanningTree::OnChangeName(User* user, const std::string &gecos) { - // only occurs for local clients - if (user->registered != REG_ALL) + if (user->registered != REG_ALL || !IS_LOCAL(user)) return; parameterlist params; - params.push_back(gecos); + params.push_back(":" + gecos); Utils->DoOneToMany(user->uuid,"FNAME",params); } void ModuleSpanningTree::OnChangeIdent(User* user, const std::string &ident) { - // only occurs for local clients - if (user->registered != REG_ALL) + if ((user->registered != REG_ALL) || (!IS_LOCAL(user))) return; parameterlist params; @@ -648,15 +660,15 @@ void ModuleSpanningTree::OnChangeIdent(User* user, const std::string &ident) Utils->DoOneToMany(user->uuid,"FIDENT",params); } -void ModuleSpanningTree::OnUserPart(User* user, Channel* channel, std::string &partmessage, bool &silent) +void ModuleSpanningTree::OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts) { - if (IS_LOCAL(user)) + if (IS_LOCAL(memb->user)) { parameterlist params; - params.push_back(channel->name); + 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); } } @@ -693,11 +705,12 @@ 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.c_str()) != assign(oldnick)) + if ((irc::string(user->nick.c_str()) != assign(oldnick)) && (!this->KeepNickTS)) user->age = ServerInstance->Time(); params.push_back(ConvToStr(user->age)); Utils->DoOneToMany(user->uuid,"NICK",params); + this->KeepNickTS = false; } else if (!loopCall && user->nick == user->uuid) { @@ -708,17 +721,17 @@ void ModuleSpanningTree::OnUserPostNick(User* user, const std::string &oldnick) } } -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) { parameterlist params; - params.push_back(chan->name); - params.push_back(user->uuid); + params.push_back(memb->chan->name); + params.push_back(memb->user->uuid); params.push_back(":"+reason); if (IS_LOCAL(source)) { Utils->DoOneToMany(source->uuid,"KICK",params); } - else if (IS_FAKE(source) && source != Utils->ServerUser) + else if (source == ServerInstance->FakeClient) { Utils->DoOneToMany(ServerInstance->Config->GetSID(),"KICK",params); } @@ -729,7 +742,7 @@ void ModuleSpanningTree::OnRemoteKill(User* source, User* dest, const std::strin if (!IS_LOCAL(source)) return; // Only start routing if we're origin. - dest->Extend("operquit", new std::string(operreason)); + ServerInstance->OperQuit.set(dest, operreason); parameterlist params; params.push_back(":"+operreason); Utils->DoOneToMany(dest->uuid,"OPERQUIT",params); @@ -741,6 +754,9 @@ void ModuleSpanningTree::OnRemoteKill(User* source, User* dest, const std::strin void ModuleSpanningTree::OnPreRehash(User* user, const std::string ¶meter) { + if (loopCall) + return; // Don't generate a REHASH here if we're in the middle of processing a message that generated this one + ServerInstance->Logs->Log("remoterehash", DEBUG, "called with param %s", parameter.c_str()); // Send out to other servers @@ -755,34 +771,61 @@ void ModuleSpanningTree::OnPreRehash(User* user, const std::string ¶meter) void ModuleSpanningTree::OnRehash(User* user) { // Re-read config stuff - Utils->ReadConfiguration(true); -} - -void ModuleSpanningTree::OnLoadModule(Module* mod, const std::string &name) -{ - this->RedoConfig(mod, name); + try + { + Utils->ReadConfiguration(); + } + catch (ModuleException& e) + { + // Refresh the IP cache anyway, so servers read before the error will be allowed to connect + Utils->RefreshIPCache(); + // Always warn local opers with snomask +l, also warn globally (snomask +L) if the rehash was issued by a remote user + std::string msg = "Error in configuration: "; + msg.append(e.GetReason()); + ServerInstance->SNO->WriteToSnoMask('l', msg); + if (user && !IS_LOCAL(user)) + ServerInstance->PI->SendSNONotice("L", msg); + } } -void ModuleSpanningTree::OnUnloadModule(Module* mod, const std::string &name) +void ModuleSpanningTree::OnLoadModule(Module* mod) { - this->RedoConfig(mod, name); + std::string data; + data.push_back('+'); + data.append(mod->ModuleSourceFile); + Version v = mod->GetVersion(); + if (!v.link_data.empty()) + { + data.push_back('='); + data.append(v.link_data); + } + ServerInstance->PI->SendMetaData(NULL, "modules", data); } -void ModuleSpanningTree::RedoConfig(Module* mod, const std::string &name) +void ModuleSpanningTree::OnUnloadModule(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; + ServerInstance->PI->SendMetaData(NULL, "modules", "-" + mod->ModuleSourceFile); - /* Did we find any modules? */ - if (ml && std::find(ml->begin(), ml->end(), mod) != ml->end()) - IsBufferSocketModule = true; +restart: + unsigned int items = Utils->TreeRoot->ChildCount(); + for(unsigned int x = 0; x < items; x++) + { + TreeServer* srv = Utils->TreeRoot->GetChild(x); + TreeSocket* sock = srv->GetSocket(); + if (sock && sock->GetIOHook() == mod) + { + sock->SendError("SSL module unloaded"); + sock->Close(); + // XXX: The list we're iterating is modified by TreeSocket::Squit() which is called by Close() + goto restart; + } + } - if (name == "m_sha256.so" || IsBufferSocketModule) + for (SpanningTreeUtilities::TimeoutList::const_iterator i = Utils->timeoutlist.begin(); i != Utils->timeoutlist.end(); ++i) { - Utils->ReadConfiguration(true); + TreeSocket* sock = i->first; + if (sock->GetIOHook() == mod) + sock->Close(); } } @@ -791,12 +834,11 @@ void ModuleSpanningTree::RedoConfig(Module* mod, const std::string &name) // locally. void ModuleSpanningTree::OnOper(User* user, const std::string &opertype) { - if (IS_LOCAL(user)) - { - parameterlist params; - params.push_back(opertype); - Utils->DoOneToMany(user->uuid,"OPERTYPE",params); - } + if (user->registered != REG_ALL || !IS_LOCAL(user)) + return; + parameterlist params; + params.push_back(opertype); + Utils->DoOneToMany(user->uuid,"OPERTYPE",params); } void ModuleSpanningTree::OnAddLine(User* user, XLine *x) @@ -804,11 +846,13 @@ void ModuleSpanningTree::OnAddLine(User* user, XLine *x) if (!x->IsBurstable() || loopCall) return; - char data[MAXBUF]; - snprintf(data,MAXBUF,"%s %s %s %lu %lu :%s", x->type.c_str(), x->Displayable(), - ServerInstance->Config->ServerName, (unsigned long)x->set_time, (unsigned long)x->duration, x->reason.c_str()); parameterlist params; - params.push_back(data); + params.push_back(x->type); + params.push_back(x->Displayable()); + params.push_back(ServerInstance->Config->ServerName); + params.push_back(ConvToStr(x->set_time)); + params.push_back(ConvToStr(x->duration)); + params.push_back(":" + x->reason); if (!user) { @@ -824,13 +868,12 @@ void ModuleSpanningTree::OnAddLine(User* user, XLine *x) void ModuleSpanningTree::OnDelLine(User* user, XLine *x) { - if (x->type == "K") + if (!x->IsBurstable() || loopCall) return; - char data[MAXBUF]; - snprintf(data,MAXBUF,"%s %s", x->type.c_str(), x->Displayable()); parameterlist params; - params.push_back(data); + params.push_back(x->type); + params.push_back(x->Displayable()); if (!user) { @@ -849,7 +892,6 @@ void ModuleSpanningTree::OnMode(User* user, void* dest, int target_type, const p if ((IS_LOCAL(user)) && (user->registered == REG_ALL)) { parameterlist params; - std::string command; std::string output_text; ServerInstance->Parser->TranslateUIDs(translate, text, output_text); @@ -859,7 +901,7 @@ void ModuleSpanningTree::OnMode(User* user, void* dest, int target_type, const p User* u = (User*)dest; params.push_back(u->uuid); params.push_back(output_text); - command = "MODE"; + Utils->DoOneToMany(user->uuid, "MODE", params); } else { @@ -867,10 +909,8 @@ void ModuleSpanningTree::OnMode(User* user, void* dest, int target_type, const p params.push_back(c->name); params.push_back(ConvToStr(c->age)); params.push_back(output_text); - command = "FMODE"; + Utils->DoOneToMany(user->uuid, "FMODE", params); } - - Utils->DoOneToMany(user->uuid, command, params); } } @@ -878,23 +918,24 @@ ModResult ModuleSpanningTree::OnSetAway(User* user, const std::string &awaymsg) { if (IS_LOCAL(user)) { - if (awaymsg.empty()) - { - parameterlist params; - Utils->DoOneToMany(user->uuid,"AWAY",params); - } - else + parameterlist params; + if (!awaymsg.empty()) { - parameterlist params; - params.push_back(ConvToStr(user->awaytime)); + params.push_back(ConvToStr(ServerInstance->Time())); params.push_back(":" + awaymsg); - Utils->DoOneToMany(user->uuid,"AWAY",params); } + Utils->DoOneToMany(user->uuid, "AWAY", params); } return MOD_RES_PASSTHRU; } +void ModuleSpanningTree::OnRequest(Request& request) +{ + if (!strcmp(request.id, "rehash")) + Utils->Rehash(); +} + void ModuleSpanningTree::ProtoSendMode(void* opaque, TargetTypeFlags target_type, void* target, const parameterlist &modeline, const std::vector &translate) { TreeSocket* s = (TreeSocket*)opaque; @@ -907,12 +948,12 @@ void ModuleSpanningTree::ProtoSendMode(void* opaque, TargetTypeFlags target_type if (target_type == TYPE_USER) { User* u = (User*)target; - s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" MODE "+u->uuid+" "+output_text); + s->WriteLine(":"+ServerInstance->Config->GetSID()+" MODE "+u->uuid+" "+output_text); } else if (target_type == TYPE_CHANNEL) { Channel* c = (Channel*)target; - s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" FMODE "+c->name+" "+ConvToStr(c->age)+" "+output_text); + s->WriteLine(":"+ServerInstance->Config->GetSID()+" FMODE "+c->name+" "+ConvToStr(c->age)+" "+output_text); } } } @@ -923,52 +964,34 @@ void ModuleSpanningTree::ProtoSendMetaData(void* opaque, Extensible* target, con User* u = dynamic_cast(target); Channel* c = dynamic_cast(target); if (u) - s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA "+u->uuid+" "+extname+" :"+extdata); + s->WriteLine(":"+ServerInstance->Config->GetSID()+" METADATA "+u->uuid+" "+extname+" :"+extdata); else if (c) - s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA "+c->name+" "+extname+" :"+extdata); + s->WriteLine(":"+ServerInstance->Config->GetSID()+" METADATA "+c->name+" "+extname+" :"+extdata); else if (!target) - s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA * "+extname+" :"+extdata); + s->WriteLine(":"+ServerInstance->Config->GetSID()+" METADATA * "+extname+" :"+extdata); } -std::string ModuleSpanningTree::ProtoTranslate(Extensible* item) +CullResult ModuleSpanningTree::cull() { - User* u = dynamic_cast(item); - Channel* c = dynamic_cast(item); - if (u) - return u->uuid; - if (c) - return c->name; - return "*"; -} - -void ModuleSpanningTree::OnEvent(Event* event) -{ - 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); + 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; - delete command_rconnect; - delete command_rsquit; - - ServerInstance->Timers->DelTimer(RefreshTimer); - - ServerInstance->Modules->DoneWithInterface("BufferedSocketHook"); + delete commands; } 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