Skip to content

Commit

Permalink
Avoid the use of abs64 in timedata
Browse files Browse the repository at this point in the history
Github-Pull: bitcoin#20141
Rebased-From: d1292f2
  • Loading branch information
sipa authored and MarkLTZ committed Nov 21, 2020
1 parent 6fc6f53 commit 5dee1e1
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions src/timedata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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)
{
Expand Down

0 comments on commit 5dee1e1

Please sign in to comment.