summaryrefslogtreecommitdiff
path: root/src/modules/m_spanningtree
diff options
context:
space:
mode:
authorw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-11-16 15:50:42 +0000
committerw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-11-16 15:50:42 +0000
commit4abc2ff167877be048707a8482015b0ffc88d345 (patch)
tree21f1dd304d02a71780a47296fdeec533a084e0a6 /src/modules/m_spanningtree
parent4377cbc7dabbb0063fb1f00e513713fd8265a4ac (diff)
Don't burst expired X:, should help stop bounce wars..
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10808 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules/m_spanningtree')
-rw-r--r--src/modules/m_spanningtree/netburst.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/modules/m_spanningtree/netburst.cpp b/src/modules/m_spanningtree/netburst.cpp
index b97c582d0..704afdc42 100644
--- a/src/modules/m_spanningtree/netburst.cpp
+++ b/src/modules/m_spanningtree/netburst.cpp
@@ -159,6 +159,7 @@ void TreeSocket::SendXLines(TreeServer* Current)
const char* sn = n.c_str();
std::vector<std::string> types = ServerInstance->XLines->GetAllTypes();
+ time_t current = ServerInstance->Time();
for (std::vector<std::string>::iterator it = types.begin(); it != types.end(); ++it)
{
@@ -174,6 +175,11 @@ void TreeSocket::SendXLines(TreeServer* Current)
if (!i->second->IsBurstable())
break;
+ /* If it's expired, don't bother to burst it
+ */
+ if (i->second->duration && current > i->second->expiry)
+ continue;
+
snprintf(data,MAXBUF,":%s ADDLINE %s %s %s %lu %lu :%s",sn, it->c_str(), i->second->Displayable(),
i->second->source,
(unsigned long)i->second->set_time,