From 0f4800f6bb3a0f296449c75ead2edb349006f4c4 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Fri, 3 Aug 2012 04:39:52 -0700 Subject: [PATCH] Support for a local time to network time offset --- src/NetworkOPs.h | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/NetworkOPs.h b/src/NetworkOPs.h index 6ecd43a87a..67ada03636 100644 --- a/src/NetworkOPs.h +++ b/src/NetworkOPs.h @@ -46,6 +46,10 @@ public: }; protected: + typedef boost::unordered_map > subInfoMapType; + typedef boost::unordered_map >::value_type subInfoMapValue; + typedef boost::unordered_map >::iterator subInfoMapIterator; + OperatingMode mMode; boost::posix_time::ptime mConnectTime; boost::asio::deadline_timer mNetTimer; @@ -54,16 +58,12 @@ protected: LedgerMaster* mLedgerMaster; LedgerAcquire::pointer mAcquiringLedger; - void setMode(OperatingMode); - - typedef boost::unordered_map > subInfoMapType; - typedef boost::unordered_map >::value_type subInfoMapValue; - typedef boost::unordered_map >::iterator subInfoMapIterator; + int mTimeOffset; // last ledger close - int mLastCloseProposers, mLastCloseConvergeTime; - uint256 mLastCloseHash; - uint32 mLastCloseNetTime; + int mLastCloseProposers, mLastCloseConvergeTime; + uint256 mLastCloseHash; + uint32 mLastCloseNetTime; // XXX Split into more locks. boost::interprocess::interprocess_upgradable_mutex mMonitorLock; @@ -75,6 +75,8 @@ protected: boost::unordered_set mSubTransaction; // all transactions // subInfoMapType mSubTransactionAccounts; + void setMode(OperatingMode); + Json::Value transJson(const SerializedTransaction& stTxn, TransactionEngineResult terResult, const std::string& strStatus, int iSeq, const std::string& strType); void pubTransactionAll(const Ledger::pointer& lpCurrent, const SerializedTransaction& stTxn, TransactionEngineResult terResult, const char* pState); void pubTransactionAccounts(const Ledger::pointer& lpCurrent, const SerializedTransaction& stTxn, TransactionEngineResult terResult, const char* pState);