From 5a5a061c48af830ca90b699993cac079a9311b08 Mon Sep 17 00:00:00 2001 From: brain Date: Tue, 10 Mar 2009 14:50:10 +0000 Subject: Quiet bursts for uplinks, suggested by HiroP, thanks! git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11194 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_spanningtree/uid.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/modules/m_spanningtree/uid.cpp') diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp index 58a4a0e9d..697dbe689 100644 --- a/src/modules/m_spanningtree/uid.cpp +++ b/src/modules/m_spanningtree/uid.cpp @@ -23,7 +23,7 @@ /* $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 m_hash.h m_spanningtree/handshaketimer.h */ -bool TreeSocket::ParseUID(const std::string &source, std::deque ¶ms) +bool TreeSocket::ParseUID(const std::string &source, std::deque ¶ms, const std::string &up) { /** Do we have enough parameters: * 0 1 2 3 4 5 6 7 8 9 (n-1) @@ -40,7 +40,13 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque &pa std::string empty; TreeServer* remoteserver = Utils->FindServer(source); + TreeServer* uplink = Utils->FindServer(up); + if (!uplink) + { + this->SendError("Invalid client introduction (Can't determine name of uplink!)"); + return false; + } if (!remoteserver) { this->SendError("Invalid client introduction (Unknown server "+source+")"); @@ -168,7 +174,7 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque &pa bool dosend = true; - if ((this->Utils->quiet_bursts && remoteserver->bursting) || this->ServerInstance->SilentULine(_new->server)) + if ((this->Utils->quiet_bursts && (remoteserver->bursting || uplink->bursting)) || this->ServerInstance->SilentULine(_new->server)) dosend = false; if (dosend) -- cgit v1.3.1-10-gc9f91