X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Futils.cpp;h=024605a7918d0d009348ea051d90f966537c7679;hb=9db7af579c46a9f0379fdf71fb773a0a76a94846;hp=acf822bf78085ee4bc29d94633e8da20c7564402;hpb=517a26252a091eaee0149458a86fc43731bce618;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp index acf822bf7..024605a79 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-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -12,22 +12,52 @@ */ #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" +#include "main.h" +#include "utils.h" +#include "treeserver.h" +#include "link.h" +#include "treesocket.h" +#include "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 */ +/* Create server sockets off a listener. */ +void ServerSocketListener::OnAcceptReady(int newsock) +{ + bool found = false; + int port; + std::string incomingip; + irc::sockets::satoap(&client, incomingip, port); + + found = (std::find(Utils->ValidIPs.begin(), Utils->ValidIPs.end(), incomingip) != Utils->ValidIPs.end()); + if (!found) + { + for (std::vector::iterator i = Utils->ValidIPs.begin(); i != Utils->ValidIPs.end(); i++) + { + if (*i == "*" || irc::sockets::MatchCIDR(incomingip, *i)) + { + found = true; + break; + } + } + + if (!found) + { + ServerInstance->SNO->WriteToSnoMask('l', "Server connection from %s denied (no link blocks with that IP address)", incomingip.c_str()); + 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, this, &client, &server); +} + /** Yay for fast searches! * This is hundreds of times faster than recursion * or even scanning a linked list, especially when @@ -36,7 +66,7 @@ */ 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()); @@ -111,54 +141,50 @@ 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->TreeRoot = new TreeServer(this, ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc, ServerInstance->Config->GetSID()); + ServerUser = new FakeUser(TreeRoot->GetID()); this->ReadConfiguration(true); } -SpanningTreeUtilities::~SpanningTreeUtilities() +CullResult SpanningTreeUtilities::cull() { - for (unsigned int i = 0; i < Bindings.size(); i++) + for (unsigned int i = 0; i < ServerInstance->ports.size(); i++) { - ServerInstance->SE->DelFd(Bindings[i]); - Bindings[i]->Close(); + if (ServerInstance->ports[i]->type == "servers") + ServerInstance->ports[i]->cull(); } + while (TreeRoot->ChildCount()) { TreeServer* child_server = TreeRoot->GetChild(0); if (child_server) { TreeSocket* sock = child_server->GetSocket(); - ServerInstance->SE->DelFd(sock); sock->Close(); + ServerInstance->GlobalCulls.AddItem(sock); } } + + ServerUser->uuid = TreeRoot->GetID(); + ServerUser->cull(); + delete ServerUser; + return classbase::cull(); +} + +SpanningTreeUtilities::~SpanningTreeUtilities() +{ + for (unsigned int i = 0; i < ServerInstance->ports.size(); i++) + { + if (ServerInstance->ports[i]->type == "servers") + delete ServerInstance->ports[i]; + } + delete TreeRoot; - ServerInstance->BufferedSocketCull(); } void SpanningTreeUtilities::AddThisServer(TreeServer* server, TreeServerList &list) @@ -170,9 +196,9 @@ 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(); + const UserMembList *ulist = c->GetUsers(); - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) + for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++) { if (IS_LOCAL(i->first)) continue; @@ -190,65 +216,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, 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++) { @@ -263,7 +233,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, parameterlist ¶ms, std::string omit) { TreeServer* omitroute = this->BestRouteTo(omit); std::string FullLine = ":" + prefix + " " + command; @@ -290,7 +260,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, parameterlist ¶ms) { std::string FullLine = ":" + prefix + " " + command; unsigned int words = params.size(); @@ -312,21 +282,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, 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, 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, parameterlist ¶ms, std::string target) { TreeServer* Route = this->BestRouteTo(target); if (Route) @@ -354,8 +324,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()) @@ -379,7 +350,6 @@ void SpanningTreeUtilities::RefreshIPCache() /* Needs resolving */ bool ipvalid = true; QueryType start_type = DNS_QUERY_A; -#ifdef IPV6 start_type = DNS_QUERY_AAAA; if (strchr(L->IPAddr.c_str(),':')) { @@ -388,7 +358,6 @@ void SpanningTreeUtilities::RefreshIPCache() ipvalid = false; } else -#endif { in_addr n; if (inet_aton(L->IPAddr.c_str(),&n) < 1) @@ -400,7 +369,7 @@ void SpanningTreeUtilities::RefreshIPCache() 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, start_type); ServerInstance->AddResolver(sr, cached); } catch (...) @@ -412,23 +381,16 @@ void SpanningTreeUtilities::RefreshIPCache() void SpanningTreeUtilities::ReadConfiguration(bool rebind) { - ConfigReader* Conf = new ConfigReader(ServerInstance); + ConfigReader* Conf = new ConfigReader; + if (rebind) { - for (unsigned int i = 0; i < Bindings.size(); i++) - { - ServerInstance->SE->DelFd(Bindings[i]); - Bindings[i]->Close(); - } - ServerInstance->BufferedSocketCull(); - Bindings.clear(); - 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); + std::string ssl = Conf->ReadValue("bind","ssl",j); if (Type == "servers") { irc::portparser portrange(Port, false); @@ -439,23 +401,14 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind) while ((portno = portrange.GetToken())) { - if ((!transport.empty()) && (hooks.find(transport.c_str()) == hooks.end())) + ServerSocketListener *listener = new ServerSocketListener(this, portno, IP, ssl); + if (listener->GetFd() == -1) { - 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; + delete listener; + continue; } - 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->Logs->Log("m_spanningtree",DEFAULT,"m_spanningtree: Binding server port %s:%d successful!", IP.c_str(), portno); - Bindings.push_back(listener); - } - else - { - ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"m_spanningtree: Warning: Failed to bind server port: %s:%d: %s",IP.c_str(), portno, strerror(errno)); - listener->Close(); - } + ServerInstance->ports.push_back(listener); } } } @@ -463,6 +416,7 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind) 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); @@ -474,164 +428,140 @@ 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++) + for (int j = 0; j < Conf->Enumerate("link"); ++j) { - Link L; + reference L = new Link; 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())) - { - 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; - - } - - L.NextConnectTime = time(NULL) + L.AutoConnect; - /* Bugfix by brain, do not allow people to enter bad configurations */ - if (L.Name != ServerInstance->Config->ServerName) + L->Name = (Conf->ReadValue("link", "name", j)).c_str(); + L->AllowMask = Allow; + L->IPAddr = Conf->ReadValue("link", "ipaddr", j); + L->Port = Conf->ReadInteger("link", "port", j, true); + L->SendPass = Conf->ReadValue("link", "sendpass", j); + L->RecvPass = Conf->ReadValue("link", "recvpass", j); + L->Fingerprint = Conf->ReadValue("link", "fingerprint", j); + L->HiddenFromStats = Conf->ReadFlag("link", "statshidden", j); + L->Timeout = Conf->ReadInteger("link", "timeout", j, true); + L->Hook = Conf->ReadValue("link", "ssl", j); + L->Bind = Conf->ReadValue("link", "bind", j); + L->Hidden = Conf->ReadFlag("link", "hidden", j); + + 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.Name.find('.') == std::string::npos) - throw CoreException("The link name '"+assign(L.Name)+"' is invalid and must contain at least one '.' character"); + if (Allow.length()) + ValidIPs.push_back(Allow); - if (L.Name.length() > 64) - throw CoreException("The link name '"+assign(L.Name)+"' is longer than 64 characters!"); + ValidIPs.push_back(L->IPAddr); - if ((!L.IPAddr.empty()) && (!L.RecvPass.empty()) && (!L.SendPass.empty()) && (!L.Name.empty()) && (L.Port)) + /* Needs resolving */ + bool ipvalid = true; + QueryType start_type = DNS_QUERY_A; + start_type = DNS_QUERY_AAAA; + if (strchr(L->IPAddr.c_str(),':')) { - 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) + in6_addr n; + if (inet_pton(AF_INET6, 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 (...) - { - } - } } else { - if (L.IPAddr.empty()) - { - 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."); - } + in_addr n; + if (inet_aton(L->IPAddr.c_str(),&n) < 1) + ipvalid = false; + } - if (L.RecvPass.empty()) + if (!ipvalid) + { + try { - throw CoreException("Invalid configuration for server '"+assign(L.Name)+"', recvpass not defined!"); + bool cached; + SecurityIPResolver* sr = new SecurityIPResolver(Creator, this, L->IPAddr, L, cached, start_type); + ServerInstance->AddResolver(sr, cached); } - - if (L.SendPass.empty()) + catch (...) { - throw CoreException("Invalid configuration for server '"+assign(L.Name)+"', sendpass not defined!"); } + } + } + else + { + if (L->IPAddr.empty()) + { + 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."); + } - if (L.Name.empty()) - { - throw CoreException("Invalid configuration, link tag without a name! IP address: "+L.IPAddr); - } + if (L->RecvPass.empty()) + { + throw CoreException("Invalid configuration for server '"+assign(L->Name)+"', recvpass not defined!"); + } - 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."); - } + if (L->SendPass.empty()) + { + throw CoreException("Invalid configuration for server '"+assign(L->Name)+"', sendpass not defined!"); } + if (L->Name.empty()) + { + throw CoreException("Invalid configuration, link tag without a name! IP address: "+L->IPAddr); + } - LinkBlocks.push_back(L); - } - else - { - throw CoreException("Invalid configuration for server '"+assign(L.Name)+"', link tag has the same server name as the local server!"); + 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."); + } } + + LinkBlocks.push_back(L); } - delete Conf; -} -void SpanningTreeUtilities::DoFailOver(Link* x) -{ - if (x->FailOver.length()) + for (int j = 0; j < Conf->Enumerate("autoconnect"); ++j) { - if (x->FailOver == x->Name) + reference A = new Autoconnect; + A->Period = Conf->ReadInteger("autoconnect", "period", j, true); + A->NextConnectTime = ServerInstance->Time() + A->Period; + A->position = -1; + std::string servers = Conf->ReadValue("autoconnect", "server", j); + irc::spacesepstream ss(servers); + 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); } + + delete Conf; } 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;