X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Futils.cpp;h=daafa7efec36ce87a63ed80fb6fda39a07030332;hb=085777cf272cd74e44abec70c0a87003429e2fd3;hp=c1c32e80a39037ea2aab83d21feb2bdbb2e54cfa;hpb=c0aba5b728b0a921d95ec120aa638dab1520b42f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp index c1c32e80a..daafa7efe 100644 --- a/src/modules/m_spanningtree/utils.cpp +++ b/src/modules/m_spanningtree/utils.cpp @@ -1,9 +1,13 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2009 Daniel De Graaf - * Copyright (C) 2007-2009 Craig Edwards - * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2013-2014, 2017-2019 Sadie Powell + * Copyright (C) 2013 Adam + * Copyright (C) 2012-2016 Attila Molnar + * Copyright (C) 2012 Robby + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2008-2009 Robin Burchell + * Copyright (C) 2007-2008, 2010 Craig Edwards * Copyright (C) 2007 Dennis Friis * * This file is part of InspIRCd. InspIRCd is free software: you can @@ -33,7 +37,7 @@ SpanningTreeUtilities* Utils = NULL; ModResult ModuleSpanningTree::OnAcceptConnection(int newsock, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) { - if (from->bind_tag->getString("type") != "servers") + if (!stdalgo::string::equalsci(from->bind_tag->getString("type"), "servers")) return MOD_RES_PASSTHRU; std::string incomingip = client->addr(); @@ -118,7 +122,7 @@ CullResult SpanningTreeUtilities::cull() sock->Close(); } - for(std::map >::iterator i = timeoutlist.begin(); i != timeoutlist.end(); ++i) + for(TimeoutList::iterator i = timeoutlist.begin(); i != timeoutlist.end(); ++i) { TreeSocket* s = i->first; s->Close(); @@ -144,6 +148,7 @@ void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeSocketSet minrank = mh->GetPrefixRank(); } + TreeServer::ChildServers children = TreeRoot->GetChildren(); const Channel::MemberMap& ulist = c->GetUsers(); for (Channel::MemberMap::const_iterator i = ulist.begin(); i != ulist.end(); ++i) { @@ -157,9 +162,22 @@ void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeSocketSet { TreeServer* best = TreeServer::Get(i->first); list.insert(best->GetSocket()); + + TreeServer::ChildServers::iterator citer = std::find(children.begin(), children.end(), best); + if (citer != children.end()) + children.erase(citer); } } - return; + + // Check whether the servers which do not have users in the channel might need this message. This + // is used to keep the chanhistory module synchronised between servers. + for (TreeServer::ChildServers::const_iterator i = children.begin(); i != children.end(); ++i) + { + ModResult result; + FIRST_MOD_RESULT_CUSTOM(Creator->GetBroadcastEventProvider(), ServerProtocol::BroadcastEventListener, OnBroadcastMessage, result, (c, *i)); + if (result == MOD_RES_ALLOW) + list.insert((*i)->GetSocket()); + } } void SpanningTreeUtilities::DoOneToAllButSender(const CmdBuilder& params, TreeServer* omitroute) @@ -226,16 +244,14 @@ void SpanningTreeUtilities::ReadConfiguration() ConfigTag* options = ServerInstance->Config->ConfValue("options"); FlatLinks = security->getBool("flatlinks"); HideULines = security->getBool("hideulines"); + HideSplits = security->getBool("hidesplits"); 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; + PingWarnTime = options->getDuration("pingwarning", 15); + PingFreq = options->getDuration("serverpingfreq", 60, 1); - if (PingWarnTime < 0 || PingWarnTime > PingFreq - 1) + if (PingWarnTime >= PingFreq) PingWarnTime = 0; AutoconnectBlocks.clear(); @@ -245,21 +261,20 @@ void SpanningTreeUtilities::ReadConfiguration() { ConfigTag* tag = i->second; reference L = new Link(tag); - std::string linkname = tag->getString("name"); - L->Name = linkname.c_str(); irc::spacesepstream sep = tag->getString("allowmask"); for (std::string s; sep.GetToken(s);) L->AllowMasks.push_back(s); + L->Name = tag->getString("name"); L->IPAddr = tag->getString("ipaddr"); - L->Port = tag->getInt("port"); + L->Port = tag->getUInt("port", 0); 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->Hook = tag->getString("sslprofile", tag->getString("ssl")); L->Bind = tag->getString("bind"); L->Hidden = tag->getBool("hidden"); @@ -290,7 +305,7 @@ void SpanningTreeUtilities::ReadConfiguration() ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Configuration warning: Link block '" + 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) + if (!L->Port && L->IPAddr.find('/') == std::string::npos) ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Configuration warning: Link block '" + 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()); @@ -339,13 +354,16 @@ Link* SpanningTreeUtilities::FindLink(const std::string& name) return NULL; } -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) +void SpanningTreeUtilities::SendChannelMessage(User* source, Channel* target, const std::string& text, char status, const ClientProtocol::TagMap& tags, const CUList& exempt_list, const char* message_type, TreeSocket* omit) { - CmdBuilder msg(prefix, message_type); + CmdBuilder msg(source, message_type); + msg.push_tags(tags); msg.push_raw(' '); if (status != 0) msg.push_raw(status); - msg.push_raw(target->name).push_last(text); + msg.push_raw(target->name); + if (!text.empty()) + msg.push_last(text); TreeSocketSet list; this->GetListOfServersForChannel(target, list, status, exempt_list);