diff options
| author | Pieter Wuille <pieter@wuille.net> | 2020-10-12 17:36:51 -0700 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-10-16 08:22:50 +0800 |
| commit | 0b64310fb6f1816a4ceba99eadb532c30ba867d5 (patch) | |
| tree | 87817e03ef5955fbd7c0c60d38ef483ac0d0807d | |
| parent | 5b2de04e7f37043d850bd89554789d5b86f6b735 (diff) | |
| download | bitcoin-0b64310fb6f1816a4ceba99eadb532c30ba867d5.tar.xz | |
Avoid the use of abs64 in timedata
Github-Pull: #20141
Rebased-From: d1292f25f272401da0c58580521c74b1fa03a9ad
| -rw-r--r-- | src/timedata.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/timedata.cpp b/src/timedata.cpp index 9458b9ae0c..0c6698d87a 100644 --- a/src/timedata.cpp +++ b/src/timedata.cpp @@ -37,11 +37,6 @@ int64_t GetAdjustedTime() return GetTime() + GetTimeOffset(); } -static int64_t abs64(int64_t n) -{ - return (n >= 0 ? n : -n); -} - #define BITCOIN_TIMEDATA_MAX_SAMPLES 200 void AddTimeData(const CNetAddr& ip, int64_t nOffsetSample) @@ -81,8 +76,8 @@ void AddTimeData(const CNetAddr& ip, int64_t nOffsetSample) int64_t nMedian = vTimeOffsets.median(); std::vector<int64_t> vSorted = vTimeOffsets.sorted(); // Only let other nodes change our time by so much - if (abs64(nMedian) <= std::max<int64_t>(0, gArgs.GetArg("-maxtimeadjustment", DEFAULT_MAX_TIME_ADJUSTMENT))) - { + int64_t max_adjustment = std::max<int64_t>(0, gArgs.GetArg("-maxtimeadjustment", DEFAULT_MAX_TIME_ADJUSTMENT)); + if (nMedian >= -max_adjustment && nMedian <= max_adjustment) { nTimeOffset = nMedian; } else @@ -94,9 +89,10 @@ void AddTimeData(const CNetAddr& ip, int64_t nOffsetSample) { // If nobody has a time different than ours but within 5 minutes of ours, give a warning bool fMatch = false; - for (const int64_t nOffset : vSorted) - if (nOffset != 0 && abs64(nOffset) < 5 * 60) + for (const int64_t nOffset : vSorted) { + if (nOffset != 0 && nOffset > -5 * 60 && nOffset < 5 * 60) fMatch = true; + } if (!fMatch) { |