From 9d974c9f2c5db13007742fe78a15c00b4b8f2998 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Thu, 31 May 2012 01:02:32 -0700 Subject: [PATCH] Protocol bugfixes. --- src/Peer.cpp | 14 +++++++------- src/newcoin.proto | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Peer.cpp b/src/Peer.cpp index 1e4ebfd98b..697dd3d750 100644 --- a/src/Peer.cpp +++ b/src/Peer.cpp @@ -437,20 +437,20 @@ void Peer::processReadBuffer() } break; - case newcoin::mtLEDGER: + case newcoin::mtLEDGER_DATA: { - newcoin::TMHaveTransactionSet msg; + newcoin::TMLedgerData msg; if(msg.ParseFromArray(&mReadbuf[HEADER_SIZE], mReadbuf.size() - HEADER_SIZE)) - recvHaveTxSet(msg); + recvLedger(msg); else std::cerr << "parse error: " << type << std::endl; } break; case newcoin::mtHAVE_SET: { - newcoin::TMLedgerData msg; + newcoin::TMHaveTransactionSet msg; if(msg.ParseFromArray(&mReadbuf[HEADER_SIZE], mReadbuf.size() - HEADER_SIZE)) - recvLedger(msg); + recvHaveTxSet(msg); else std::cerr << "parse error: " << type << std::endl; } break; @@ -789,7 +789,7 @@ void Peer::recvGetLedger(newcoin::TMGetLedger& packet) Serializer nData(128); ledger->addRaw(nData); reply.add_nodes()->set_nodedata(nData.getDataPtr(), nData.getLength()); - PackedMessage::pointer oPacket = boost::make_shared(reply, newcoin::mtLEDGER); + PackedMessage::pointer oPacket = boost::make_shared(reply, newcoin::mtLEDGER_DATA); sendPacket(oPacket); return; } @@ -830,7 +830,7 @@ void Peer::recvGetLedger(newcoin::TMGetLedger& packet) } } } - PackedMessage::pointer oPacket = boost::make_shared(reply, newcoin::mtLEDGER); + PackedMessage::pointer oPacket = boost::make_shared(reply, newcoin::mtLEDGER_DATA); sendPacket(oPacket); } diff --git a/src/newcoin.proto b/src/newcoin.proto index e9ff33b5b3..c39e55b9f8 100644 --- a/src/newcoin.proto +++ b/src/newcoin.proto @@ -18,7 +18,7 @@ enum MessageType { // transaction and ledger processing mtTRANSACTION= 30; mtGET_LEDGER= 31; - mtLEDGER= 32; + mtLEDGER_DATA= 32; mtPROPOSE_LEDGER= 33; mtSTATUS_CHANGE= 34; mtHAVE_SET= 35;