From 81793192cbbdba5b5f5b9c8c686e507634c77d10 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Mon, 3 Sep 2012 04:37:25 -0700 Subject: [PATCH] Bugfix and close time offset set function. --- src/NetworkOPs.cpp | 9 ++++++++- src/NetworkOPs.h | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/NetworkOPs.cpp b/src/NetworkOPs.cpp index aca2ba73ed..f8860a56e1 100644 --- a/src/NetworkOPs.cpp +++ b/src/NetworkOPs.cpp @@ -46,6 +46,13 @@ uint32 NetworkOPs::getCloseTimeNC() return iToSeconds(getNetworkTimePT() + boost::posix_time::seconds(mCloseTimeOffset)); } +void NetworkOPs::closeTimeOffset(int offset) +{ + mCloseTimeOffset += offset / 4; + if (mCloseTimeOffset) + Log(lsINFO) << "Close time offset now " << mCloseTimeOffset; +} + uint32 NetworkOPs::getCurrentLedgerID() { return mLedgerMaster->getCurrentLedger()->getLedgerSeq(); @@ -616,7 +623,7 @@ bool NetworkOPs::recvPropose(uint32 proposeSeq, const uint256& proposeHash, uint if (!theApp->isNew(s.getSHA512Half())) return false; - NewcoinAddress naPeerPublic = NewcoinAddress::createNodePublic(pubKey); + NewcoinAddress naPeerPublic = NewcoinAddress::createNodePublic(strCopy(pubKey)); if ((!mConsensus) && (mMode == omFULL)) { diff --git a/src/NetworkOPs.h b/src/NetworkOPs.h index f4dac510cb..862b1e97c9 100644 --- a/src/NetworkOPs.h +++ b/src/NetworkOPs.h @@ -89,6 +89,7 @@ public: // network information uint32 getNetworkTimeNC(); uint32 getCloseTimeNC(); + void closeTimeOffset(int); boost::posix_time::ptime getNetworkTimePT(); uint32 getCurrentLedgerID(); OperatingMode getOperatingMode() { return mMode; }