X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Futils.cpp;h=4e0193727a66617feee4102386aca49ab63073a4;hb=d9d99cd02dadf34bfcc220734ba0c422f0acb3e6;hp=7d02e5c90eaab3c5b5c6a3cd474143a5360e7d9f;hpb=3d1ad0939fae743f9e10c07d1200665491c61012;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp index 7d02e5c90..157679ed7 100644 --- a/src/modules/m_spanningtree/utils.cpp +++ b/src/modules/m_spanningtree/utils.cpp @@ -1,24 +1,53 @@ -#include "configreader.h" -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "commands/cmd_whois.h" -#include "commands/cmd_stats.h" -#include "socket.h" +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007-2009 Craig Edwards + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * + * 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 . + */ + + #include "inspircd.h" -#include "wildcard.h" -#include "xline.h" -#include "transport.h" -#include "socketengine.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/resolvers.h" +#include "main.h" +#include "utils.h" +#include "treeserver.h" +#include "treesocket.h" +#include "resolvers.h" + +/* Create server sockets off a listener. */ +ModResult ModuleSpanningTree::OnAcceptConnection(int newsock, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) +{ + if (from->bind_tag->getString("type") != "servers") + return MOD_RES_PASSTHRU; -/* $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 */ + std::string incomingip = client->addr(); + + for (std::vector::iterator i = Utils->ValidIPs.begin(); i != Utils->ValidIPs.end(); i++) + { + if (*i == "*" || *i == incomingip || irc::sockets::cidr_mask(*i).match(*client)) + { + /* we don't need to do anything with the pointer, creating it stores it in the necessary places */ + new TreeSocket(Utils, newsock, from, client, server); + return MOD_RES_ALLOW; + } + } + ServerInstance->SNO->WriteToSnoMask('l', "Server connection from %s denied (no link blocks with that IP address)", incomingip.c_str()); + return MOD_RES_DENY; +} /** Yay for fast searches! * This is hundreds of times faster than recursion @@ -28,8 +57,10 @@ */ TreeServer* SpanningTreeUtilities::FindServer(const std::string &ServerName) { - server_hash::iterator iter; - iter = serverlist.find(ServerName.c_str()); + if (InspIRCd::IsSID(ServerName)) + return this->FindServerID(ServerName); + + server_hash::iterator iter = serverlist.find(ServerName.c_str()); if (iter != serverlist.end()) { return iter->second; @@ -48,7 +79,7 @@ TreeServer* SpanningTreeUtilities::FindServer(const std::string &ServerName) */ TreeServer* SpanningTreeUtilities::BestRouteTo(const std::string &ServerName) { - if (ServerName.c_str() == TreeRoot->GetName()) + if (ServerName.c_str() == TreeRoot->GetName() || ServerName == ServerInstance->Config->GetSID()) return NULL; TreeServer* Found = FindServer(ServerName); if (Found) @@ -57,6 +88,15 @@ TreeServer* SpanningTreeUtilities::BestRouteTo(const std::string &ServerName) } else { + // Cheat a bit. This allows for (better) working versions of routing commands with nick based prefixes, without hassle + User *u = ServerInstance->FindNick(ServerName); + if (u) + { + Found = FindServer(u->server); + if (Found) + return Found->GetRoute(); + } + return NULL; } } @@ -71,188 +111,107 @@ TreeServer* SpanningTreeUtilities::FindServerMask(const std::string &ServerName) { for (server_hash::iterator i = serverlist.begin(); i != serverlist.end(); i++) { - if (match(i->first.c_str(),ServerName.c_str())) + if (InspIRCd::Match(i->first,ServerName)) return i->second; } return NULL; } -/* A convenient wrapper that returns true if a server exists */ -bool SpanningTreeUtilities::IsServer(const std::string &ServerName) +TreeServer* SpanningTreeUtilities::FindServerID(const std::string &id) { - return (FindServer(ServerName) != NULL); + server_hash::iterator iter = sidlist.find(id); + if (iter != sidlist.end()) + return iter->second; + else + return NULL; } -SpanningTreeUtilities::SpanningTreeUtilities(InspIRCd* Instance, ModuleSpanningTree* C) : ServerInstance(Instance), Creator(C) +SpanningTreeUtilities::SpanningTreeUtilities(ModuleSpanningTree* C) + : RefreshTimer(this), Creator(C) { - Bindings.clear(); - - lines_to_apply = 0; - - this->TreeRoot = new TreeServer(this, ServerInstance, ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc); - - modulelist* ml = ServerInstance->FindInterface("InspSocketHook"); - - /* Did we find any modules? */ - if (ml) - { - /* Yes, enumerate them all to find out the hook name */ - for (modulelist::iterator m = ml->begin(); m != ml->end(); m++) - { - /* Make a request to it for its name, its implementing - * InspSocketHook so we know its safe to do this - */ - std::string name = InspSocketNameRequest((Module*)Creator, *m).Send(); - /* Build a map of them */ - hooks[name.c_str()] = *m; - hooknames.push_back(name); - } - } + ServerInstance->Timers->AddTimer(&RefreshTimer); + ServerInstance->Logs->Log("m_spanningtree", LOG_DEBUG, "***** Using SID for hash: %s *****", ServerInstance->Config->GetSID().c_str()); - this->ReadConfiguration(true); + this->TreeRoot = new TreeServer(this, ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc, ServerInstance->Config->GetSID()); + this->ReadConfiguration(); } -SpanningTreeUtilities::~SpanningTreeUtilities() +CullResult SpanningTreeUtilities::cull() { - for (unsigned int i = 0; i < Bindings.size(); i++) - { - ServerInstance->SE->DelFd(Bindings[i]); - Bindings[i]->Close(); - DELETE(Bindings[i]); - } while (TreeRoot->ChildCount()) { TreeServer* child_server = TreeRoot->GetChild(0); if (child_server) { TreeSocket* sock = child_server->GetSocket(); - ServerInstance->SE->DelFd(sock); sock->Close(); - DELETE(sock); } } - delete TreeRoot; + + for(std::map >::iterator i = timeoutlist.begin(); i != timeoutlist.end(); ++i) + { + TreeSocket* s = i->first; + s->Close(); + } + TreeRoot->cull(); + + return classbase::cull(); } -void SpanningTreeUtilities::AddThisServer(TreeServer* server, TreeServerList &list) +SpanningTreeUtilities::~SpanningTreeUtilities() { - if (list.find(server) == list.end()) - list[server] = server; + delete TreeRoot; } /* returns a list of DIRECT servernames for a specific channel */ -void SpanningTreeUtilities::GetListOfServersForChannel(chanrec* c, TreeServerList &list, char status, const CUList &exempt_list) +void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeServerList &list, char status, const CUList &exempt_list) { - CUList *ulist; - switch (status) + unsigned int minrank = 0; + if (status) { - case '@': - ulist = c->GetOppedUsers(); - break; - case '%': - ulist = c->GetHalfoppedUsers(); - break; - case '+': - ulist = c->GetVoicedUsers(); - break; - default: - ulist = c->GetUsers(); - break; + ModeHandler* mh = ServerInstance->Modes->FindPrefix(status); + if (mh) + minrank = mh->GetPrefixRank(); } - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) + + const UserMembList *ulist = c->GetUsers(); + + for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++) { - if ((i->second->GetFd() < 0) && (exempt_list.find(i->second) == exempt_list.end())) + if (IS_LOCAL(i->first)) + continue; + + if (minrank && i->second->getRank() < minrank) + continue; + + if (exempt_list.find(i->first) == exempt_list.end()) { - TreeServer* best = this->BestRouteTo(i->second->server); + TreeServer* best = this->BestRouteTo(i->first->server); if (best) - AddThisServer(best,list); + list.insert(best); } } return; } -bool SpanningTreeUtilities::DoOneToAllButSenderRaw(const std::string &data, const std::string &omit, const std::string &prefix, const irc::string &command, std::deque ¶ms) +std::string SpanningTreeUtilities::ConstructLine(const std::string& prefix, const std::string& command, const parameterlist& params) { - char pfx = 0; - TreeServer* omitroute = this->BestRouteTo(omit); - if ((command == "NOTICE") || (command == "PRIVMSG")) + std::string FullLine; + FullLine.reserve(MAXBUF); + FullLine = ":" + prefix + " " + command; + for (parameterlist::const_iterator x = params.begin(); x != params.end(); ++x) { - if (params.size() >= 2) - { - /* Prefixes */ - if ((*(params[0].c_str()) == '@') || (*(params[0].c_str()) == '%') || (*(params[0].c_str()) == '+')) - { - pfx = params[0][0]; - params[0] = params[0].substr(1, params[0].length()-1); - } - if ((*(params[0].c_str()) != '#') && (*(params[0].c_str()) != '$')) - { - // special routing for private messages/notices - userrec* d = ServerInstance->FindNick(params[0]); - if (d) - { - std::deque par; - par.push_back(params[0]); - par.push_back(":"+params[1]); - this->DoOneToOne(prefix,command.c_str(),par,d->server); - return true; - } - } - else if (*(params[0].c_str()) == '$') - { - std::deque par; - par.push_back(params[0]); - par.push_back(":"+params[1]); - this->DoOneToAllButSender(prefix,command.c_str(),par,omitroute->GetName()); - return true; - } - else - { - chanrec* c = ServerInstance->FindChan(params[0]); - userrec* u = ServerInstance->FindNick(prefix); - if (c && u) - { - CUList elist; - TreeServerList list; - FOREACH_MOD(I_OnBuildExemptList, OnBuildExemptList((command == "PRIVMSG" ? MSG_PRIVMSG : MSG_NOTICE), c, u, pfx, elist)); - GetListOfServersForChannel(c,list,pfx,elist); - - for (TreeServerList::iterator i = list.begin(); i != list.end(); i++) - { - TreeSocket* Sock = i->second->GetSocket(); - if ((Sock) && (i->second->GetName() != omit) && (omitroute != i->second)) - { - Sock->WriteLine(data); - } - } - return true; - } - } - } + FullLine.push_back(' '); + FullLine.append(*x); } - unsigned int items =this->TreeRoot->ChildCount(); - for (unsigned int x = 0; x < items; x++) - { - TreeServer* Route = this->TreeRoot->GetChild(x); - if ((Route) && (Route->GetSocket()) && (Route->GetName() != omit) && (omitroute != Route)) - { - TreeSocket* Sock = Route->GetSocket(); - if (Sock) - Sock->WriteLine(data); - } - } - return true; + return FullLine; } -bool SpanningTreeUtilities::DoOneToAllButSender(const std::string &prefix, const std::string &command, std::deque ¶ms, std::string omit) +bool SpanningTreeUtilities::DoOneToAllButSender(const std::string& prefix, const std::string& command, const parameterlist& params, const std::string& omit) { TreeServer* omitroute = this->BestRouteTo(omit); - std::string FullLine = ":" + prefix + " " + command; - unsigned int words = params.size(); - for (unsigned int x = 0; x < words; x++) - { - FullLine = FullLine + " " + params[x]; - } + std::string FullLine = ConstructLine(prefix, command, params); + unsigned int items = this->TreeRoot->ChildCount(); for (unsigned int x = 0; x < items; x++) { @@ -271,14 +230,10 @@ bool SpanningTreeUtilities::DoOneToAllButSender(const std::string &prefix, const return true; } -bool SpanningTreeUtilities::DoOneToMany(const std::string &prefix, const std::string &command, std::deque ¶ms) +bool SpanningTreeUtilities::DoOneToMany(const std::string &prefix, const std::string &command, const parameterlist ¶ms) { - std::string FullLine = ":" + prefix + " " + command; - unsigned int words = params.size(); - for (unsigned int x = 0; x < words; x++) - { - FullLine = FullLine + " " + params[x]; - } + std::string FullLine = ConstructLine(prefix, command, params); + unsigned int items = this->TreeRoot->ChildCount(); for (unsigned int x = 0; x < items; x++) { @@ -293,36 +248,16 @@ bool SpanningTreeUtilities::DoOneToMany(const std::string &prefix, const std::st return true; } -bool SpanningTreeUtilities::DoOneToMany(const char* prefix, const char* command, std::deque ¶ms) -{ - std::string spfx = prefix; - std::string scmd = command; - return this->DoOneToMany(spfx, scmd, params); -} - -bool SpanningTreeUtilities::DoOneToAllButSender(const char* prefix, const char* command, std::deque ¶ms, std::string omit) -{ - std::string spfx = prefix; - std::string scmd = command; - return this->DoOneToAllButSender(spfx, scmd, params, omit); -} - -bool SpanningTreeUtilities::DoOneToOne(const std::string &prefix, const std::string &command, std::deque ¶ms, std::string target) +bool SpanningTreeUtilities::DoOneToOne(const std::string& prefix, const std::string& command, const parameterlist& params, const std::string& target) { TreeServer* Route = this->BestRouteTo(target); if (Route) { - std::string FullLine = ":" + prefix + " " + command; - unsigned int words = params.size(); - for (unsigned int x = 0; x < words; x++) - { - FullLine = FullLine + " " + params[x]; - } if (Route && Route->GetSocket()) { TreeSocket* Sock = Route->GetSocket(); if (Sock) - Sock->WriteLine(FullLine); + Sock->WriteLine(ConstructLine(prefix, command, params)); } return true; } @@ -335,240 +270,170 @@ bool SpanningTreeUtilities::DoOneToOne(const std::string &prefix, const std::str void SpanningTreeUtilities::RefreshIPCache() { ValidIPs.clear(); - for (std::vector::iterator L = LinkBlocks.begin(); L != LinkBlocks.end(); L++) + for (std::vector >::iterator i = LinkBlocks.begin(); i != LinkBlocks.end(); ++i) { - if ((L->IPAddr != "") && (L->RecvPass != "") && (L->SendPass != "") && (L->Name != "") && (L->Port)) + Link* L = *i; + if (!L->Port) { - ValidIPs.push_back(L->IPAddr); + ServerInstance->Logs->Log("m_spanningtree", LOG_DEFAULT, "m_spanningtree: Ignoring a link block without a port."); + /* Invalid link block */ + continue; + } - if (L->AllowMask.length()) - ValidIPs.push_back(L->AllowMask); + if (L->AllowMask.length()) + ValidIPs.push_back(L->AllowMask); - /* Needs resolving */ - bool ipvalid = true; - QueryType start_type = DNS_QUERY_A; -#ifdef IPV6 - start_type = DNS_QUERY_AAAA; - if (strchr(L->IPAddr.c_str(),':')) - { - in6_addr n; - if (inet_pton(AF_INET6, L->IPAddr.c_str(), &n) < 1) - ipvalid = false; - } - else + irc::sockets::sockaddrs dummy; + bool ipvalid = irc::sockets::aptosa(L->IPAddr, L->Port, dummy); + if ((L->IPAddr == "*") || (ipvalid)) + ValidIPs.push_back(L->IPAddr); + else if (this->Creator->DNS) + { + SecurityIPResolver* sr = new SecurityIPResolver(Creator, this, *this->Creator->DNS, L->IPAddr, L, DNS::QUERY_AAAA); + try { - in_addr n; - if (inet_aton(L->IPAddr.c_str(),&n) < 1) - ipvalid = false; + this->Creator->DNS->Process(sr); } -#else - in_addr n; - if (inet_aton(L->IPAddr.c_str(),&n) < 1) - ipvalid = false; -#endif - if (!ipvalid) + catch (DNS::Exception &) { - try - { - bool cached; - SecurityIPResolver* sr = new SecurityIPResolver((Module*)this->Creator, this, ServerInstance, L->IPAddr, *L, cached, start_type); - ServerInstance->AddResolver(sr, cached); - } - catch (ModuleException& e) - { - } + delete sr; } } } } -void SpanningTreeUtilities::ReadConfiguration(bool rebind) +void SpanningTreeUtilities::ReadConfiguration() { - ConfigReader* Conf = new ConfigReader(ServerInstance); - if (rebind) - { - for (int j =0; j < Conf->Enumerate("bind"); j++) - { - std::string Type = Conf->ReadValue("bind","type",j); - std::string IP = Conf->ReadValue("bind","address",j); - std::string Port = Conf->ReadValue("bind","port",j); - std::string transport = Conf->ReadValue("bind","transport",j); - if (Type == "servers") - { - irc::portparser portrange(Port, false); - int portno = -1; - while ((portno = portrange.GetToken())) - { - if (IP == "*") - IP = ""; - - if ((!transport.empty()) && (hooks.find(transport.c_str()) == hooks.end())) - { - ServerInstance->Log(DEFAULT,"m_spanningtree: WARNING: Can't find transport type '%s' for port %s:%s - maybe you forgot to load it BEFORE m_spanningtree in your config file? - Skipping this port binding", transport.c_str(), IP.c_str(), Port.c_str()); - break; - } - - TreeSocket* listener = new TreeSocket(this, ServerInstance, IP.c_str(), portno, true, 10, transport.empty() ? NULL : hooks[transport.c_str()]); - if (listener->GetState() == I_LISTENING) - { - ServerInstance->Log(DEFAULT,"m_spanningtree: Binding server port %s:%d successful!", IP.c_str(), portno); - Bindings.push_back(listener); - } - else - { - ServerInstance->Log(DEFAULT,"m_spanningtree: Warning: Failed to bind server port: %s:%d: %s",IP.c_str(), portno, strerror(errno)); - listener->Close(); - DELETE(listener); - } - } - } - } - } - FlatLinks = Conf->ReadFlag("options","flatlinks",0); - HideULines = Conf->ReadFlag("options","hideulines",0); - AnnounceTSChange = Conf->ReadFlag("options","announcets",0); - EnableTimeSync = Conf->ReadFlag("timesync","enable",0); - MasterTime = Conf->ReadFlag("timesync", "master", 0); + ConfigTag* security = ServerInstance->Config->ConfValue("security"); + ConfigTag* options = ServerInstance->Config->ConfValue("options"); + FlatLinks = security->getBool("flatlinks"); + HideULines = security->getBool("hideulines"); + AnnounceTSChange = options->getBool("announcets"); + AllowOptCommon = options->getBool("allowmismatch"); + ChallengeResponse = !security->getBool("disablehmac"); + quiet_bursts = ServerInstance->Config->ConfValue("performance")->getBool("quietbursts"); + PingWarnTime = options->getInt("pingwarning"); + PingFreq = options->getInt("serverpingfreq"); + + if (PingFreq == 0) + PingFreq = 60; + + if (PingWarnTime < 0 || PingWarnTime > PingFreq - 1) + PingWarnTime = 0; + + AutoconnectBlocks.clear(); LinkBlocks.clear(); - ValidIPs.clear(); - for (int j =0; j < Conf->Enumerate("link"); j++) + ConfigTagList tags = ServerInstance->Config->ConfTags("link"); + for(ConfigIter i = tags.first; i != tags.second; ++i) { - Link L; - std::string Allow = Conf->ReadValue("link", "allowmask", j); - L.Name = (Conf->ReadValue("link", "name", j)).c_str(); - L.AllowMask = Allow; - L.IPAddr = Conf->ReadValue("link", "ipaddr", j); - L.FailOver = Conf->ReadValue("link", "failover", j).c_str(); - L.Port = Conf->ReadInteger("link", "port", j, true); - L.SendPass = Conf->ReadValue("link", "sendpass", j); - L.RecvPass = Conf->ReadValue("link", "recvpass", j); - L.AutoConnect = Conf->ReadInteger("link", "autoconnect", j, true); - L.HiddenFromStats = Conf->ReadFlag("link", "hidden", j); - L.Timeout = Conf->ReadInteger("link", "timeout", j, true); - L.Hook = Conf->ReadValue("link", "transport", j); - L.Bind = Conf->ReadValue("link", "bind", j); - L.Hidden = Conf->ReadFlag("link", "hidden", j); - - if ((!L.Hook.empty()) && (hooks.find(L.Hook.c_str()) == hooks.end())) + ConfigTag* tag = i->second; + reference L = new Link(tag); + std::string linkname = tag->getString("name"); + L->Name = linkname.c_str(); + L->AllowMask = tag->getString("allowmask"); + L->IPAddr = tag->getString("ipaddr"); + L->Port = tag->getInt("port"); + L->SendPass = tag->getString("sendpass", tag->getString("password")); + L->RecvPass = tag->getString("recvpass", tag->getString("password")); + L->Fingerprint = tag->getString("fingerprint"); + L->HiddenFromStats = tag->getBool("statshidden"); + L->Timeout = tag->getInt("timeout", 30); + L->Hook = tag->getString("ssl"); + L->Bind = tag->getString("bind"); + L->Hidden = tag->getBool("hidden"); + + if (L->Name.empty()) + throw ModuleException("Invalid configuration, found a link tag without a name!" + (!L->IPAddr.empty() ? " IP address: "+L->IPAddr : "")); + + if (L->Name.find('.') == std::string::npos) + throw ModuleException("The link name '"+assign(L->Name)+"' is invalid as it must contain at least one '.' character"); + + if (L->Name.length() > 64) + throw ModuleException("The link name '"+assign(L->Name)+"' is invalid as it is longer than 64 characters"); + + if (L->RecvPass.empty()) + throw ModuleException("Invalid configuration for server '"+assign(L->Name)+"', recvpass not defined"); + + if (L->SendPass.empty()) + throw ModuleException("Invalid configuration for server '"+assign(L->Name)+"', sendpass not defined"); + + if ((L->SendPass.find(' ') != std::string::npos) || (L->RecvPass.find(' ') != std::string::npos)) + throw ModuleException("Link block '" + assign(L->Name) + "' has a password set that contains a space character which is invalid"); + + if ((L->SendPass[0] == ':') || (L->RecvPass[0] == ':')) + throw ModuleException("Link block '" + assign(L->Name) + "' has a password set that begins with a colon (:) which is invalid"); + + if (L->IPAddr.empty()) { - ServerInstance->Log(DEFAULT,"m_spanningtree: WARNING: Can't find transport type '%s' for link '%s' - maybe you forgot to load it BEFORE m_spanningtree in your config file? Skipping tag completely.", - L.Hook.c_str(), L.Name.c_str()); - continue; - + L->IPAddr = "*"; + ServerInstance->Logs->Log("m_spanningtree", LOG_DEFAULT, "Configuration warning: Link block '" + assign(L->Name) + "' has no IP defined! This will allow any IP to connect as this server, and MAY not be what you want."); } - L.NextConnectTime = time(NULL) + L.AutoConnect; - /* Bugfix by brain, do not allow people to enter bad configurations */ - if (L.Name != ServerInstance->Config->ServerName) - { - if ((L.IPAddr != "") && (L.RecvPass != "") && (L.SendPass != "") && (L.Name != "") && (L.Port)) - { - ValidIPs.push_back(L.IPAddr); - - if (Allow.length()) - ValidIPs.push_back(Allow); - - /* Needs resolving */ - bool ipvalid = true; - QueryType start_type = DNS_QUERY_A; -#ifdef IPV6 - start_type = DNS_QUERY_AAAA; - if (strchr(L.IPAddr.c_str(),':')) - { - in6_addr n; - if (inet_pton(AF_INET6, L.IPAddr.c_str(), &n) < 1) - ipvalid = false; - } - else - { - in_addr n; - if (inet_aton(L.IPAddr.c_str(),&n) < 1) - ipvalid = false; - } -#else - in_addr n; - if (inet_aton(L.IPAddr.c_str(),&n) < 1) - ipvalid = false; -#endif - - if (!ipvalid) - { - try - { - bool cached; - SecurityIPResolver* sr = new SecurityIPResolver((Module*)this->Creator, this, ServerInstance, L.IPAddr, L, cached, start_type); - ServerInstance->AddResolver(sr, cached); - } - catch (ModuleException& e) - { - } - } - - LinkBlocks.push_back(L); - } - else - { - if (L.IPAddr == "") - { - ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', IP address not defined!",L.Name.c_str()); - } - else if (L.RecvPass == "") - { - ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', recvpass not defined!",L.Name.c_str()); - } - else if (L.SendPass == "") - { - ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', sendpass not defined!",L.Name.c_str()); - } - else if (L.Name == "") - { - ServerInstance->Log(DEFAULT,"Invalid configuration, link tag without a name!"); - } - else if (!L.Port) - { - ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', no port specified!",L.Name.c_str()); - } - } - } - else - { - ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', link tag has the same server name as the local server!",L.Name.c_str()); - } + if (!L->Port) + ServerInstance->Logs->Log("m_spanningtree", LOG_DEFAULT, "Configuration warning: Link block '" + assign(L->Name) + "' has no port defined, you will not be able to /connect it."); + + L->Fingerprint.erase(std::remove(L->Fingerprint.begin(), L->Fingerprint.end(), ':'), L->Fingerprint.end()); + LinkBlocks.push_back(L); } - DELETE(Conf); -} -void SpanningTreeUtilities::DoFailOver(Link* x) -{ - if (x->FailOver.length()) + tags = ServerInstance->Config->ConfTags("autoconnect"); + for(ConfigIter i = tags.first; i != tags.second; ++i) { - if (x->FailOver == x->Name) + ConfigTag* tag = i->second; + reference A = new Autoconnect(tag); + A->Period = tag->getInt("period"); + A->NextConnectTime = ServerInstance->Time() + A->Period; + A->position = -1; + irc::spacesepstream ss(tag->getString("server")); + std::string server; + while (ss.GetToken(server)) { - ServerInstance->SNO->WriteToSnoMask('l',"FAILOVER: Some muppet configured the failover for server \002%s\002 to point at itself. Not following it!", x->Name.c_str()); - return; + A->servers.push_back(server); } - Link* TryThisOne = this->FindLink(x->FailOver.c_str()); - if (TryThisOne) + + if (A->Period <= 0) { - ServerInstance->SNO->WriteToSnoMask('l',"FAILOVER: Trying failover link for \002%s\002: \002%s\002...", x->Name.c_str(), TryThisOne->Name.c_str()); - Creator->ConnectServer(TryThisOne); + throw ModuleException("Invalid configuration for autoconnect, period not a positive integer!"); } - else + + if (A->servers.empty()) { - ServerInstance->SNO->WriteToSnoMask('l',"FAILOVER: Invalid failover server specified for server \002%s\002, will not follow!", x->Name.c_str()); + throw ModuleException("Invalid configuration for autoconnect, server cannot be empty!"); } + + AutoconnectBlocks.push_back(A); } + + RefreshIPCache(); } Link* SpanningTreeUtilities::FindLink(const std::string& name) { - for (std::vector::iterator x = LinkBlocks.begin(); x < LinkBlocks.end(); x++) + for (std::vector >::iterator i = LinkBlocks.begin(); i != LinkBlocks.end(); ++i) { - if (ServerInstance->MatchText(x->Name.c_str(), name.c_str())) + Link* x = *i; + if (InspIRCd::Match(x->Name.c_str(), name.c_str())) { - return &(*x); + return x; } } return NULL; } +void SpanningTreeUtilities::SendChannelMessage(const std::string& prefix, Channel* target, const std::string &text, char status, const CUList& exempt_list, const char* message_type) +{ + std::string raw(":"); + raw.append(prefix).append(1, ' ').append(message_type).push_back(' '); + if (status) + raw.push_back(status); + raw.append(target->name).append(" :").append(text); + + TreeServerList list; + this->GetListOfServersForChannel(target, list, status, exempt_list); + for (TreeServerList::iterator i = list.begin(); i != list.end(); ++i) + { + TreeSocket* Sock = (*i)->GetSocket(); + if (Sock) + Sock->WriteLine(raw); + } +}