aboutsummaryrefslogtreecommitdiff
path: root/util.cpp
diff options
context:
space:
mode:
authors_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-07-18 20:47:29 +0000
committers_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-07-18 20:47:29 +0000
commite8bff10f07b80d820545661cee9337d8664a64cb (patch)
treec9a8f5bf048a852955da2c7ad2471b4392592af5 /util.cpp
parentae922a36a4b54a8e78d3a2a2cb2af7f03960fce3 (diff)
minor UI tweaks, removed some outdated txt files,
(and json-rpc password -rpcpw= switch, which we're going to revert) git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@108 1a98c847-1fd6-4fd8-948a-caf3550aa51b
Diffstat (limited to 'util.cpp')
-rw-r--r--util.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/util.cpp b/util.cpp
index 4293b2d5e2..4ddc5250ea 100644
--- a/util.cpp
+++ b/util.cpp
@@ -701,12 +701,13 @@ void AddTimeData(unsigned int ip, int64 nTime)
sort(vTimeOffsets.begin(), vTimeOffsets.end());
int64 nMedian = vTimeOffsets[vTimeOffsets.size()/2];
nTimeOffset = nMedian;
- if ((nMedian > 0 ? nMedian : -nMedian) > 5 * 60)
+ if ((nMedian > 0 ? nMedian : -nMedian) > 36 * 60 * 60)
{
// Only let other nodes change our clock so far before we
// go to the NTP servers
/// todo: Get time from NTP servers, then set a flag
/// to make sure it doesn't get changed again
+ nTimeOffset = 0;
}
foreach(int64 n, vTimeOffsets)
printf("%+"PRI64d" ", n);