diff options
| -rw-r--r-- | src/modules/m_spanningtree/addline.cpp | 2 | ||||
| -rw-r--r-- | src/xline.cpp | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/modules/m_spanningtree/addline.cpp b/src/modules/m_spanningtree/addline.cpp index 08f885797..e2f4002ce 100644 --- a/src/modules/m_spanningtree/addline.cpp +++ b/src/modules/m_spanningtree/addline.cpp @@ -58,7 +58,7 @@ bool TreeSocket::AddLine(const std::string &prefix, std::deque<std::string> &par return true; } xl->SetCreateTime(atoi(params[3].c_str())); - if (ServerInstance->XLines->AddLine(xl,NULL)) + if (ServerInstance->XLines->AddLine(xl, NULL)) { if (xl->duration) { diff --git a/src/xline.cpp b/src/xline.cpp index 0c6965fe3..bc1cf9183 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -170,7 +170,16 @@ bool XLineManager::AddLine(XLine* line, User* user) ServerInstance->BanCache->RemoveEntries(line->type, false); // XXX perhaps remove ELines here? if (DelLine(line->Displayable(), line->type, user, true)) - return false; + { + /* Line exists, check if its an expired line */ + ContainerIter x = lookup_lines.find(line->type); + LookupIter i = x->second.find(line->Displayable()); + + if (i->second->duration && ServerInstance->Time() > i->second->expiry) + ExpireLine(x, i); + else + return false; + } /*ELine* item = new ELine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());*/ XLineFactory* xlf = GetFactory(line->type); |