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

Don't announce self if not public

Browse Source 
Show all hosts add_peer gives
This commit is contained in:
Neil Booth 2017-02-26 15:24:56 +09:00
parent b3005fbb3e
commit e2d640dcb3
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/peers.py
View File

@ -112,14 +112,17 @@ class PeerSession(JSONSession):
self.peer_mgr.add_peers(peers) self.peer_mgr.add_peers(peers)
# Announce ourself if not present. Don't if disabled or we
# are a non-public IP address.
if not self.peer_mgr.env.peer_announce: if not self.peer_mgr.env.peer_announce:
return return
# Announce ourself if not present
my = self.peer_mgr.my_clearnet_peer() my = self.peer_mgr.my_clearnet_peer()
if not my.is_public:
return
for peer in my.matches(peers): for peer in my.matches(peers):
if peer.tcp_port == my.tcp_port and peer.ssl_port == my.ssl_port: if peer.tcp_port == my.tcp_port and peer.ssl_port == my.ssl_port:
return return
self.log_info('registering ourself with server.add_peer') self.log_info('registering ourself with server.add_peer')
self.send_request(self.on_add_peer, 'server.add_peer', [my.features]) self.send_request(self.on_add_peer, 'server.add_peer', [my.features])
@ -307,8 +310,9 @@ class PeerManager(util.LoggedClass):
'''Add peers from an incoming connection.''' '''Add peers from an incoming connection.'''
peers = Peer.peers_from_features(features, source) peers = Peer.peers_from_features(features, source)
if peers: if peers:
self.log_info('add_peer request received from {}' hosts = [peer.host for peer in peers]
.format(peers[0].host)) self.log_info('add_peer request from {} for {}'
.format(source, ', '.join(hosts)))
self.add_peers(peers, check_ports=True) self.add_peers(peers, check_ports=True)
return bool(peers) return bool(peers)