X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Futils.cpp;h=d6dccba14b2e481e2416f4ed45740e5fd3366294;hb=ee4262d276606649489db02007c7a34e8ac75bc4;hp=b37aecc4bfbd68fd935689cf7625a3244b54f453;hpb=164e9d9171850877161ae057764ff8b579bedd36;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp index b37aecc4b..d6dccba14 100644 --- a/src/modules/m_spanningtree/utils.cpp +++ b/src/modules/m_spanningtree/utils.cpp @@ -1,68 +1,55 @@ -/* +------------------------------------+ - * | 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 Daniel De Graaf + * Copyright (C) 2007-2009 Craig Edwards + * Copyright (C) 2008 Robin Burchell + * 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 . */ + #include "inspircd.h" -#include "socket.h" -#include "xline.h" -#include "../transport.h" -#include "socketengine.h" #include "main.h" #include "utils.h" #include "treeserver.h" -#include "link.h" #include "treesocket.h" #include "resolvers.h" +#include "commandbuilder.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 */ +SpanningTreeUtilities* Utils = NULL; /* Create server sockets off a listener. */ -void ServerSocketListener::OnAcceptReady(int newsock) +ModResult ModuleSpanningTree::OnAcceptConnection(int newsock, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) { - bool found = false; - int port; - std::string incomingip; - irc::sockets::satoap(&client, incomingip, port); - char *ip = const_cast(incomingip.c_str()); - - 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; - } - } + if (from->bind_tag->getString("type") != "servers") + return MOD_RES_PASSTHRU; - if (!found) - { - this->ServerInstance->SNO->WriteToSnoMask('l', "Server connection from %s denied (no link blocks with that IP address)", ip); - ServerInstance->SE->Close(newsock); - return; - } - } + std::string incomingip = client->addr(); - if (this->GetIOHook()) + for (std::vector::iterator i = Utils->ValidIPs.begin(); i != Utils->ValidIPs.end(); i++) { - this->GetIOHook()->OnRawSocketAccept(newsock, &client, &server); + 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(newsock, from, client, server); + return MOD_RES_ALLOW; + } } - - /* we don't need a pointer to this, creating it stores it in the necessary places */ - new TreeSocket(this->Utils, this->ServerInstance, newsock, ip, NULL, 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! @@ -73,10 +60,10 @@ void ServerSocketListener::OnAcceptReady(int newsock) */ TreeServer* SpanningTreeUtilities::FindServer(const std::string &ServerName) { - if (this->ServerInstance->IsSID(ServerName)) + if (InspIRCd::IsSID(ServerName)) return this->FindServerID(ServerName); - server_hash::iterator iter = serverlist.find(ServerName.c_str()); + server_hash::iterator iter = serverlist.find(ServerName); if (iter != serverlist.end()) { return iter->second; @@ -95,8 +82,6 @@ TreeServer* SpanningTreeUtilities::FindServer(const std::string &ServerName) */ TreeServer* SpanningTreeUtilities::BestRouteTo(const std::string &ServerName) { - if (ServerName.c_str() == TreeRoot->GetName() || ServerName == ServerInstance->Config->GetSID()) - return NULL; TreeServer* Found = FindServer(ServerName); if (Found) { @@ -108,9 +93,7 @@ TreeServer* SpanningTreeUtilities::BestRouteTo(const std::string &ServerName) User *u = ServerInstance->FindNick(ServerName); if (u) { - Found = FindServer(u->server); - if (Found) - return Found->GetRoute(); + return TreeServer::Get(u)->GetRoute(); } return NULL; @@ -142,58 +125,47 @@ TreeServer* SpanningTreeUtilities::FindServerID(const std::string &id) return NULL; } -/* A convenient wrapper that returns true if a server exists */ -bool SpanningTreeUtilities::IsServer(const std::string &ServerName) +SpanningTreeUtilities::SpanningTreeUtilities(ModuleSpanningTree* C) + : Creator(C), TreeRoot(NULL) { - return (FindServer(ServerName) != NULL); -} - -SpanningTreeUtilities::SpanningTreeUtilities(InspIRCd* Instance, ModuleSpanningTree* C) : ServerInstance(Instance), 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()); - this->ServerUser = new FakeUser(ServerInstance, TreeRoot->GetID()); - - this->ReadConfiguration(true); + ServerInstance->Timers.AddTimer(&RefreshTimer); } -SpanningTreeUtilities::~SpanningTreeUtilities() +CullResult SpanningTreeUtilities::cull() { - for (unsigned int i = 0; i < Bindings.size(); i++) + const TreeServer::ChildServers& children = TreeRoot->GetChildren(); + while (!children.empty()) { - delete Bindings[i]; + TreeSocket* sock = children.front()->GetSocket(); + sock->Close(); } - while (TreeRoot->ChildCount()) + for(std::map >::iterator i = timeoutlist.begin(); i != timeoutlist.end(); ++i) { - TreeServer* child_server = TreeRoot->GetChild(0); - if (child_server) - { - TreeSocket* sock = child_server->GetSocket(); - ServerInstance->SE->DelFd(sock); - sock->Close(); - } + TreeSocket* s = i->first; + s->Close(); } - - // This avoids a collision on reload - ServerUser->uuid = TreeRoot->GetID(); - delete TreeRoot; - delete ServerUser; - ServerInstance->BufferedSocketCull(); + 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(Channel* c, TreeServerList &list, char status, const CUList &exempt_list) +void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeSocketSet& list, char status, const CUList& exempt_list) { + unsigned int minrank = 0; + if (status) + { + PrefixMode* mh = ServerInstance->Modes->FindPrefix(status); + if (mh) + minrank = mh->GetPrefixRank(); + } + const UserMembList *ulist = c->GetUsers(); for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++) @@ -201,318 +173,97 @@ void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeServerLis 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()) { - TreeServer* best = this->BestRouteTo(i->first->server); - if (best) - AddThisServer(best,list); + TreeServer* best = TreeServer::Get(i->first); + list.insert(best->GetSocket()); } } return; } -bool SpanningTreeUtilities::DoOneToAllButSenderRaw(const std::string &data, const std::string &omit, const std::string &prefix, const irc::string &command, parameterlist ¶ms) +void SpanningTreeUtilities::DoOneToAllButSender(const CmdBuilder& params, TreeServer* omitroute) { - 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) - { - parameterlist 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()) == '$') - { - parameterlist 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++) - { - 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; -} + const std::string& FullLine = params.str(); -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; - unsigned int words = params.size(); - for (unsigned int x = 0; x < words; x++) + const TreeServer::ChildServers& children = TreeRoot->GetChildren(); + for (TreeServer::ChildServers::const_iterator i = children.begin(); i != children.end(); ++i) { - FullLine = FullLine + " " + params[x]; - } - unsigned int items = this->TreeRoot->ChildCount(); - for (unsigned int x = 0; x < items; x++) - { - TreeServer* Route = this->TreeRoot->GetChild(x); - // Send the line IF: - // The route has a socket (its a direct connection) - // The route isnt the one to be omitted - // The route isnt the path to the one to be omitted - if ((Route) && (Route->GetSocket()) && (Route->GetName() != omit) && (omitroute != Route)) + TreeServer* Route = *i; + // Send the line if the route isn't the path to the one to be omitted + if (Route != omitroute) { - TreeSocket* Sock = Route->GetSocket(); - if (Sock) - Sock->WriteLine(FullLine); + Route->GetSocket()->WriteLine(FullLine); } } - return true; } -bool SpanningTreeUtilities::DoOneToMany(const std::string &prefix, const std::string &command, parameterlist ¶ms) +bool SpanningTreeUtilities::DoOneToOne(const CmdBuilder& params, const std::string& target) { - std::string FullLine = ":" + prefix + " " + command; - unsigned int words = params.size(); - for (unsigned int x = 0; x < words; x++) - { - FullLine = FullLine + " " + params[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()) - { - TreeSocket* Sock = Route->GetSocket(); - if (Sock) - Sock->WriteLine(FullLine); - } - } - return true; -} + TreeServer* Route = this->BestRouteTo(target); + if (!Route) + return false; -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); + DoOneToOne(params, Route); + return true; } -bool SpanningTreeUtilities::DoOneToAllButSender(const char* prefix, const char* command, parameterlist ¶ms, std::string omit) +void SpanningTreeUtilities::DoOneToOne(const CmdBuilder& params, Server* server) { - 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, parameterlist ¶ms, 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); - } - return true; - } - else - { - return false; - } + TreeServer* ts = static_cast(server); + TreeSocket* sock = ts->GetSocket(); + if (sock) + sock->WriteLine(params); } 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.empty() || L->RecvPass.empty() || L->SendPass.empty() || L->Name.empty() || !L->Port) + Link* L = *i; + if (!L->Port) { - if (L->Name.empty()) - { - ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"m_spanningtree: Ignoring a malformed link block (all link blocks require a name!)"); - } - else - { - ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"m_spanningtree: Ignoring a link block missing recvpass, sendpass, port or ipaddr."); - } - + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Ignoring a link block without a port."); /* Invalid link block */ continue; } - ValidIPs.push_back(L->IPAddr); - - if (L->AllowMask.length()) - ValidIPs.push_back(L->AllowMask); + ValidIPs.insert(ValidIPs.end(), L->AllowMasks.begin(), L->AllowMasks.end()); - /* Needs resolving */ - bool ipvalid = true; - QueryType start_type = DNS_QUERY_A; - 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; - } - - if (!ipvalid) + 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->Creator->DNS, L->IPAddr, L, DNS::QUERY_AAAA); try { - bool cached; - SecurityIPResolver* sr = new SecurityIPResolver((Module*)this->Creator, this, ServerInstance, L->IPAddr, *L, cached, start_type); - ServerInstance->AddResolver(sr, cached); + this->Creator->DNS->Process(sr); } - catch (...) + catch (DNS::Exception &) { + delete sr; } } } } -void SpanningTreeUtilities::ReadConfiguration(bool rebind) +void SpanningTreeUtilities::ReadConfiguration() { - ConfigReader* Conf = new ConfigReader(ServerInstance); - - /* We don't need to worry about these being *unloaded* on the fly, only loaded, - * because we 'use' the interface locking the module in memory. - */ - hooks.clear(); - hooknames.clear(); - 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); - } - } - - if (rebind) - { - for (unsigned int i = 0; i < Bindings.size(); i++) - { - delete Bindings[i]; - } - 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); - 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); - 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); + 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"); + quiet_bursts = ServerInstance->Config->ConfValue("performance")->getBool("quietbursts"); + PingWarnTime = options->getInt("pingwarning"); + PingFreq = options->getInt("serverpingfreq"); if (PingFreq == 0) PingFreq = 60; @@ -522,172 +273,119 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind) 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.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", "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; - - } + ConfigTag* tag = i->second; + reference L = new Link(tag); + std::string linkname = tag->getString("name"); + L->Name = linkname.c_str(); - if (L.Name.find('.') == std::string::npos) - throw CoreException("The link name '"+assign(L.Name)+"' is invalid and must contain at least one '.' character"); + irc::spacesepstream sep = tag->getString("allowmask"); + for (std::string s; sep.GetToken(s);) + L->AllowMasks.push_back(s); - if (L.Name.length() > 64) - throw CoreException("The link name '"+assign(L.Name)+"' is longer than 64 characters!"); + 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->getDuration("timeout", 30); + L->Hook = tag->getString("ssl"); + L->Bind = tag->getString("bind"); + L->Hidden = tag->getBool("hidden"); - if ((!L.IPAddr.empty()) && (!L.RecvPass.empty()) && (!L.SendPass.empty()) && (!L.Name.empty()) && (L.Port)) - { - if (Allow.length()) - ValidIPs.push_back(Allow); + if (L->Name.empty()) + throw ModuleException("Invalid configuration, found a link tag without a name!" + (!L->IPAddr.empty() ? " IP address: "+L->IPAddr : "")); - ValidIPs.push_back(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"); - /* Needs resolving */ - bool ipvalid = true; - QueryType start_type = DNS_QUERY_A; - 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; - } + if (L->Name.length() > ServerInstance->Config->Limits.MaxHost) + throw ModuleException("The link name '"+assign(L->Name)+"' is invalid as it is longer than " + ConvToStr(ServerInstance->Config->Limits.MaxHost) + " characters"); - 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."); - } + if (L->RecvPass.empty()) + throw ModuleException("Invalid configuration for server '"+assign(L->Name)+"', recvpass not defined"); - if (L.RecvPass.empty()) - { - throw CoreException("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.empty()) - { - throw CoreException("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.Name.empty()) - { - throw CoreException("Invalid configuration, link tag without a name! IP address: "+L.IPAddr); - } + 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.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->IPAddr.empty()) + { + L->IPAddr = "*"; + ServerInstance->Logs->Log(MODNAME, 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."); } + if (!L->Port) + ServerInstance->Logs->Log(MODNAME, 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); } - for (int j = 0; j < Conf->Enumerate("autoconnect"); ++j) + tags = ServerInstance->Config->ConfTags("autoconnect"); + for(ConfigIter i = tags.first; i != tags.second; ++i) { - Autoconnect A; - A.Period = Conf->ReadInteger("autoconnect", "period", j, true); - A.Server = Conf->ReadValue("autoconnect", "server", j); - A.FailOver = Conf->ReadValue("autoconnect", "failover", j).c_str(); - - // Fix: Only trip autoconnects if this wouldn't delay autoconnect.. - if (A.NextConnectTime > ((time_t)(ServerInstance->Time() + A.Period))) - A.NextConnectTime = ServerInstance->Time() + A.Period; - - if (A.Period <= 0) + ConfigTag* tag = i->second; + reference A = new Autoconnect(tag); + A->Period = tag->getDuration("period", 60, 1); + A->NextConnectTime = ServerInstance->Time() + A->Period; + A->position = -1; + irc::spacesepstream ss(tag->getString("server")); + std::string server; + while (ss.GetToken(server)) { - throw CoreException("Invalid configuration for autoconnect, period not a positive integer!"); + A->servers.push_back(server); } - if (A.Server.empty()) + if (A->servers.empty()) { - throw CoreException("Invalid configuration for autoconnect, server cannot be empty!"); + throw ModuleException("Invalid configuration for autoconnect, server cannot be empty!"); } AutoconnectBlocks.push_back(A); } - delete Conf; + for (server_hash::const_iterator i = serverlist.begin(); i != serverlist.end(); ++i) + i->second->CheckULine(); + + RefreshIPCache(); } -void SpanningTreeUtilities::DoFailOver(Autoconnect* x) +Link* SpanningTreeUtilities::FindLink(const std::string& name) { - if (x && x->FailOver.length()) + for (std::vector >::iterator i = LinkBlocks.begin(); i != LinkBlocks.end(); ++i) { - if (x->FailOver == x->Server) - { - this->ServerInstance->SNO->WriteToSnoMask('l', "FAILOVER: Some muppet configured the failover for server \002%s\002 to point at itself. Not following it!", x->Server.c_str()); - return; - } - Link* TryThisOne = this->FindLink(x->FailOver.c_str()); - if (TryThisOne) - { - 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 - { - this->ServerInstance->SNO->WriteToSnoMask('l', "FAILOVER: Trying failover link for \002%s\002: \002%s\002...", x->Server.c_str(), TryThisOne->Name.c_str()); - Creator->ConnectServer(TryThisOne, NULL); - } - } - else + Link* x = *i; + if (InspIRCd::Match(x->Name.c_str(), name.c_str(), rfc_case_insensitive_map)) { - this->ServerInstance->SNO->WriteToSnoMask('l', "FAILOVER: Invalid failover server specified for server \002%s\002, will not follow!", x->Server.c_str()); + return x; } } + return NULL; } -Link* SpanningTreeUtilities::FindLink(const std::string& name) +void SpanningTreeUtilities::SendChannelMessage(const std::string& prefix, Channel* target, const std::string& text, char status, const CUList& exempt_list, const char* message_type, TreeSocket* omit) { - for (std::vector::iterator x = LinkBlocks.begin(); x != LinkBlocks.end(); x++) + CmdBuilder msg(prefix, message_type); + msg.push_raw(' '); + if (status != 0) + msg.push_raw(status); + msg.push_raw(target->name).push_last(text); + + TreeSocketSet list; + this->GetListOfServersForChannel(target, list, status, exempt_list); + for (TreeSocketSet::iterator i = list.begin(); i != list.end(); ++i) { - if (InspIRCd::Match(x->Name.c_str(), name.c_str())) - { - return &(*x); - } + TreeSocket* Sock = *i; + if (Sock != omit) + Sock->WriteLine(msg); } - return NULL; }