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

Fix connect issue.

Browse Source
This commit is contained in:
Arthur Britto
2012-05-08 16:36:15 -07:00
parent e58f19debc
commit 2e9adc74a8
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Peer.cpp
View File

@@ -19,8 +19,9 @@
// Node has this long to verify its identity from connection accepted or connection attempt. // Node has this long to verify its identity from connection accepted or connection attempt.
#define NODE_VERIFY_SECONDS 15 #define NODE_VERIFY_SECONDS 15
Peer::Peer(boost::asio::io_service& io_service, boost::asio::ssl::context& ctx) Peer::Peer(boost::asio::io_service& io_service, boost::asio::ssl::context& ctx) :
: mSocketSsl(io_service, ctx), mConnected(false),
mSocketSsl(io_service, ctx),
mVerifyTimer(io_service) mVerifyTimer(io_service)
{ {
} }
@@ -36,13 +37,13 @@ void Peer::handle_write(const boost::system::error_code& error, size_t bytes_tra
mSendingPacket = PackedMessage::pointer(); mSendingPacket = PackedMessage::pointer();
if(error) if (error)
{ {
detach("hw"); detach("hw");
return; return;
} }
if(!mSendQ.empty()) if (!mSendQ.empty())
{ {
PackedMessage::pointer packet=mSendQ.front(); PackedMessage::pointer packet=mSendQ.front();
if(packet) if(packet)
@@ -63,11 +64,11 @@ void Peer::detach(const char *rsn)
(void) mVerifyTimer.cancel(); (void) mVerifyTimer.cancel();
mSendQ.clear(); mSendQ.clear();
// mSocketSsl.close();
if (!mIpPort.first.empty()) if (!mIpPort.first.empty())
{ {
if (mClientConnect) if (mClientConnect)
// Connection might be part of scanning. Inform connect failed.
theApp->getConnectionPool().peerFailed(mIpPort.first, mIpPort.second); theApp->getConnectionPool().peerFailed(mIpPort.first, mIpPort.second);
theApp->getConnectionPool().peerDisconnected(shared_from_this(), mIpPort, mNodePublic); theApp->getConnectionPool().peerDisconnected(shared_from_this(), mIpPort, mNodePublic);
@@ -317,8 +318,11 @@ void Peer::processReadBuffer()
std::cerr << "PRB(" << type << "), len=" << (mReadbuf.size()-HEADER_SIZE) << std::endl; std::cerr << "PRB(" << type << "), len=" << (mReadbuf.size()-HEADER_SIZE) << std::endl;
#endif #endif
// If not connected, only accept mtHELLO. Otherwise, don't accept mtHELLO. std::cerr << "Peer::processReadBuffer: " << mIpPort.first << " " << mIpPort.second << std::endl;
if (mIpPort.first.empty() == (type == newcoin::mtHELLO)) std::cerr << "Peer::processReadBuffer: empty()=" << mIpPort.first.empty() << " " << (type == newcoin::mtHELLO) << std::endl;
// If connected and get a mtHELLO or if not connected and get a non-mtHELLO, wrong message was sent.
if (mConnected == (type == newcoin::mtHELLO))
{ {
std::cerr << "Wrong message type: " << type << std::endl; std::cerr << "Wrong message type: " << type << std::endl;
detach("prb1"); detach("prb1");
@@ -534,11 +538,14 @@ void Peer::recvHello(newcoin::TMHello& packet)
} }
else else
{ {
// XXX At this point we could add the inbound connection to our IP list. However, the inbound IP address might be that of // At this point we could add the inbound connection to our IP list. However, the inbound IP address might be that of
// a NAT. It would be best to only add it if and only if we can immediatly verify it. // a NAT. It would be best to only add it if and only if we can immediatly verify it.
nothing(); nothing();
} }
// Consider us connected. No longer accepting mtHELLO.
mConnected = true;
// XXX Set timer: connection is in grace period to be useful. // XXX Set timer: connection is in grace period to be useful.
// XXX Set timer: connection idle (idle may vary depending on connection type.) // XXX Set timer: connection idle (idle may vary depending on connection type.)

1
src/Peer.h
View File

@@ -32,6 +32,7 @@ public:
private: private:
bool mClientConnect; // In process of connecting as client. bool mClientConnect; // In process of connecting as client.
bool mConnected; // True, if hello accepted.
NewcoinAddress mNodePublic; // Node public key of peer. NewcoinAddress mNodePublic; // Node public key of peer.
ipPort mIpPort; ipPort mIpPort;
uint256 mCookieHash; uint256 mCookieHash;