RanchiMall/electrumx
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only process peers if remote peer is good

Browse Source
This commit is contained in:
Neil Booth 2018-11-21 18:30:25 +00:00
parent 2ce5f9907e
commit 71466a6b01
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
electrumx/server/peers.py
View File

@ -294,7 +294,17 @@ class PeerManager(object):
async with TaskGroup() as g: async with TaskGroup() as g:
await g.spawn(self._send_headers_subscribe(session, peer, ptuple)) await g.spawn(self._send_headers_subscribe(session, peer, ptuple))
await g.spawn(self._send_server_features(session, peer)) await g.spawn(self._send_server_features(session, peer))
await g.spawn(self._send_peers_subscribe(session, peer)) peers_task = await g.spawn(self._send_peers_subscribe
(session, peer))
# Process reported peers if remote peer is good
peers = peers_task.result()
await self._note_peers(peers)
features = self._features_to_register(peer, peers)
if features:
self.logger.info(f'registering ourself with {peer}')
# We only care to wait for the response
await session.send_request('server.add_peer', [features])
async def _send_headers_subscribe(self, session, peer, ptuple): async def _send_headers_subscribe(self, session, peer, ptuple):
message = 'blockchain.headers.subscribe' message = 'blockchain.headers.subscribe'
@ -357,19 +367,11 @@ class PeerManager(object):
# Call add_peer if the remote doesn't appear to know about us. # Call add_peer if the remote doesn't appear to know about us.
try: try:
real_names = [' '.join([u[1]] + u[2]) for u in raw_peers] real_names = [' '.join([u[1]] + u[2]) for u in raw_peers]
peers = [Peer.from_real_name(real_name, str(peer)) return [Peer.from_real_name(real_name, str(peer))
for real_name in real_names] for real_name in real_names]
except Exception: except Exception:
raise BadPeerError('bad server.peers.subscribe response') raise BadPeerError('bad server.peers.subscribe response')
await self._note_peers(peers)
features = self._features_to_register(peer, peers)
if not features:
return
self.logger.info(f'registering ourself with {peer}')
# We only care to wait for the response
await session.send_request('server.add_peer', [features])
# #
# External interface # External interface
# #