X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Futils.cpp;h=729f6d4ee5617bada8bc97bcc41ded37fe3eba78;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=680fe5eb188dea250ceede7a02c586ab78df65fa;hpb=7555c1801d81d2f8ac2d4b953135ff980037f6b4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp index 680fe5eb1..729f6d4ee 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-2007 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. @@ -11,27 +11,58 @@ * --------------------------------------------------- */ -#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" #include "inspircd.h" -#include "wildcard.h" +#include "socket.h" #include "xline.h" -#include "transport.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); + 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; + } + } -/* $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 */ + if (!found) + { + ServerInstance->SNO->WriteToSnoMask('l', "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 */ + TreeSocket* ts = new TreeSocket(Utils, newsock, ip, NULL, Hook); + + if (Hook) + Hook->OnStreamSocketAccept(ts, &client, &server); + + return; +} /** Yay for fast searches! * This is hundreds of times faster than recursion @@ -41,33 +72,11 @@ */ TreeServer* SpanningTreeUtilities::FindServer(const std::string &ServerName) { - server_hash::iterator iter; - iter = serverlist.find(ServerName.c_str()); - if (iter != serverlist.end()) - { - return iter->second; - } - else - { - return NULL; - } -} - -TreeServer* SpanningTreeUtilities::FindRemoteBurstServer(TreeServer* Server) -{ - server_hash::iterator iter; - iter = RemoteServersBursting.find(Server->GetName().c_str()); - if (iter != RemoteServersBursting.end()) - return iter->second; - else - return NULL; -} + if (ServerInstance->IsSID(ServerName)) + return this->FindServerID(ServerName); -TreeSocket* SpanningTreeUtilities::FindBurstingServer(const std::string &ServerName) -{ - std::map::iterator iter; - iter = burstingserverlist.find(ServerName.c_str()); - if (iter != burstingserverlist.end()) + server_hash::iterator iter = serverlist.find(ServerName.c_str()); + if (iter != serverlist.end()) { return iter->second; } @@ -77,43 +86,6 @@ TreeSocket* SpanningTreeUtilities::FindBurstingServer(const std::string &ServerN } } -void SpanningTreeUtilities::SetRemoteBursting(TreeServer* Server, bool bursting) -{ - ServerInstance->Log(DEBUG,"Server %s is %sbursting nicknames", Server->GetName().c_str(), bursting ? "" : "no longer "); - server_hash::iterator iter; - iter = RemoteServersBursting.find(Server->GetName().c_str()); - if (bursting) - { - if (iter == RemoteServersBursting.end()) - RemoteServersBursting.erase(iter); - } - else - { - if (iter != RemoteServersBursting.end()) - RemoteServersBursting.insert(make_pair(Server->GetName(), Server)); - } -} - -void SpanningTreeUtilities::AddBurstingServer(const std::string &ServerName, TreeSocket* s) -{ - std::map::iterator iter; - iter = burstingserverlist.find(ServerName.c_str()); - if (iter == burstingserverlist.end()) - burstingserverlist[ServerName.c_str()] = s; -} - -void SpanningTreeUtilities::DelBurstingServer(TreeSocket* s) -{ - for (std::map::iterator iter = burstingserverlist.begin(); iter != burstingserverlist.end(); iter++) - { - if (iter->second == s) - { - burstingserverlist.erase(iter); - return; - } - } -} - /** Returns the locally connected server we must route a * message through to reach server 'ServerName'. This * only applies to one-to-one and not one-to-many routing. @@ -122,7 +94,7 @@ void SpanningTreeUtilities::DelBurstingServer(TreeSocket* s) */ 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) @@ -131,6 +103,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; } } @@ -145,43 +126,33 @@ 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; } +TreeServer* SpanningTreeUtilities::FindServerID(const std::string &id) +{ + server_hash::iterator iter = sidlist.find(id); + if (iter != sidlist.end()) + return iter->second; + else + return NULL; +} + /* A convenient wrapper that returns true if a server exists */ 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(); - - lines_to_apply = 0; - - this->TreeRoot = new TreeServer(this, ServerInstance, ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc); + ServerInstance->Logs->Log("m_spanningtree",DEBUG,"***** Using SID for hash: %s *****", ServerInstance->Config->GetSID().c_str()); - 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); - } - } + this->TreeRoot = new TreeServer(this, ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc, ServerInstance->Config->GetSID()); + ServerUser = new FakeUser(TreeRoot->GetID()); this->ReadConfiguration(true); } @@ -190,10 +161,9 @@ SpanningTreeUtilities::~SpanningTreeUtilities() { for (unsigned int i = 0; i < Bindings.size(); i++) { - ServerInstance->SE->DelFd(Bindings[i]); - Bindings[i]->Close(); - DELETE(Bindings[i]); + delete Bindings[i]; } + while (TreeRoot->ChildCount()) { TreeServer* child_server = TreeRoot->GetChild(0); @@ -202,10 +172,13 @@ SpanningTreeUtilities::~SpanningTreeUtilities() TreeSocket* sock = child_server->GetSocket(); ServerInstance->SE->DelFd(sock); sock->Close(); - DELETE(sock); } } + + // This avoids a collision on reload + ServerUser->uuid = TreeRoot->GetID(); delete TreeRoot; + delete ServerUser; } void SpanningTreeUtilities::AddThisServer(TreeServer* server, TreeServerList &list) @@ -215,27 +188,19 @@ void SpanningTreeUtilities::AddThisServer(TreeServer* server, TreeServerList &li } /* 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) - { - case '@': - ulist = c->GetOppedUsers(); - break; - case '%': - ulist = c->GetHalfoppedUsers(); - break; - case '+': - ulist = c->GetVoicedUsers(); - break; - default: - ulist = c->GetUsers(); - break; - } - 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->first->GetFd() < 0) && (exempt_list.find(i->first) == exempt_list.end())) + if (IS_LOCAL(i->first)) + continue; + + if (status && !strchr(c->GetAllPrefixChars(i->first), status)) + continue; + + if (exempt_list.find(i->first) == exempt_list.end()) { TreeServer* best = this->BestRouteTo(i->first->server); if (best) @@ -245,7 +210,7 @@ void SpanningTreeUtilities::GetListOfServersForChannel(chanrec* 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); @@ -254,7 +219,7 @@ bool SpanningTreeUtilities::DoOneToAllButSenderRaw(const std::string &data, cons if (params.size() >= 2) { /* Prefixes */ - if ((*(params[0].c_str()) == '@') || (*(params[0].c_str()) == '%') || (*(params[0].c_str()) == '+')) + if (ServerInstance->Modes->FindPrefix(params[0][0])) { pfx = params[0][0]; params[0] = params[0].substr(1, params[0].length()-1); @@ -262,10 +227,10 @@ bool SpanningTreeUtilities::DoOneToAllButSenderRaw(const std::string &data, cons if ((*(params[0].c_str()) != '#') && (*(params[0].c_str()) != '$')) { // special routing for private messages/notices - userrec* d = ServerInstance->FindNick(params[0]); + User* d = ServerInstance->FindNick(params[0]); if (d) { - std::deque par; + parameterlist par; par.push_back(params[0]); par.push_back(":"+params[1]); this->DoOneToOne(prefix,command.c_str(),par,d->server); @@ -274,7 +239,7 @@ bool SpanningTreeUtilities::DoOneToAllButSenderRaw(const std::string &data, cons } else if (*(params[0].c_str()) == '$') { - std::deque par; + parameterlist par; par.push_back(params[0]); par.push_back(":"+params[1]); this->DoOneToAllButSender(prefix,command.c_str(),par,omitroute->GetName()); @@ -282,13 +247,13 @@ bool SpanningTreeUtilities::DoOneToAllButSenderRaw(const std::string &data, cons } else { - chanrec* c = ServerInstance->FindChan(params[0]); - userrec* u = ServerInstance->FindNick(prefix); - if (c && u) + 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)); + 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++) @@ -318,7 +283,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; @@ -345,7 +310,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(); @@ -367,21 +332,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) @@ -411,46 +376,53 @@ void SpanningTreeUtilities::RefreshIPCache() ValidIPs.clear(); for (std::vector::iterator L = LinkBlocks.begin(); L != LinkBlocks.end(); L++) { - if ((L->IPAddr != "") && (L->RecvPass != "") && (L->SendPass != "") && (L->Name != "") && (L->Port)) + if (L->IPAddr.empty() || L->RecvPass.empty() || L->SendPass.empty() || L->Name.empty() || !L->Port) { - 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(),':')) + if (L->Name.empty()) { - in6_addr n; - if (inet_pton(AF_INET6, L->IPAddr.c_str(), &n) < 1) - ipvalid = false; + ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"m_spanningtree: Ignoring a malformed link block (all link blocks require a name!)"); } else { - in_addr n; - if (inet_aton(L->IPAddr.c_str(),&n) < 1) - ipvalid = false; + ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"m_spanningtree: Ignoring a link block missing recvpass, sendpass, port or ipaddr."); } -#else + + /* Invalid link block */ + 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; + 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; -#endif - if (!ipvalid) + } + + if (!ipvalid) + { + try + { + bool cached; + SecurityIPResolver* sr = new SecurityIPResolver(Creator, this, L->IPAddr, *L, cached, start_type); + ServerInstance->AddResolver(sr, cached); + } + catch (...) { - 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) - { - } } } } @@ -458,10 +430,40 @@ void SpanningTreeUtilities::RefreshIPCache() void SpanningTreeUtilities::ReadConfiguration(bool rebind) { - ConfigReader* Conf = new ConfigReader(ServerInstance); + ConfigReader* Conf = new ConfigReader; + + /* 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 (int j =0; j < Conf->Enumerate("bind"); j++) + for (unsigned int i = 0; i < Bindings.size(); i++) + { + delete Bindings[i]; + } + 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); @@ -471,60 +473,63 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind) { irc::portparser portrange(Port, false); int portno = -1; + + if (IP == "*") + IP.clear(); + 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()); + 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; } - 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 + ServerSocketListener *listener = new ServerSocketListener(this, portno, (char *)IP.c_str()); + if (listener->GetFd() == -1) { - ServerInstance->Log(DEFAULT,"m_spanningtree: Warning: Failed to bind server port: %s:%d: %s",IP.c_str(), portno, strerror(errno)); - listener->Close(); - DELETE(listener); + delete listener; + continue; } + + if (!transport.empty()) + listener->Hook = hooks[transport.c_str()]; + + Bindings.push_back(listener); } } } } - FlatLinks = Conf->ReadFlag("options","flatlinks",0); - HideULines = Conf->ReadFlag("options","hideulines",0); + FlatLinks = Conf->ReadFlag("security","flatlinks",0); + HideULines = Conf->ReadFlag("security","hideulines",0); AnnounceTSChange = Conf->ReadFlag("options","announcets",0); - EnableTimeSync = Conf->ReadFlag("timesync","enable",0); - MasterTime = Conf->ReadFlag("timesync", "master", 0); - ChallengeResponse = !Conf->ReadFlag("options", "disablehmac", 0); - quiet_bursts = Conf->ReadFlag("options", "quietbursts", 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 (PingWarnTime < 0 || PingWarnTime > 59) + 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++) + for (int j = 0; j < Conf->Enumerate("link"); ++j) { 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.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); @@ -532,124 +537,152 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind) if ((!L.Hook.empty()) && (hooks.find(L.Hook.c_str()) == hooks.end())) { - 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()); + 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) + 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 != "") && (L.RecvPass != "") && (L.SendPass != "") && (L.Name != "") && (L.Port)) - { - ValidIPs.push_back(L.IPAddr); + if (Allow.length()) + ValidIPs.push_back(Allow); - 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 + /* 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; -#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 (!ipvalid) { - 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 == "") + try { - ServerInstance->Log(DEFAULT,"Invalid configuration, link tag without a name!"); + bool cached; + SecurityIPResolver* sr = new SecurityIPResolver(Creator, this, L.IPAddr, L, cached, start_type); + ServerInstance->AddResolver(sr, cached); } - else if (!L.Port) + catch (...) { - 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.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 CoreException("Invalid configuration for server '"+assign(L.Name)+"', recvpass not defined!"); + } + + 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); + } + + 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); + } + + for (int j = 0; j < Conf->Enumerate("autoconnect"); ++j) + { + 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) + { + throw CoreException("Invalid configuration for autoconnect, period not a positive integer!"); } + + if (A.Server.empty()) + { + throw CoreException("Invalid configuration for autoconnect, server cannot be empty!"); + } + + AutoconnectBlocks.push_back(A); } - DELETE(Conf); + + delete Conf; } -void SpanningTreeUtilities::DoFailOver(Link* x) +void SpanningTreeUtilities::DoFailOver(Autoconnect* x) { - if (x->FailOver.length()) + if (x && x->FailOver.length()) { - if (x->FailOver == x->Name) + if (x->FailOver == x->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()); + 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) { - 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); + 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 + { + 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 { - ServerInstance->SNO->WriteToSnoMask('l',"FAILOVER: Invalid failover server specified for server \002%s\002, will not follow!", x->Name.c_str()); + ServerInstance->SNO->WriteToSnoMask('l', "FAILOVER: Invalid failover server specified for server \002%s\002, will not follow!", x->Server.c_str()); } } } Link* SpanningTreeUtilities::FindLink(const std::string& name) { - for (std::vector::iterator x = LinkBlocks.begin(); x < LinkBlocks.end(); x++) + for (std::vector::iterator x = LinkBlocks.begin(); x != LinkBlocks.end(); x++) { - if (ServerInstance->MatchText(x->Name.c_str(), name.c_str())) + if (InspIRCd::Match(x->Name.c_str(), name.c_str())) { return &(*x); } } return NULL; } -