X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Futils.cpp;h=1e0788623e5d10f4c61493c05c68ea5a079bff71;hb=b0ff1060952215c375ec793206e76344034875d8;hp=a27dd5f654b3a83d6e216aed26b43481448ed675;hpb=1becbd4f0347de2cc4d5d4432bba41ea932689de;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp index a27dd5f65..1e0788623 100644 --- a/src/modules/m_spanningtree/utils.cpp +++ b/src/modules/m_spanningtree/utils.cpp @@ -11,14 +11,10 @@ * --------------------------------------------------- */ -#include "configreader.h" -#include "users.h" -#include "channels.h" -#include "modules.h" +#include "inspircd.h" #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" -#include "inspircd.h" #include "wildcard.h" #include "xline.h" #include "transport.h" @@ -33,6 +29,14 @@ /* $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 */ +bool SpanningTreeUtilities::IsSID(const std::string &str) +{ + /* Returns true if the string given is exactly 3 characters long, + * starts with a digit, and has no '.' in the other 2 + */ + return ((str.length() == 3) && isdigit(str[0]) && (str[1] != '.' && str[2] != '.')); +} + /** Yay for fast searches! * This is hundreds of times faster than recursion * or even scanning a linked list, especially when @@ -41,8 +45,10 @@ */ TreeServer* SpanningTreeUtilities::FindServer(const std::string &ServerName) { - server_hash::iterator iter; - iter = serverlist.find(ServerName.c_str()); + if (IsSID(ServerName)) + return this->FindServerID(ServerName); + + server_hash::iterator iter = serverlist.find(ServerName.c_str()); if (iter != serverlist.end()) { return iter->second; @@ -55,8 +61,7 @@ TreeServer* SpanningTreeUtilities::FindServer(const std::string &ServerName) TreeServer* SpanningTreeUtilities::FindRemoteBurstServer(TreeServer* Server) { - server_hash::iterator iter; - iter = RemoteServersBursting.find(Server->GetName().c_str()); + server_hash::iterator iter = RemoteServersBursting.find(Server->GetName().c_str()); if (iter != RemoteServersBursting.end()) return iter->second; else @@ -79,25 +84,25 @@ 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()); + server_hash::iterator iter = RemoteServersBursting.find(Server->GetName().c_str()); if (bursting) { if (iter == RemoteServersBursting.end()) - RemoteServersBursting.erase(iter); + RemoteServersBursting.insert(make_pair(Server->GetName(), Server)); + else return; } else { if (iter != RemoteServersBursting.end()) - RemoteServersBursting.insert(make_pair(Server->GetName(), Server)); + RemoteServersBursting.erase(iter); + else return; } + ServerInstance->Log(DEBUG,"Server %s is %sbursting nicknames", Server->GetName().c_str(), bursting ? "" : "no longer "); } void SpanningTreeUtilities::AddBurstingServer(const std::string &ServerName, TreeSocket* s) { - std::map::iterator iter; - iter = burstingserverlist.find(ServerName.c_str()); + std::map::iterator iter = burstingserverlist.find(ServerName.c_str()); if (iter == burstingserverlist.end()) burstingserverlist[ServerName.c_str()] = s; } @@ -151,6 +156,16 @@ TreeServer* SpanningTreeUtilities::FindServerMask(const std::string &ServerName) return NULL; } +TreeServer* SpanningTreeUtilities::FindServerID(const std::string &id) +{ + ServerInstance->Log(DEBUG,"Looking for id: %s", id.c_str()); + 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) { @@ -163,7 +178,9 @@ SpanningTreeUtilities::SpanningTreeUtilities(InspIRCd* Instance, ModuleSpanningT lines_to_apply = 0; - this->TreeRoot = new TreeServer(this, ServerInstance, ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc); + ServerInstance->Log(DEBUG, "SpanningTreeUtilities: SID: %s", OurSID.c_str()); + + this->TreeRoot = new TreeServer(this, ServerInstance, ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc, ServerInstance->Config->GetSID()); modulelist* ml = ServerInstance->FindInterface("InspSocketHook"); @@ -192,7 +209,6 @@ SpanningTreeUtilities::~SpanningTreeUtilities() { ServerInstance->SE->DelFd(Bindings[i]); Bindings[i]->Close(); - DELETE(Bindings[i]); } while (TreeRoot->ChildCount()) { @@ -202,10 +218,10 @@ SpanningTreeUtilities::~SpanningTreeUtilities() TreeSocket* sock = child_server->GetSocket(); ServerInstance->SE->DelFd(sock); sock->Close(); - DELETE(sock); } } delete TreeRoot; + ServerInstance->InspSocketCull(); } void SpanningTreeUtilities::AddThisServer(TreeServer* server, TreeServerList &list) @@ -411,7 +427,7 @@ 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); @@ -430,16 +446,12 @@ void SpanningTreeUtilities::RefreshIPCache() ipvalid = false; } else +#endif { 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 @@ -448,7 +460,7 @@ void SpanningTreeUtilities::RefreshIPCache() SecurityIPResolver* sr = new SecurityIPResolver((Module*)this->Creator, this, ServerInstance, L->IPAddr, *L, cached, start_type); ServerInstance->AddResolver(sr, cached); } - catch (ModuleException& e) + catch (...) { } } @@ -461,7 +473,7 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind) ConfigReader* Conf = new ConfigReader(ServerInstance); if (rebind) { - for (int j =0; j < Conf->Enumerate("bind"); j++) + 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); @@ -474,7 +486,7 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind) while ((portno = portrange.GetToken())) { if (IP == "*") - IP = ""; + IP.clear(); if ((!transport.empty()) && (hooks.find(transport.c_str()) == hooks.end())) { @@ -492,7 +504,6 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind) { ServerInstance->Log(DEFAULT,"m_spanningtree: Warning: Failed to bind server port: %s:%d: %s",IP.c_str(), portno, strerror(errno)); listener->Close(); - DELETE(listener); } } } @@ -505,9 +516,18 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind) MasterTime = Conf->ReadFlag("timesync", "master", 0); ChallengeResponse = !Conf->ReadFlag("options", "disablehmac", 0); quiet_bursts = Conf->ReadFlag("options", "quietbursts", 0); + PingWarnTime = Conf->ReadInteger("options", "pingwarning", 0, true); + PingFreq = Conf->ReadInteger("options", "serverpingfreq", 0, true); + + if (PingFreq == 0) + PingFreq = 60; + + if (PingWarnTime < 0 || PingWarnTime > PingFreq - 1) + PingWarnTime = 0; + 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); @@ -519,7 +539,7 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind) 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.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); @@ -537,7 +557,7 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind) /* Bugfix by brain, do not allow people to enter bad configurations */ if (L.Name != ServerInstance->Config->ServerName) { - if ((L.IPAddr != "") && (L.RecvPass != "") && (L.SendPass != "") && (L.Name != "") && (L.Port)) + if ((!L.IPAddr.empty()) && (!L.RecvPass.empty()) && (!L.SendPass.empty()) && (!L.Name.empty()) && (L.Port)) { ValidIPs.push_back(L.IPAddr); @@ -575,7 +595,7 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind) SecurityIPResolver* sr = new SecurityIPResolver((Module*)this->Creator, this, ServerInstance, L.IPAddr, L, cached, start_type); ServerInstance->AddResolver(sr, cached); } - catch (ModuleException& e) + catch (...) { } } @@ -584,19 +604,19 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind) } else { - if (L.IPAddr == "") + if (L.IPAddr.empty()) { ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', IP address not defined!",L.Name.c_str()); } - else if (L.RecvPass == "") + else if (L.RecvPass.empty()) { ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', recvpass not defined!",L.Name.c_str()); } - else if (L.SendPass == "") + else if (L.SendPass.empty()) { ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', sendpass not defined!",L.Name.c_str()); } - else if (L.Name == "") + else if (L.Name.empty()) { ServerInstance->Log(DEFAULT,"Invalid configuration, link tag without a name!"); } @@ -620,18 +640,18 @@ void SpanningTreeUtilities::DoFailOver(Link* x) { if (x->FailOver == x->Name) { - 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()); + 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; } 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->RemoteMessage(NULL,"FAILOVER: Trying failover link for \002%s\002: \002%s\002...", x->Name.c_str(), TryThisOne->Name.c_str()); Creator->ConnectServer(TryThisOne); } else { - ServerInstance->SNO->WriteToSnoMask('l',"FAILOVER: Invalid failover server specified for server \002%s\002, will not follow!", x->Name.c_str()); + Creator->RemoteMessage(NULL,"FAILOVER: Invalid failover server specified for server \002%s\002, will not follow!", x->Name.c_str()); } } }