|
|
@ -176,11 +176,6 @@ void Host::doneWorking() |
|
|
m_sessions.clear(); |
|
|
m_sessions.clear(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
unsigned Host::protocolVersion() const |
|
|
|
|
|
{ |
|
|
|
|
|
return 3; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void Host::startPeerSession(Public const& _id, RLP const& _rlp, RLPXFrameIO* _io, bi::tcp::endpoint _endpoint) |
|
|
void Host::startPeerSession(Public const& _id, RLP const& _rlp, RLPXFrameIO* _io, bi::tcp::endpoint _endpoint) |
|
|
{ |
|
|
{ |
|
|
shared_ptr<Peer> p; |
|
|
shared_ptr<Peer> p; |
|
|
@ -211,7 +206,7 @@ void Host::startPeerSession(Public const& _id, RLP const& _rlp, RLPXFrameIO* _io |
|
|
|
|
|
|
|
|
// create session so disconnects are managed
|
|
|
// create session so disconnects are managed
|
|
|
auto ps = make_shared<Session>(this, _io, p, PeerSessionInfo({_id, clientVersion, _endpoint.address().to_string(), listenPort, chrono::steady_clock::duration(), _rlp[2].toSet<CapDesc>(), 0, map<string, string>()})); |
|
|
auto ps = make_shared<Session>(this, _io, p, PeerSessionInfo({_id, clientVersion, _endpoint.address().to_string(), listenPort, chrono::steady_clock::duration(), _rlp[2].toSet<CapDesc>(), 0, map<string, string>()})); |
|
|
if (protocolVersion != this->protocolVersion()) |
|
|
if (protocolVersion != dev::p2p::c_protocolVersion) |
|
|
{ |
|
|
{ |
|
|
ps->disconnect(IncompatibleProtocol); |
|
|
ps->disconnect(IncompatibleProtocol); |
|
|
return; |
|
|
return; |
|
|
@ -266,7 +261,7 @@ void Host::onNodeTableEvent(NodeId const& _n, NodeTableEventType const& _e) |
|
|
p->required = n.required; |
|
|
p->required = n.required; |
|
|
m_peers[_n] = p; |
|
|
m_peers[_n] = p; |
|
|
|
|
|
|
|
|
clog(NetNote) << "p2p.host.peers.events.peersAdded " << _n << p->endpoint.tcp.address() << p->endpoint.udp.address(); |
|
|
clog(NetNote) << "p2p.host.peers.events.peersAdded " << _n << "udp:" << p->endpoint.udp.address() << "tcp:" << p->endpoint.tcp.address(); |
|
|
} |
|
|
} |
|
|
p->endpoint.tcp = n.endpoint.tcp; |
|
|
p->endpoint.tcp = n.endpoint.tcp; |
|
|
} |
|
|
} |
|
|
@ -480,6 +475,7 @@ void Host::connect(std::shared_ptr<Peer> const& _p) |
|
|
clog(NetConnect) << "Connection refused to node" << _p->id.abridged() << "@" << _p->peerEndpoint() << "(" << ec.message() << ")"; |
|
|
clog(NetConnect) << "Connection refused to node" << _p->id.abridged() << "@" << _p->peerEndpoint() << "(" << ec.message() << ")"; |
|
|
_p->m_lastDisconnect = TCPError; |
|
|
_p->m_lastDisconnect = TCPError; |
|
|
_p->m_lastAttempted = std::chrono::system_clock::now(); |
|
|
_p->m_lastAttempted = std::chrono::system_clock::now(); |
|
|
|
|
|
_p->m_failedAttempts++; |
|
|
} |
|
|
} |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
@ -615,8 +611,7 @@ void Host::startedWorking() |
|
|
else |
|
|
else |
|
|
clog(NetNote) << "p2p.start.notice id:" << id().abridged() << "Listen port is invalid or unavailable. Node Table using default port (30303)."; |
|
|
clog(NetNote) << "p2p.start.notice id:" << id().abridged() << "Listen port is invalid or unavailable. Node Table using default port (30303)."; |
|
|
|
|
|
|
|
|
// TODO: add m_tcpPublic endpoint; sort out endpoint stuff for nodetable
|
|
|
m_nodeTable.reset(new NodeTable(m_ioService, m_alias, bi::address::from_string(listenAddress()), listenPort() > 0 ? listenPort() : 30303)); |
|
|
m_nodeTable.reset(new NodeTable(m_ioService, m_alias, m_listenPort > 0 ? m_listenPort : 30303)); |
|
|
|
|
|
m_nodeTable->setEventHandler(new HostNodeTableHandler(*this)); |
|
|
m_nodeTable->setEventHandler(new HostNodeTableHandler(*this)); |
|
|
restoreNetwork(&m_restoreNetwork); |
|
|
restoreNetwork(&m_restoreNetwork); |
|
|
|
|
|
|
|
|
@ -680,7 +675,7 @@ bytes Host::saveNetwork() const |
|
|
// TODO: alpha: Figure out why it ever shares these ports.//p.address.port() >= 30300 && p.address.port() <= 30305 &&
|
|
|
// TODO: alpha: Figure out why it ever shares these ports.//p.address.port() >= 30300 && p.address.port() <= 30305 &&
|
|
|
// TODO: alpha: if/how to save private addresses
|
|
|
// TODO: alpha: if/how to save private addresses
|
|
|
// Only save peers which have connected within 2 days, with properly-advertised port and public IP address
|
|
|
// Only save peers which have connected within 2 days, with properly-advertised port and public IP address
|
|
|
if (chrono::system_clock::now() - p.m_lastConnected < chrono::seconds(3600 * 48) && p.peerEndpoint().port() > 0 && p.peerEndpoint().port() < /*49152*/32768 && p.id != id() && !isPrivateAddress(p.peerEndpoint().address())) |
|
|
if (chrono::system_clock::now() - p.m_lastConnected < chrono::seconds(3600 * 48) && p.peerEndpoint().port() > 0 && p.peerEndpoint().port() < /*49152*/32768 && p.id != id() && !isPrivateAddress(p.endpoint.udp.address()) && !isPrivateAddress(p.endpoint.tcp.address())) |
|
|
{ |
|
|
{ |
|
|
network.appendList(10); |
|
|
network.appendList(10); |
|
|
if (p.peerEndpoint().address().is_v4()) |
|
|
if (p.peerEndpoint().address().is_v4()) |
|
|
@ -714,7 +709,7 @@ bytes Host::saveNetwork() const |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
RLPStream ret(3); |
|
|
RLPStream ret(3); |
|
|
ret << 1 << m_alias.secret(); |
|
|
ret << dev::p2p::c_protocolVersion << m_alias.secret(); |
|
|
ret.appendList(count).appendRaw(network.out(), count); |
|
|
ret.appendList(count).appendRaw(network.out(), count); |
|
|
return ret.out(); |
|
|
return ret.out(); |
|
|
} |
|
|
} |
|
|
@ -727,7 +722,7 @@ void Host::restoreNetwork(bytesConstRef _b) |
|
|
|
|
|
|
|
|
RecursiveGuard l(x_sessions); |
|
|
RecursiveGuard l(x_sessions); |
|
|
RLP r(_b); |
|
|
RLP r(_b); |
|
|
if (r.itemCount() > 0 && r[0].isInt() && r[0].toInt<int>() == 1) |
|
|
if (r.itemCount() > 0 && r[0].isInt() && r[0].toInt<unsigned>() == dev::p2p::c_protocolVersion) |
|
|
{ |
|
|
{ |
|
|
// r[0] = version
|
|
|
// r[0] = version
|
|
|
// r[1] = key
|
|
|
// r[1] = key
|
|
|
@ -747,6 +742,13 @@ void Host::restoreNetwork(bytesConstRef _b) |
|
|
tcp = bi::tcp::endpoint(bi::address_v6(i[0].toArray<byte, 16>()), i[1].toInt<short>()); |
|
|
tcp = bi::tcp::endpoint(bi::address_v6(i[0].toArray<byte, 16>()), i[1].toInt<short>()); |
|
|
udp = bi::udp::endpoint(bi::address_v6(i[0].toArray<byte, 16>()), i[1].toInt<short>()); |
|
|
udp = bi::udp::endpoint(bi::address_v6(i[0].toArray<byte, 16>()), i[1].toInt<short>()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// skip private addresses
|
|
|
|
|
|
// todo: to support private addresseses entries must be stored
|
|
|
|
|
|
// and managed externally by host rather than nodetable.
|
|
|
|
|
|
if (isPrivateAddress(tcp.address()) || isPrivateAddress(udp.address())) |
|
|
|
|
|
continue; |
|
|
|
|
|
|
|
|
auto id = (NodeId)i[2]; |
|
|
auto id = (NodeId)i[2]; |
|
|
if (i.itemCount() == 3) |
|
|
if (i.itemCount() == 3) |
|
|
m_nodeTable->addNode(id, udp, tcp); |
|
|
m_nodeTable->addNode(id, udp, tcp); |
|
|
|
Gav Wood
10 years ago