From f24a43bb7aefcde139ad4b61675e5b3906db8441 Mon Sep 17 00:00:00 2001 From: Arthur Britto Date: Tue, 24 Apr 2012 14:47:58 -0700 Subject: [PATCH] Cosmetic changes. --- src/ConnectionPool.cpp | 4 ++-- src/ConnectionPool.h | 1 + src/Peer.cpp | 23 ++++++++++------------- src/Peer.h | 1 + src/PeerDoor.cpp | 2 +- src/PeerDoor.h | 1 + 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/ConnectionPool.cpp b/src/ConnectionPool.cpp index 094cea531..5208a20b7 100644 --- a/src/ConnectionPool.cpp +++ b/src/ConnectionPool.cpp @@ -115,9 +115,9 @@ Json::Value ConnectionPool::getPeersJson() BOOST_FOREACH(Peer::pointer peer, mPeers) { - ret.append(peer->getJson()); + ret.append(peer->getJson()); } return ret; } - +// vim:ts=4 diff --git a/src/ConnectionPool.h b/src/ConnectionPool.h index dfe4b36a1..5b577dbbd 100644 --- a/src/ConnectionPool.h +++ b/src/ConnectionPool.h @@ -39,3 +39,4 @@ public: }; #endif +// vim:ts=4 diff --git a/src/Peer.cpp b/src/Peer.cpp index 14e190004..11fc736b2 100644 --- a/src/Peer.cpp +++ b/src/Peer.cpp @@ -41,7 +41,7 @@ void Peer::handle_write(const boost::system::error_code& error, size_t bytes_tra if(!mSendQ.empty()) { PackedMessage::pointer packet=mSendQ.front(); - if(packet) + if(packet) { sendPacketForce(packet); mSendQ.pop_front(); @@ -70,7 +70,6 @@ void Peer::connected(const boost::system::error_code& error) detach(); std::cout << "Peer::connected Error: " << error << std::endl; //else BOOST_LOG_TRIVIAL(info) << "Error: " << error; } - } void Peer::sendPacketForce(PackedMessage::pointer packet) @@ -141,7 +140,7 @@ void Peer::handle_read_header(const boost::system::error_code& error) void Peer::handle_read_body(const boost::system::error_code& error) { - if(!error) + if(!error) { processReadBuffer(); start_read_header(); @@ -358,7 +357,7 @@ void Peer::recvTransaction(newcoin::TMTransaction& packet) #endif return; } - + tx=theApp->getOPs().processTransaction(tx, this); if(tx->getStatus()!=INCLUDED) @@ -543,7 +542,7 @@ void Peer::sendHello() PackedMessage::pointer packet=boost::make_shared (PackedMessage::MessagePointer(h), newcoin::mtHELLO); - sendPacket(packet); + sendPacket(packet); } void Peer::punishPeer(PeerPunish) @@ -571,7 +570,7 @@ PackedMessage::pointer Peer::createFullLedger(Ledger::pointer ledger) newcoin::FullLedger* fullLedger=new newcoin::FullLedger(); ledger-> } - + return(PackedMessage::pointer()); }*/ @@ -599,7 +598,6 @@ PackedMessage::pointer Peer::createValidation(Ledger::pointer ledger) valid->set_seqnum(ledger->getValidSeqNum()); valid->set_sig(sig.begin(), sig.GetSerializeSize()); valid->set_hanko(theConfig.HANKO); - PackedMessage::pointer packet=boost::make_shared (PackedMessage::MessagePointer(valid), newcoin::VALIDATION); @@ -623,12 +621,12 @@ void Peer::sendLedgerProposal(Ledger::pointer ledger) } void Peer::sendFullLedger(Ledger::pointer ledger) -{ +{ if(ledger) { PackedMessage::pointer packet( new PackedMessage(PackedMessage::MessagePointer(ledger->createFullLedger()), newcoin::FULL_LEDGER)); - sendPacket(packet); + sendPacket(packet); } } @@ -679,7 +677,7 @@ void Peer::receiveTransaction(TransactionPtr trans) (PackedMessage::MessagePointer(new newcoin::Transaction(*(trans.get()))), newcoin::TRANSACTION); pool.relayMessage(this, packet); } - else + else { std::cout << "Invalid transaction: " << trans->from() << std::endl; } @@ -687,7 +685,6 @@ void Peer::receiveTransaction(TransactionPtr trans) void Peer::receiveProposeLedger(newcoin::ProposeLedger& packet) { - theApp->getLedgerMaster().checkLedgerProposal(shared_from_this(), packet); } @@ -699,9 +696,9 @@ void Peer::receiveFullLedger(newcoin::FullLedger& packet) void Peer::connectTo(KnownNode& node) { tcp::endpoint endpoint( address::from_string(node.mIP), node.mPort); - mSocket.async_connect(endpoint, + mSocket.async_connect(endpoint, boost::bind(&Peer::connected, this, boost::asio::placeholders::error) ); - } #endif +// vim:ts=4 diff --git a/src/Peer.h b/src/Peer.h index 1c954151b..5ca7464e4 100644 --- a/src/Peer.h +++ b/src/Peer.h @@ -102,3 +102,4 @@ public: }; #endif +// vim:ts=4 diff --git a/src/PeerDoor.cpp b/src/PeerDoor.cpp index 5ecfc93ed..7fe2cf247 100644 --- a/src/PeerDoor.cpp +++ b/src/PeerDoor.cpp @@ -33,4 +33,4 @@ void PeerDoor::handleConnect(Peer::pointer new_connection, startListening(); } - +// vim:ts=4 diff --git a/src/PeerDoor.h b/src/PeerDoor.h index a54cf27b8..a53defc6e 100644 --- a/src/PeerDoor.h +++ b/src/PeerDoor.h @@ -19,3 +19,4 @@ class PeerDoor public: PeerDoor(boost::asio::io_service& io_service); }; +// vim:ts=4