aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/m_spanningtree/uid.cpp
diff options
context:
space:
mode:
authorGravatar danieldg2009-03-14 14:31:48 +0000
committerGravatar danieldg2009-03-14 14:31:48 +0000
commit2c3f10316c1fcfd137d83ecfe302d3ffeaad3e6f (patch)
treed7be04d97116ce7132b14e26283f7b6bcfabb02a /src/modules/m_spanningtree/uid.cpp
parentMark children of remote servers as bursting while their parent is bursting (diff)
Revert r11194 "Quiet bursts for uplinks, suggested by HiroP, thanks!"
This check on uplink was not sufficient. It has been replaced by marking children of a bursting server as bursting, so the uplink is no longer needed. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11218 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules/m_spanningtree/uid.cpp')
-rw-r--r--src/modules/m_spanningtree/uid.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index 697dbe689..58a4a0e9d 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<std::string> &params, const std::string &up)
+bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &params)
{
/** Do we have enough parameters:
* 0 1 2 3 4 5 6 7 8 9 (n-1)
@@ -40,13 +40,7 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &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+")");
@@ -174,7 +168,7 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa
bool dosend = true;
- if ((this->Utils->quiet_bursts && (remoteserver->bursting || uplink->bursting)) || this->ServerInstance->SilentULine(_new->server))
+ if ((this->Utils->quiet_bursts && remoteserver->bursting) || this->ServerInstance->SilentULine(_new->server))
dosend = false;
if (dosend)