ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jedmccaleb/NewCoin

Browse Source
This commit is contained in:
jed
2012-06-24 19:40:15 -07:00
parent 17c3b934e6 b4eea47a10
commit 5ea05a4710
8 changed files with 89 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Config.cpp
View File

@@ -112,8 +112,6 @@ void Config::setup(const std::string& strConf)
// Defaults
//
VERSION = 1;
NETWORK_START_TIME = 1319844908;
PEER_PORT = SYSTEM_PEER_PORT;

4
src/Config.h
View File

@@ -43,10 +43,6 @@ const int SYSTEM_WEBSOCKET_PORT = 6562;
class Config
{
public:
// Core software parameters
int VERSION;
std::string VERSION_STR;
// Configuration parameters
boost::filesystem::path CONFIG_FILE;
boost::filesystem::path CONFIG_DIR;

5
src/LedgerHistory.cpp
View File

@@ -63,6 +63,11 @@ Ledger::pointer LedgerHistory::getLedgerByHash(const uint256& hash)
#if 0
// FIXME: A ledger without SHA maps isn't very useful
// This code will need to build them
// The fix is to audit all callers to this function and replace them with
// higher-level functions that ask more-specific questions that we can
// test against our database
ret = Ledger::loadByHash(hash);
if (!ret) return ret;
assert(ret->getHash() == hash);

60
src/Peer.cpp
View File

@@ -8,6 +8,7 @@
#include "../json/writer.h"
#include "Version.h"
#include "Peer.h"
#include "Config.h"
#include "Application.h"
@@ -565,15 +566,20 @@ void Peer::processReadBuffer()
void Peer::recvHello(newcoin::TMHello& packet)
{
#ifdef DEBUG
Log(lsINFO) << "Recv(Hello) v=" << packet.version() << ", index=" << packet.ledgerindex();
#endif
Log(lsTRACE) << "Recv(Hello) v=" << packet.versionmajor() << "." << packet.versionminor();
bool bDetach = true;
// Cancel verification timeout.
(void) mVerifyTimer.cancel();
if (!mNodePublic.setNodePublic(packet.nodepublic()))
if ((packet.minprotoversionmajor() > PROTO_VERSION_MAJ) ||
((packet.minprotoversionmajor() == PROTO_VERSION_MAJ) && (packet.minprotoversionminor() > PROTO_VERSION_MIN)))
{
Log(lsINFO) << "Recv(Hello): Server requires protocol version " <<
packet.minprotoversionmajor() << "." << packet.minprotoversionminor() << " we run " <<
PROTO_VERSION_MAJ << "." << PROTO_VERSION_MIN;
}
else if (!mNodePublic.setNodePublic(packet.nodepublic()))
{
Log(lsINFO) << "Recv(Hello): Disconnect: Bad node public key.";
}
@@ -584,6 +590,15 @@ void Peer::recvHello(newcoin::TMHello& packet)
else
{ // Successful connection.
Log(lsINFO) << "Recv(Hello): Connect: " << mNodePublic.humanNodePublic();
mHello = packet;
if ( (packet.versionmajor() != SERVER_VERSION_MAJ) || (packet.versionminor() != SERVER_VERSION_MIN))
{
if (packet.has_fullversion())
Log(lsINFO) << " Peer is running version " << packet.fullversion();
else
Log(lsINFO) << " Peer is running version " << packet.versionmajor() << "." << packet.versionminor();
}
if (mClientConnect)
{
@@ -1104,16 +1119,20 @@ void Peer::sendHello()
newcoin::TMHello h;
h.set_version(theConfig.VERSION);
h.set_ledgerindex(theApp->getOPs().getCurrentLedgerID());
h.set_versionmajor(SERVER_VERSION_MAJ);
h.set_versionminor(SERVER_VERSION_MIN);
h.set_protoversionmajor(PROTO_VERSION_MAJ);
h.set_protoversionminor(PROTO_VERSION_MIN);
h.set_minprotoversionminor(MIN_PROTO_MAJ);
h.set_minprotoversionmajor(MIN_PROTO_MIN);
h.set_fullversion(SERVER_VERSION);
h.set_nettime(theApp->getOPs().getNetworkTimeNC());
h.set_nodepublic(theApp->getWallet().getNodePublic().humanNodePublic());
h.set_nodeproof(&vchSig[0], vchSig.size());
h.set_ipv4port(theConfig.PEER_PORT);
Ledger::pointer closedLedger = theApp->getMasterLedger().getClosedLedger();
assert(closedLedger && closedLedger->isClosed());
if (closedLedger->isClosed())
if (closedLedger && closedLedger->isClosed())
{
uint256 hash = closedLedger->getHash();
h.set_closedledger(hash.begin(), hash.GetSerializeSize());
@@ -1141,13 +1160,24 @@ void Peer::punishPeer(PeerPunish)
{
}
Json::Value Peer::getJson() {
Json::Value ret(Json::objectValue);
Json::Value Peer::getJson()
{
Json::Value ret(Json::objectValue);
ret["this"] = ADDRESS(this);
ret["public_key"] = mNodePublic.ToString();
ret["ip"] = mIpPortConnect.first;
ret["port"] = mIpPortConnect.second;
ret["this"] = ADDRESS(this);
ret["public_key"] = mNodePublic.ToString();
ret["ip"] = mIpPortConnect.first;
ret["port"] = mIpPortConnect.second;
if (mHello.has_fullversion())
ret["version"] = mHello.fullversion();
else if (mHello.has_versionminor() && mHello.has_versionmajor())
ret["version"] = boost::lexical_cast<std::string>(mHello.versionmajor()) + "." +
boost::lexical_cast<std::string>(mHello.versionminor());
if (mHello.has_protoversionminor() && mHello.has_protoversionmajor())
ret["protocol"] = boost::lexical_cast<std::string>(mHello.protoversionmajor()) + "." +
boost::lexical_cast<std::string>(mHello.protoversionminor());
if (!mIpPort.first.empty())
{
@@ -1155,7 +1185,7 @@ Json::Value Peer::getJson() {
ret["verified_port"] = mIpPort.second;
}
return ret;
return ret;
}
// vim:ts=4

1
src/Peer.h
View File

@@ -55,6 +55,7 @@ protected:
std::list<PackedMessage::pointer> mSendQ;
PackedMessage::pointer mSendingPacket;
newcoin::TMStatusChange mLastStatus;
newcoin::TMHello mHello;
Peer(boost::asio::io_service& io_service, boost::asio::ssl::context& ctx);

22
src/Version.h Normal file
View File

@@ -0,0 +1,22 @@
// Versions
#ifndef SERVER_VERSION_MAJ
#define SERVER_VERSION_MAJ 0
#define SERVER_VERSION_MIN 1
#define SERVER_VERSION_SUB "-a"
#define SERVER_NAME "NewCoin"
#define SV_STRINGIZE(x) SV_STRINGIZE2(x)
#define SV_STRINGIZE2(x) #x
#define SERVER_VERSION \
(SERVER_NAME "-" SV_STRINGIZE(SERVER_VERSION_MAJ) "." SV_STRINGIZE(SERVER_VERSION_MIN) SERVER_VERSION_SUB)
#define PROTO_VERSION_MAJ 0
#define PROTO_VERSION_MIN 0
#define MIN_PROTO_MAJ 0
#define MIN_PROTO_MIN 0
#endif

22
src/newcoin.proto
View File

@@ -37,14 +37,20 @@ enum MessageType {
message TMHello {
required uint32 version = 1;
optional uint32 ledgerIndex = 2;
optional uint64 netTime = 3;
optional bytes nodePublic = 4; // node may opt to remain anonymous
optional bytes nodeProof = 5;
optional uint32 ipv4Port = 6;
optional bytes closedLedger = 7; // our last closed ledger
optional bytes previousLedger = 8; // the ledger before the last closed ledger
required uint32 versionMinor = 1;
required uint32 versionMajor = 2;
required uint32 protoVersionMinor = 3;
required uint32 protoVersionMajor = 4;
required uint32 minProtoVersionMinor = 5;
required uint32 minProtoVersionMajor = 6;
required bytes nodePublic = 7;
required bytes nodeProof = 8;
optional string fullVersion = 9;
optional uint64 netTime = 10;
optional uint32 ipv4Port = 11;
optional uint32 ledgerIndex = 12;
optional bytes closedLedger = 13; // our last closed ledger
optional bytes previousLedger = 14; // the ledger before the last closed ledger
}

7
src/rpc.cpp
View File

@@ -15,14 +15,11 @@
#include "BitcoinUtil.h"
#include "Config.h"
#include "Log.h"
#include "Version.h"
using namespace boost;
using namespace boost::asio;
Json::Value JSONRPCError(int code, const std::string& message)
{
Json::Value error(Json::objectValue);
@@ -116,7 +113,7 @@ std::string HTTPReply(int nStatus, const std::string& strMsg)
rfc1123Time().c_str(),
access.c_str(),
strMsg.size(),
theConfig.VERSION_STR.c_str(),
SERVER_VERSION,
strMsg.c_str());
}