ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-04-29 15:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups.

Browse Source
This commit is contained in:
JoelKatz
2012-02-21 09:05:30 -08:00
parent b89d95f83d
commit 203a519ee5
4 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
LedgerAcquire.cpp
View File

@@ -299,10 +299,7 @@ bool LedgerAcquireMaster::gotLedgerData(newcoin::TMLedgerData& packet)
if(!node.has_nodeid() || !node.has_nodedata()) return false;
nodeIDs.push_back(SHAMapNode(node.nodeid().data(), node.nodeid().size()));
std::vector<unsigned char> rawNode(node.nodedata().size());
memcpy(&rawNode.front(), node.nodedata().data(), node.nodedata().size());
nodeData.push_back(rawNode);
nodeData.push_back(std::vector<unsigned char>(node.nodedata().begin(), node.nodedata().end()));
}
if(packet.type()==newcoin::liTX_NODE) return ledger->takeTxNode(nodeIDs, nodeData);
else return ledger->takeAsNode(nodeIDs, nodeData);

29
Peer.cpp
View File

@@ -336,8 +336,7 @@ void Peer::recvTransaction(newcoin::TMTransaction& packet)
#endif
std::string rawTx=packet.rawtransaction();
std::vector<unsigned char> rTx(rawTx.size());
memcpy(&rTx.front(), rawTx.data(), rawTx.size());
std::vector<unsigned char> rTx(rawTx.begin(), rawTx.end());
Transaction::pointer tx=boost::make_shared<Transaction>(rTx, true);
if(tx->getStatus()==INVALID)
@@ -559,11 +558,11 @@ PackedMessage::pointer Peer::createLedgerProposal(Ledger::pointer ledger)
uint256& hash=ledger->getHash();
newcoin::ProposeLedger* prop=new newcoin::ProposeLedger();
prop->set_ledgerindex(ledger->getIndex());
prop->set_hash(hash.begin(),hash.GetSerializeSize());
prop->set_hash(hash.begin(), hash.GetSerializeSize());
prop->set_numtransactions(ledger->getNumTransactions());
PackedMessage::pointer packet=boost::make_shared<PackedMessage>
(PackedMessage::MessagePointer(prop),newcoin::PROPOSE_LEDGER);
(PackedMessage::MessagePointer(prop), newcoin::PROPOSE_LEDGER);
return(packet);
}
@@ -574,24 +573,24 @@ PackedMessage::pointer Peer::createValidation(Ledger::pointer ledger)
newcoin::Validation* valid=new newcoin::Validation();
valid->set_ledgerindex(ledger->getIndex());
valid->set_hash(hash.begin(),hash.GetSerializeSize());
valid->set_hash(hash.begin(), hash.GetSerializeSize());
valid->set_seqnum(ledger->getValidSeqNum());
valid->set_sig(sig.begin(),sig.GetSerializeSize());
valid->set_sig(sig.begin(), sig.GetSerializeSize());
valid->set_hanko(theConfig.HANKO);
PackedMessage::pointer packet=boost::make_shared<PackedMessage>
(PackedMessage::MessagePointer(valid),newcoin::VALIDATION);
(PackedMessage::MessagePointer(valid), newcoin::VALIDATION);
return(packet);
}
PackedMessage::pointer Peer::createGetFullLedger(uint256& hash)
{
newcoin::GetFullLedger* gfl=new newcoin::GetFullLedger();
gfl->set_hash(hash.begin(),hash.GetSerializeSize());
gfl->set_hash(hash.begin(), hash.GetSerializeSize());
PackedMessage::pointer packet=boost::make_shared<PackedMessage>
(PackedMessage::MessagePointer(gfl),newcoin::GET_FULL_LEDGER);
(PackedMessage::MessagePointer(gfl), newcoin::GET_FULL_LEDGER);
return(packet);
}
@@ -606,7 +605,7 @@ void Peer::sendFullLedger(Ledger::pointer ledger)
if(ledger)
{
PackedMessage::pointer packet(
new PackedMessage(PackedMessage::MessagePointer(ledger->createFullLedger()),newcoin::FULL_LEDGER));
new PackedMessage(PackedMessage::MessagePointer(ledger->createFullLedger()), newcoin::FULL_LEDGER));
sendPacket(packet);
}
}
@@ -635,13 +634,13 @@ void Peer::receiveValidation(newcoin::Validation& validation)
void Peer::receiveGetValidations(newcoin::GetValidations& request)
{
vector<newcoin::Validation> validations;
theApp->getValidationCollection().getValidations(request.ledgerindex(),validations);
theApp->getValidationCollection().getValidations(request.ledgerindex(), validations);
if(validations.size())
{
BOOST_FOREACH(newcoin::Validation& valid, validations)
{
PackedMessage::pointer packet=boost::make_shared<PackedMessage>
(PackedMessage::MessagePointer(new newcoin::Validation(valid)),newcoin::VALIDATION));
(PackedMessage::MessagePointer(new newcoin::Validation(valid)), newcoin::VALIDATION));
sendPacket(packet);
}
}
@@ -655,8 +654,8 @@ void Peer::receiveTransaction(TransactionPtr trans)
// broadcast it to other Peers
ConnectionPool& pool=theApp->getConnectionPool();
PackedMessage::pointer packet=boost::make_shread<PackedMessage>
(PackedMessage::MessagePointer(new newcoin::Transaction(*(trans.get()))),newcoin::TRANSACTION);
pool.relayMessage(this,packet);
(PackedMessage::MessagePointer(new newcoin::Transaction(*(trans.get()))), newcoin::TRANSACTION);
pool.relayMessage(this, packet);
}
else
{
@@ -667,7 +666,7 @@ void Peer::receiveTransaction(TransactionPtr trans)
void Peer::receiveProposeLedger(newcoin::ProposeLedger& packet)
{
theApp->getLedgerMaster().checkLedgerProposal(shared_from_this(),packet);
theApp->getLedgerMaster().checkLedgerProposal(shared_from_this(), packet);
}
void Peer::receiveFullLedger(newcoin::FullLedger& packet)

2
SHAMapNodes.cpp
View File

@@ -101,7 +101,7 @@ SHAMapNode::SHAMapNode(const void *ptr, int len)
else
{
memcpy(&mNodeID, ptr, 32);
mDepth=*(reinterpret_cast<const unsigned char *>(ptr) + 32);
mDepth=*(static_cast<const unsigned char *>(ptr) + 32);
}
}

3
Serializer.h
View File

@@ -2,6 +2,7 @@
#define __SERIALIZER__
#include <vector>
#include <string>
#include <boost/shared_ptr.hpp>
@@ -56,7 +57,7 @@ class Serializer
void* getDataPtr() { return &mData.front(); }
const std::vector<unsigned char>& peekData() const { return mData; }
std::vector<unsigned char> getData() const { return mData; }
std::string getString() const { return std::string(reinterpret_cast<const char *>(getDataPtr()), getLength()); }
std::string getString() const { return std::string(static_cast<const char *>(getDataPtr()), getLength()); }
void secureErase() { memset(&(mData.front()), 0, mData.size()); erase(); }
void erase() { mData.clear(); }
int removeLastByte();