From 7ce4e28daccf487528a3c47271e046665a6dd671 Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Thu, 31 May 2012 20:34:40 -0700
Subject: [PATCH] Track network state changes.

---
 src/NetworkOPs.cpp | 24 +++++++++++++++++++-----
 src/NetworkOPs.h   |  2 ++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/NetworkOPs.cpp b/src/NetworkOPs.cpp
index c26faefd5e..5e855f457f 100644
--- a/src/NetworkOPs.cpp
+++ b/src/NetworkOPs.cpp
@@ -271,7 +271,7 @@ void NetworkOPs::checkState(const boost::system::error_code& result)
 	{
 		if (mMode != omDISCONNECTED)
 		{
-			mMode = omDISCONNECTED;
+			setMode(omDISCONNECTED);
 			Log(lsWARNING) << "Node count (" << peerList.size() <<
 				") has fallen below quorum (" << theConfig.NETWORK_QUORUM << ").";
 		}
@@ -280,7 +280,7 @@ void NetworkOPs::checkState(const boost::system::error_code& result)
 	}
 	if (mMode == omDISCONNECTED)
 	{
-		mMode = omCONNECTED;
+		setMode(omCONNECTED);
 		Log(lsINFO) << "Node count (" << peerList.size() << ") is sufficient.";
 	}
 
@@ -341,7 +341,7 @@ void NetworkOPs::checkState(const boost::system::error_code& result)
 		Log(lsWARNING) << "We are not running on the consensus ledger";
 		Log(lsINFO) << "Our LCL " << currentClosed->getHash().GetHex() ;
 		Log(lsINFO) << "Net LCL " << closedLedger.GetHex() ;
-		if ((mMode == omTRACKING) || (mMode == omFULL)) mMode = omTRACKING;
+		if ((mMode == omTRACKING) || (mMode == omFULL)) setMode(omTRACKING);
 		Ledger::pointer consensus = mLedgerMaster->getLedgerByHash(closedLedger);
 		if (!consensus)
 		{
@@ -423,7 +423,7 @@ int NetworkOPs::beginConsensus(Ledger::pointer closingLedger)
 	Ledger::pointer prevLedger = mLedgerMaster->getLedgerByHash(closingLedger->getParentHash());
 	if (!prevLedger)
 	{ // this shouldn't happen if we jump ledgers
-		mMode = omTRACKING;
+		setMode(omTRACKING);
 		return 3;
 	}
 
@@ -440,7 +440,11 @@ bool NetworkOPs::recvPropose(const uint256& prevLgr, uint32 proposeSeq, const ui
 	const std::string& pubKey, const std::string& signature)
 {
 	if (mMode != omFULL) // FIXME: Should we relay?
+		Log(lsWARNING) << "Received proposal when not full" << mMode;
+	if (!mConsensus)
+	{
 		return true;
+	}
 
 	LedgerProposal::pointer proposal =
 		boost::make_shared<LedgerProposal>(prevLgr, proposeSeq, proposeHash, pubKey);
@@ -454,7 +458,6 @@ bool NetworkOPs::recvPropose(const uint256& prevLgr, uint32 proposeSeq, const ui
 	// WRITEME
 
 	if (!mConsensus) return false;
-
 	return mConsensus->peerPosition(proposal);
 }
 
@@ -488,4 +491,15 @@ void NetworkOPs::endConsensus()
 	mConsensus = boost::shared_ptr<LedgerConsensus>();
 }
 
+void NetworkOPs::setMode(OperatingMode om)
+{
+	if (mMode == om) return;
+	Log l((om < mMode) ? lsWARNING : lsINFO);
+	if (om == omDISCONNECTED) l << "STATE->Disonnected";
+	else if (om==omCONNECTED) l << "STATE->Connected";
+	else if (om==omTRACKING) l << "STATE->Tracking";
+	else l << "STATE->Full";
+	mMode = om;
+}
+
 // vim:ts=4
diff --git a/src/NetworkOPs.h b/src/NetworkOPs.h
index c8553f80ac..88f45f74dd 100644
--- a/src/NetworkOPs.h
+++ b/src/NetworkOPs.h
@@ -37,6 +37,8 @@ protected:
 
 	LedgerMaster*						mLedgerMaster;
 
+	void setMode(OperatingMode);
+
 public:
 	NetworkOPs(boost::asio::io_service& io_service, LedgerMaster* pLedgerMaster);