diff options
| author | attilamolnar <attilamolnar@hush.com> | 2012-07-04 20:37:06 +0200 |
|---|---|---|
| committer | attilamolnar <attilamolnar@hush.com> | 2013-04-12 21:03:03 +0200 |
| commit | 36688c8f5a0d9eb935ed5c5389eb780f557d5706 (patch) | |
| tree | 98f516f52d5390e739a8245454004dba6e7d80a9 | |
| parent | 19c695250f7504260b850f088d956d8a4099e73e (diff) | |
m_spanningtree Netburst: Remove expiration check from SendXLines()
XLineManager does the checking
| -rw-r--r-- | src/modules/m_spanningtree/netburst.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/modules/m_spanningtree/netburst.cpp b/src/modules/m_spanningtree/netburst.cpp index 6f32bb33e..de86f41c7 100644 --- a/src/modules/m_spanningtree/netburst.cpp +++ b/src/modules/m_spanningtree/netburst.cpp @@ -153,12 +153,13 @@ void TreeSocket::SendXLines() 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) + for (std::vector<std::string>::const_iterator it = types.begin(); it != types.end(); ++it) { + /* Expired lines are removed in XLineManager::GetAll() */ XLineLookup* lookup = ServerInstance->XLines->GetAll(*it); + /* lookup cannot be NULL in this case but a check won't hurt */ if (lookup) { for (LookupIter i = lookup->begin(); i != lookup->end(); ++i) @@ -169,11 +170,6 @@ void TreeSocket::SendXLines() 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.c_str(), (unsigned long)i->second->set_time, |