aboutsummaryrefslogtreecommitdiff
path: root/src/modules/m_spanningtree/treesocket2.cpp
diff options
context:
space:
mode:
authorGravatar Sadie Powell2019-09-23 00:37:33 +0100
committerGravatar Sadie Powell2019-09-23 00:37:33 +0100
commit8848169e8b42b5ed85837efd3b3f9e36ffbada1b (patch)
tree04babb46ea381f254589b12288f121d53338cb67 /src/modules/m_spanningtree/treesocket2.cpp
parentInstall libc++abi-dev on Travis. (diff)
parentLower the acceptable drift for clocks on link. (diff)
Merge branch 'insp3' into master.
Diffstat (limited to 'src/modules/m_spanningtree/treesocket2.cpp')
-rw-r--r--src/modules/m_spanningtree/treesocket2.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index db16ad121..faa4af2c0 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -155,17 +155,17 @@ void TreeSocket::ProcessLine(std::string &line)
}
else if (command == "BURST")
{
- if (params.size())
+ if (!params.empty())
{
time_t them = ConvToNum<time_t>(params[0]);
time_t delta = them - ServerInstance->Time();
- if ((delta < -600) || (delta > 600))
+ if ((delta < -60) || (delta > 60))
{
- ServerInstance->SNO.WriteGlobalSno('l', "\002ERROR\002: Your clocks are off by %ld seconds (this is more than five minutes). Link aborted, \002PLEASE SYNC YOUR CLOCKS!\002", labs((long)delta));
- SendError("Your clocks are out by "+ConvToStr(labs((long)delta))+" seconds (this is more than five minutes). Link aborted, PLEASE SYNC YOUR CLOCKS!");
+ ServerInstance->SNO.WriteGlobalSno('l', "\002ERROR\002: Your clocks are off by %ld seconds (this is more than one minute). Link aborted, \002PLEASE SYNC YOUR CLOCKS!\002", labs((long)delta));
+ SendError("Your clocks are out by "+ConvToStr(labs((long)delta))+" seconds (this is more than one minute). Link aborted, PLEASE SYNC YOUR CLOCKS!");
return;
}
- else if ((delta < -30) || (delta > 30))
+ else if ((delta < -15) || (delta > 15))
{
ServerInstance->SNO.WriteGlobalSno('l', "\002WARNING\002: Your clocks are off by %ld seconds. Please consider syncing your clocks.", labs((long)delta));
}