ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups mostly.

Browse Source
This commit is contained in:
JoelKatz
2012-05-01 02:27:54 -07:00
parent 77ebac9b5f
commit 6c131d86ab
2 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Peer.cpp
View File

@@ -493,18 +493,15 @@ void Peer::recvHello(newcoin::TMHello& packet)
std::cerr << "Recv(Hello): Disconnect: Bad node public key." << std::endl; std::cerr << "Recv(Hello): Disconnect: Bad node public key." << std::endl;
} }
else if (!mNodePublic.verifyNodePublic(mCookieHash, packet.nodeproof())) else if (!mNodePublic.verifyNodePublic(mCookieHash, packet.nodeproof()))
{ { // Unable to verify they have private key for claimed public key.
// Unable to verify they have private key for claimed public key.
std::cerr << "Recv(Hello): Disconnect: Failed to verify session." << std::endl; std::cerr << "Recv(Hello): Disconnect: Failed to verify session." << std::endl;
} }
else if (!theApp->getConnectionPool().peerConnected(shared_from_this(), mNodePublic)) else if (!theApp->getConnectionPool().peerConnected(shared_from_this(), mNodePublic))
{ { // Already connected, self, or some other reason.
// Already connected, self, or some other reason.
std::cerr << "Recv(Hello): Disconnect: Extraneous connection." << std::endl; std::cerr << "Recv(Hello): Disconnect: Extraneous connection." << std::endl;
} }
else else
{ { // Successful connection.
// Successful connection.
// Cancel verification timeout. // Cancel verification timeout.
(void) mVerifyTimer.cancel(); (void) mVerifyTimer.cancel();
@@ -638,17 +635,17 @@ void Peer::recvGetLedger(newcoin::TMGetLedger& packet)
} }
else if(packet.has_ledgerseq()) else if(packet.has_ledgerseq())
ledger=theApp->getMasterLedger().getLedgerBySeq(packet.ledgerseq()); ledger=theApp->getMasterLedger().getLedgerBySeq(packet.ledgerseq());
else if(packet.has_ltype() && (packet.ltype()==newcoin::ltCURRENT) ) else if(packet.has_ltype() && (packet.ltype() == newcoin::ltCURRENT) )
ledger=theApp->getMasterLedger().getCurrentLedger(); ledger=theApp->getMasterLedger().getCurrentLedger();
else if(packet.has_ltype() && (packet.ltype()==newcoin::ltCLOSING) ) else if(packet.has_ltype() && (packet.ltype() == newcoin::ltCLOSING) )
{ {
ledger=theApp->getMasterLedger().getClosingLedger(); ledger = theApp->getMasterLedger().getClosedLedger();
} }
else if(packet.has_ltype() && (packet.ltype()==newcoin::ltCLOSED) ) else if(packet.has_ltype() && (packet.ltype() == newcoin::ltCLOSED) )
{ {
ledger=theApp->getMasterLedger().getClosingLedger(); ledger = theApp->getMasterLedger().getClosedLedger();
if(ledger && !ledger->isClosed()) if(ledger && !ledger->isClosed())
ledger=theApp->getMasterLedger().getLedgerBySeq(ledger->getLedgerSeq()-1); ledger = theApp->getMasterLedger().getLedgerBySeq(ledger->getLedgerSeq() - 1);
} }
else else
{ {
@@ -767,7 +764,7 @@ void Peer::sendHello()
theApp->getWallet().getNodePrivate().signNodePrivate(mCookieHash, vchSig); theApp->getWallet().getNodePrivate().signNodePrivate(mCookieHash, vchSig);
newcoin::TMHello* h=new newcoin::TMHello(); newcoin::TMHello* h = new newcoin::TMHello();
h->set_version(theConfig.VERSION); h->set_version(theConfig.VERSION);
h->set_ledgerindex(theApp->getOPs().getCurrentLedgerID()); h->set_ledgerindex(theApp->getOPs().getCurrentLedgerID());
@@ -776,15 +773,16 @@ void Peer::sendHello()
h->set_nodeproof(&vchSig[0], vchSig.size()); h->set_nodeproof(&vchSig[0], vchSig.size());
h->set_ipv4port(theConfig.PEER_PORT); h->set_ipv4port(theConfig.PEER_PORT);
Ledger::pointer closingLedger=theApp->getMasterLedger().getClosingLedger(); Ledger::pointer closedLedger = theApp->getMasterLedger().getClosedLedger();
if(closingLedger->isClosed()) assert(closedLedger && closedLedger->isClosed());
if(closedLedger->isClosed())
{ {
Serializer s(128); Serializer s(128);
closingLedger->addRaw(s); closedLedger->addRaw(s);
h->set_closedledger(s.getDataPtr(), s.getLength()); h->set_closedledger(s.getDataPtr(), s.getLength());
} }
PackedMessage::pointer packet=boost::make_shared<PackedMessage> PackedMessage::pointer packet = boost::make_shared<PackedMessage>
(PackedMessage::MessagePointer(h), newcoin::mtHELLO); (PackedMessage::MessagePointer(h), newcoin::mtHELLO);
sendPacket(packet); sendPacket(packet);
} }

1
src/Peer.h
View File

@@ -48,7 +48,6 @@ protected:
std::vector<uint8_t> mReadbuf; std::vector<uint8_t> mReadbuf;
std::list<PackedMessage::pointer> mSendQ; std::list<PackedMessage::pointer> mSendQ;
PackedMessage::pointer mSendingPacket; PackedMessage::pointer mSendingPacket;
std::bitset<32> mPeerBits;
Peer(boost::asio::io_service& io_service, boost::asio::ssl::context& ctx); Peer(boost::asio::io_service& io_service, boost::asio::ssl::context& ctx);