X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Futils.cpp;h=2271bf374d00fe33aace7def98cf34f497cde470;hb=8cb1935360087b4e38802b837981e5f41e9b87d7;hp=23df8da4cedb8ba20c37bf2fee5de14b657280c1;hpb=164998f1e6e2cb885fb4d630ded29ed5191218c8;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp index 23df8da4c..2271bf374 100644 --- a/src/modules/m_spanningtree/utils.cpp +++ b/src/modules/m_spanningtree/utils.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-2010 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -12,56 +12,36 @@ */ #include "inspircd.h" -#include "commands/cmd_whois.h" -#include "commands/cmd_stats.h" #include "socket.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" - -/* $ModDep: m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */ +#include "main.h" +#include "utils.h" +#include "treeserver.h" +#include "link.h" +#include "treesocket.h" +#include "resolvers.h" /* Create server sockets off a listener. */ -void ServerSocketListener::OnAcceptReady(const std::string &ipconnectedto, int newsock, const std::string &incomingip) +ModResult ModuleSpanningTree::OnAcceptConnection(int newsock, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) { - bool found = false; - char *ip = (char *)incomingip.c_str(); // XXX ugly cast + if (from->bind_tag->getString("type") != "servers") + return MOD_RES_PASSTHRU; - found = (std::find(Utils->ValidIPs.begin(), Utils->ValidIPs.end(), ip) != Utils->ValidIPs.end()); - if (!found) - { - for (std::vector::iterator i = Utils->ValidIPs.begin(); i != Utils->ValidIPs.end(); i++) - { - if (*i == "*" || irc::sockets::MatchCIDR(ip, *i)) - { - found = true; - break; - } - } + std::string incomingip = client->addr(); - if (!found) + for (std::vector::iterator i = Utils->ValidIPs.begin(); i != Utils->ValidIPs.end(); i++) + { + if (*i == "*" || *i == incomingip || irc::sockets::cidr_mask(*i).match(*client)) { - Utils->Creator->RemoteMessage(NULL,"Server connection from %s denied (no link blocks with that IP address)", ip); - ServerInstance->SE->Close(newsock); - return; + /* 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; } } - - if (this->GetIOHook()) - { - this->GetIOHook()->OnRawSocketAccept(newsock, incomingip.c_str(), this->bind_port); - } - - /* we don't need a pointer to this, creating it stores it in the necessary places */ - new TreeSocket(this->Utils, this->ServerInstance, newsock, ip, this->GetIOHook()); - return; + 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! @@ -72,7 +52,7 @@ void ServerSocketListener::OnAcceptReady(const std::string &ipconnectedto, int n */ TreeServer* SpanningTreeUtilities::FindServer(const std::string &ServerName) { - if (this->ServerInstance->IsSID(ServerName)) + if (ServerInstance->IsSID(ServerName)) return this->FindServerID(ServerName); server_hash::iterator iter = serverlist.find(ServerName.c_str()); @@ -147,54 +127,39 @@ bool SpanningTreeUtilities::IsServer(const std::string &ServerName) return (FindServer(ServerName) != NULL); } -SpanningTreeUtilities::SpanningTreeUtilities(InspIRCd* Instance, ModuleSpanningTree* C) : ServerInstance(Instance), Creator(C) +SpanningTreeUtilities::SpanningTreeUtilities(ModuleSpanningTree* C) : Creator(C) { - Bindings.clear(); - ServerInstance->Logs->Log("m_spanningtree",DEBUG,"***** Using SID for hash: %s *****", ServerInstance->Config->GetSID().c_str()); - this->TreeRoot = new TreeServer(this, ServerInstance, ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc, ServerInstance->Config->GetSID()); - - modulelist* ml = ServerInstance->Modules->FindInterface("BufferedSocketHook"); - - /* 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 - * BufferedSocketHook so we know its safe to do this - */ - std::string name = BufferedSocketNameRequest((Module*)Creator, *m).Send(); - /* Build a map of them */ - hooks[name.c_str()] = *m; - hooknames.push_back(name); - } - } - - 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++) - { - 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(); } } + + for(std::map >::iterator i = timeoutlist.begin(); i != timeoutlist.end(); ++i) + { + TreeSocket* s = i->first; + s->Close(); + } + TreeRoot->cull(); + + return classbase::cull(); +} + +SpanningTreeUtilities::~SpanningTreeUtilities() +{ delete TreeRoot; - ServerInstance->BufferedSocketCull(); } void SpanningTreeUtilities::AddThisServer(TreeServer* server, TreeServerList &list) @@ -206,14 +171,22 @@ void SpanningTreeUtilities::AddThisServer(TreeServer* server, TreeServerList &li /* returns a list of DIRECT servernames for a specific channel */ void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeServerList &list, char status, const CUList &exempt_list) { - CUList *ulist = c->GetUsers(); + unsigned int minrank = 0; + if (status) + { + 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 (IS_LOCAL(i->first)) continue; - if (status && !strchr(c->GetAllPrefixChars(i->first), status)) + if (minrank && i->second->getRank() < minrank) continue; if (exempt_list.find(i->first) == exempt_list.end()) @@ -226,65 +199,9 @@ void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeServerLis return; } -bool SpanningTreeUtilities::DoOneToAllButSenderRaw(const std::string &data, const std::string &omit, const std::string &prefix, const irc::string &command, std::deque ¶ms) +bool SpanningTreeUtilities::DoOneToAllButSenderRaw(const std::string &data, const std::string &omit, const std::string &prefix, const irc::string &command, const parameterlist ¶ms) { - char pfx = 0; TreeServer* omitroute = this->BestRouteTo(omit); - if ((command == "NOTICE") || (command == "PRIVMSG")) - { - if (params.size() >= 2) - { - /* Prefixes */ - if (ServerInstance->Modes->FindPrefix(params[0][0])) - { - 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 - User* 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 - { - Channel* c = ServerInstance->FindChan(params[0]); - User* u = ServerInstance->FindNick(prefix); - if (c) - { - CUList elist; - TreeServerList list; - FOREACH_MOD(I_OnBuildExemptList, OnBuildExemptList((command == "PRIVMSG" ? MSG_PRIVMSG : MSG_NOTICE), c, u, pfx, elist, params[1])); - 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; - } - } - } - } unsigned int items =this->TreeRoot->ChildCount(); for (unsigned int x = 0; x < items; x++) { @@ -299,7 +216,7 @@ bool SpanningTreeUtilities::DoOneToAllButSenderRaw(const std::string &data, cons return true; } -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 ¶ms, std::string omit) { TreeServer* omitroute = this->BestRouteTo(omit); std::string FullLine = ":" + prefix + " " + command; @@ -326,7 +243,7 @@ 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(); @@ -348,21 +265,21 @@ bool SpanningTreeUtilities::DoOneToMany(const std::string &prefix, const std::st return true; } -bool SpanningTreeUtilities::DoOneToMany(const char* prefix, const char* command, std::deque ¶ms) +bool SpanningTreeUtilities::DoOneToMany(const char* prefix, const char* command, const parameterlist ¶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) +bool SpanningTreeUtilities::DoOneToAllButSender(const char* prefix, const char* command, const parameterlist ¶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 ¶ms, std::string target) { TreeServer* Route = this->BestRouteTo(target); if (Route) @@ -390,8 +307,9 @@ 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) { + Link* L = *i; if (L->IPAddr.empty() || L->RecvPass.empty() || L->SendPass.empty() || L->Name.empty() || !L->Port) { if (L->Name.empty()) @@ -407,36 +325,19 @@ void SpanningTreeUtilities::RefreshIPCache() continue; } - ValidIPs.push_back(L->IPAddr); - 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; - } + irc::sockets::sockaddrs dummy; + bool ipvalid = irc::sockets::aptosa(L->IPAddr, L->Port, dummy); + if (ipvalid) + ValidIPs.push_back(L->IPAddr); else -#endif - { - in_addr n; - if (inet_aton(L->IPAddr.c_str(),&n) < 1) - ipvalid = false; - } - - if (!ipvalid) { try { bool cached; - SecurityIPResolver* sr = new SecurityIPResolver((Module*)this->Creator, this, ServerInstance, L->IPAddr, *L, cached, start_type); + SecurityIPResolver* sr = new SecurityIPResolver(Creator, this, L->IPAddr, L, cached, DNS_QUERY_AAAA); ServerInstance->AddResolver(sr, cached); } catch (...) @@ -446,62 +347,18 @@ void SpanningTreeUtilities::RefreshIPCache() } } -void SpanningTreeUtilities::ReadConfiguration(bool rebind) +void SpanningTreeUtilities::ReadConfiguration() { - ConfigReader* Conf = new ConfigReader(ServerInstance); - if (rebind) - { - for (unsigned int i = 0; i < Bindings.size(); i++) - { - delete Bindings[i]; - } - ServerInstance->BufferedSocketCull(); - Bindings.clear(); + ConfigReader Conf; - 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; - - if (IP == "*") - IP.clear(); - - while ((portno = portrange.GetToken())) - { - if ((!transport.empty()) && (hooks.find(transport.c_str()) == hooks.end())) - { - throw CoreException("Can't find transport type '"+transport+"' for port "+IP+":"+Port+" - maybe you forgot to load it BEFORE m_spanningtree in your config file?"); - break; - } - - ServerSocketListener *listener = new ServerSocketListener(ServerInstance, this, portno, (char *)IP.c_str()); - if (listener->GetFd() == -1) - { - delete listener; - continue; - } - - if (!transport.empty()) - listener->AddIOHook(hooks[transport.c_str()]); - - Bindings.push_back(listener); - } - } - } - } - FlatLinks = Conf->ReadFlag("security","flatlinks",0); - HideULines = Conf->ReadFlag("security","hideulines",0); - AnnounceTSChange = Conf->ReadFlag("options","announcets",0); - ChallengeResponse = !Conf->ReadFlag("security", "disablehmac", 0); - quiet_bursts = Conf->ReadFlag("performance", "quietbursts", 0); - PingWarnTime = Conf->ReadInteger("options", "pingwarning", 0, true); - PingFreq = Conf->ReadInteger("options", "serverpingfreq", 0, true); + FlatLinks = Conf.ReadFlag("security","flatlinks",0); + HideULines = Conf.ReadFlag("security","hideulines",0); + AnnounceTSChange = Conf.ReadFlag("options","announcets",0); + AllowOptCommon = Conf.ReadFlag("options", "allowmismatch", 0); + ChallengeResponse = !Conf.ReadFlag("security", "disablehmac", 0); + quiet_bursts = Conf.ReadFlag("performance", "quietbursts", 0); + PingWarnTime = Conf.ReadInteger("options", "pingwarning", 0, true); + PingFreq = Conf.ReadInteger("options", "serverpingfreq", 0, true); if (PingFreq == 0) PingFreq = 60; @@ -509,156 +366,118 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind) 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", "statshidden", 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); + L->Name = tag->getString("name").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"); + L->Hook = tag->getString("ssl"); + L->Bind = tag->getString("bind"); + L->Hidden = tag->getBool("hidden"); + + if (L->Name.find('.') == std::string::npos) + throw CoreException("The link name '"+assign(L->Name)+"' is invalid and must contain at least one '.' character"); + + if (L->Name.length() > 64) + throw CoreException("The link name '"+assign(L->Name)+"' is longer than 64 characters!"); + + if (L->Fingerprint.find(':') != std::string::npos) { - throw CoreException("Can't find transport type '"+L.Hook+"' for link '"+assign(L.Name)+"' - maybe you forgot to load it BEFORE m_spanningtree in your config file? Skipping tag completely."); - continue; - + std::string tmp = L->Fingerprint; + L->Fingerprint.clear(); + for(unsigned int j=0; j < tmp.length(); j++) + if (tmp[j] != ':') + L->Fingerprint.push_back(tmp[j]); } - L.NextConnectTime = ServerInstance->Time() + L.AutoConnect; - - if (L.Name.find('.') == std::string::npos) - throw CoreException("The link name '"+assign(L.Name)+"' is invalid and must contain at least one '.' character"); - - if (L.Name.length() > 64) - throw CoreException("The link name '"+assign(L.Name)+"' is longer than 64 characters!"); - - if ((!L.IPAddr.empty()) && (!L.RecvPass.empty()) && (!L.SendPass.empty()) && (!L.Name.empty()) && (L.Port)) + if ((!L->IPAddr.empty()) && (!L->RecvPass.empty()) && (!L->SendPass.empty()) && (!L->Name.empty()) && (L->Port)) { - if (Allow.length()) - ValidIPs.push_back(Allow); - - ValidIPs.push_back(L.IPAddr); - - /* 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 (...) - { - } - } + ValidIPs.push_back(L->IPAddr); } else { - if (L.IPAddr.empty()) + if (L->IPAddr.empty()) { - L.IPAddr = "*"; + L->IPAddr = "*"; ValidIPs.push_back("*"); - ServerInstance->Logs->Log("m_spanningtree",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."); + ServerInstance->Logs->Log("m_spanningtree",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."); } - if (L.RecvPass.empty()) + if (L->RecvPass.empty()) { - throw CoreException("Invalid configuration for server '"+assign(L.Name)+"', recvpass not defined!"); + throw CoreException("Invalid configuration for server '"+assign(L->Name)+"', recvpass not defined!"); } - if (L.SendPass.empty()) + if (L->SendPass.empty()) { - throw CoreException("Invalid configuration for server '"+assign(L.Name)+"', sendpass not defined!"); + throw CoreException("Invalid configuration for server '"+assign(L->Name)+"', sendpass not defined!"); } - if (L.Name.empty()) + if (L->Name.empty()) { - throw CoreException("Invalid configuration, link tag without a name! IP address: "+L.IPAddr); + throw CoreException("Invalid configuration, link tag without a name! IP address: "+L->IPAddr); } - if (!L.Port) + if (!L->Port) { - ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Configuration warning: Link block " + assign(L.Name) + " has no port defined, you will not be able to /connect it."); + ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Configuration warning: Link block " + assign(L->Name) + " has no port defined, you will not be able to /connect it."); } } 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)) { - Creator->RemoteMessage(NULL,"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) { - TreeServer* CheckDupe = this->FindServer(x->FailOver.c_str()); - if (CheckDupe) - { - ServerInstance->Logs->Log("m_spanningtree",DEBUG,"Skipping existing failover: %s", x->FailOver.c_str()); - } - else - { - Creator->RemoteMessage(NULL,"FAILOVER: Trying failover link for \002%s\002: \002%s\002...", x->Name.c_str(), TryThisOne->Name.c_str()); - Creator->ConnectServer(TryThisOne); - } + throw CoreException("Invalid configuration for autoconnect, period not a positive integer!"); } - else + + if (A->servers.empty()) { - Creator->RemoteMessage(NULL,"FAILOVER: Invalid failover server specified for server \002%s\002, will not follow!", x->Name.c_str()); + throw CoreException("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) { + Link* x = *i; if (InspIRCd::Match(x->Name.c_str(), name.c_str())) { - return &(*x); + return x; } } return NULL;