From dfccda5ba8a1b592203b6772ee2bf4f7131b2a9f Mon Sep 17 00:00:00 2001 From: Arthur Britto Date: Wed, 2 Jan 2013 22:54:29 -0800 Subject: [PATCH] Announce --testnet in Hello. --- src/cpp/ripple/Peer.cpp | 10 +++++++++- src/cpp/ripple/ripple.proto | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/cpp/ripple/Peer.cpp b/src/cpp/ripple/Peer.cpp index 5340075430..c1b3676abd 100644 --- a/src/cpp/ripple/Peer.cpp +++ b/src/cpp/ripple/Peer.cpp @@ -627,7 +627,14 @@ void Peer::recvHello(ripple::TMHello& packet) } #endif - if (packet.has_nettime() && ((packet.nettime() < minTime) || (packet.nettime() > maxTime))) + if ((packet.has_testnet() && packet.testnet()) != theConfig.TESTNET) + { + // Format: actual/requested. + cLog(lsINFO) << boost::str(boost::format("Recv(Hello): Network mismatch: %d/%d") + % packet.testnet() + % theConfig.TESTNET); + } + else if (packet.has_nettime() && ((packet.nettime() < minTime) || (packet.nettime() > maxTime))) { if (packet.nettime() > maxTime) { @@ -1619,6 +1626,7 @@ void Peer::sendHello() h.set_nodeproof(&vchSig[0], vchSig.size()); h.set_ipv4port(theConfig.PEER_PORT); h.set_nodeprivate(theConfig.PEER_PRIVATE); + h.set_testnet(theConfig.TESTNET); Ledger::pointer closedLedger = theApp->getLedgerMaster().getClosedLedger(); if (closedLedger && closedLedger->isClosed()) diff --git a/src/cpp/ripple/ripple.proto b/src/cpp/ripple/ripple.proto index 3e238ddeb6..e0d6c3257c 100644 --- a/src/cpp/ripple/ripple.proto +++ b/src/cpp/ripple/ripple.proto @@ -71,6 +71,7 @@ message TMHello { optional bytes ledgerPrevious = 10; // the ledger before the last closed ledger optional bool nodePrivate = 11; // Request to not forward IP. optional TMProofWork proofOfWork = 12; // request/provide proof of work + optional bool testNet = 13; // Running as testnet. }