ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-04-03 06:40:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

For some reason there was a FinishBurst in the encap command, which was sending spurious end of burst messages

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9379 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
brain 2008-04-06 17:24:10 +00:00
parent 134cff821e
commit 41c2064746
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/m_spanningtree/treeserver.cpp
View File

@ -142,16 +142,18 @@ std::string& TreeServer::GetID()
void TreeServer::FinishBurst() void TreeServer::FinishBurst()
{ {
if (this->bursting)
{
this->bursting = false; this->bursting = false;
ServerInstance->XLines->ApplyLines(); ServerInstance->XLines->ApplyLines();
timeval t; timeval t;
gettimeofday(&t, NULL); gettimeofday(&t, NULL);
long ts = (t.tv_sec * 1000) + (t.tv_usec / 1000); long ts = (t.tv_sec * 1000) + (t.tv_usec / 1000);
unsigned long bursttime = ts - this->StartBurst; unsigned long bursttime = ts - this->StartBurst;
ServerInstance->SNO->WriteToSnoMask('l', "Received end of netburst from \2%s\2 (burst time: %lu %s)", ServerName.c_str(), ServerInstance->SNO->WriteToSnoMask('l', "Received end of netburst from \2%s\2 (burst time: %lu %s)", ServerName.c_str(), (bursttime > 1000 ? bursttime / 1000 : bursttime), (bursttime > 1000 ? "secs" : "msecs"));
(bursttime > 1000 ? bursttime / 1000 : bursttime), (bursttime > 1000 ? "secs" : "msecs"));
Event rmode((char*)ServerName.c_str(), (Module*)Utils->Creator, "new_server"); Event rmode((char*)ServerName.c_str(), (Module*)Utils->Creator, "new_server");
rmode.Send(ServerInstance); rmode.Send(ServerInstance);
}
} }
void TreeServer::SetID(const std::string &id) void TreeServer::SetID(const std::string &id)

1
src/modules/m_spanningtree/treesocket2.cpp
View File

@ -517,7 +517,6 @@ bool TreeSocket::ProcessLine(std::string &line)
} }
else if (command == "ENCAP") else if (command == "ENCAP")
{ {
ServerSource->FinishBurst();
return this->Encap(prefix, params); return this->Encap(prefix, params);
} }
else if (command == "MODE") else if (command == "MODE")