diff options
| author |  Sadie Powell | 2025-03-01 16:24:05 +0000 |
|---|---|---|
| committer | Sadie Powell | 2025-03-01 16:26:53 +0000 |
| commit | a27defd72f82627993a059683c8399beb477a800 (patch) | |
| tree | a926b5cab8249832c7d147c508f7f098cc763ff7 /modules/spanningtree/treesocket2.cpp | |
| parent | Replace insp::substring_view with the C++20 iterator constructor. (diff) | |
| parent | Avoid the use of ConvToStr in string concatenation. (diff) | |
Merge branch 'insp4' into master.
Diffstat (limited to 'modules/spanningtree/treesocket2.cpp')
| -rw-r--r-- | modules/spanningtree/treesocket2.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/spanningtree/treesocket2.cpp b/modules/spanningtree/treesocket2.cpp index eae8cbe21..38bf333f7 100644 --- a/modules/spanningtree/treesocket2.cpp +++ b/modules/spanningtree/treesocket2.cpp @@ -161,11 +161,11 @@ void TreeSocket::ProcessLine(std::string& line) if (!params.empty()) { time_t them = ServerCommand::ExtractTS(params[0]); - time_t delta = them - ServerInstance->Time(); - if ((delta < -15) || (delta > 15)) + time_t delta = std::abs(them - ServerInstance->Time()); + if (delta > 15) { - ServerInstance->SNO.WriteGlobalSno('l', "\002ERROR\002: Your clocks are off by {} seconds (this is more than fifteen seconds). 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 fifteen seconds). Link aborted, PLEASE SYNC YOUR CLOCKS!"); + ServerInstance->SNO.WriteGlobalSno('l', "\002ERROR\002: Your clocks are off by {} seconds (this is more than fifteen seconds). Link aborted, \002PLEASE SYNC YOUR CLOCKS!\002", delta); + SendError(FMT::format("Your clocks are out by {} seconds (this is more than fifteen seconds). Link aborted, PLEASE SYNC YOUR CLOCKS!", delta)); return; } else if ((delta < -5) || (delta > 5)) |