Bitmessage/MiNode
3
0
Fork 1
Code Pull Requests 9 Actions Activity

Send known addresses before objects

Browse Source
This commit is contained in:
TheKysek 2017-06-16 09:32:59 +02:00
parent 918a926c88
commit 15620435ff
No known key found for this signature in database
GPG Key ID: 50D9AF00D0B1C497
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
minode/connection.py
View File

@ -181,6 +181,15 @@ class Connection(threading.Thread):
self.on_connection_fully_established_scheduled = False self.on_connection_fully_established_scheduled = False
if self.remote_version.services & 2 and self.network == 'ip': # NODE_SSL if self.remote_version.services & 2 and self.network == 'ip': # NODE_SSL
self._do_tls_handshake() self._do_tls_handshake()
addr = {structure.NetAddr(c.remote_version.services, c.host, c.port) for c in shared.connections.copy() if c.network != 'i2p' and not c.server and c.status == 'fully_established'}
if len(shared.node_pool) > 10:
addr.update({structure.NetAddr(1, a[0], a[1]) for a in random.sample(shared.node_pool, 10) if a[1] != 'i2p'})
if len(shared.unchecked_node_pool) > 10:
addr.update({structure.NetAddr(1, a[0], a[1]) for a in random.sample(shared.unchecked_node_pool, 10) if a[1] != 'i2p'})
if len(addr) != 0:
self.send_queue.put(message.Addr(addr))
with shared.objects_lock: with shared.objects_lock:
if len(shared.objects) > 0: if len(shared.objects) > 0:
to_send = {vector for vector in shared.objects.keys() if shared.objects[vector].expires_time > time.time()} to_send = {vector for vector in shared.objects.keys() if shared.objects[vector].expires_time > time.time()}
@ -193,13 +202,6 @@ class Connection(threading.Thread):
else: else:
self.send_queue.put(message.Inv(to_send)) self.send_queue.put(message.Inv(to_send))
to_send.clear() to_send.clear()
addr = {structure.NetAddr(c.remote_version.services, c.host, c.port) for c in shared.connections.copy() if c.network != 'i2p' and not c.server and c.status == 'fully_established'}
if len(shared.node_pool) > 10:
addr.update({structure.NetAddr(1, a[0], a[1]) for a in random.sample(shared.node_pool, 10) if a[1] != 'i2p'})
if len(shared.unchecked_node_pool) > 10:
addr.update({structure.NetAddr(1, a[0], a[1]) for a in random.sample(shared.unchecked_node_pool, 10) if a[1] != 'i2p'})
if len(addr) != 0:
self.send_queue.put(message.Addr(addr))
self.status = 'fully_established' self.status = 'fully_established'
def _process_queue(self): def _process_queue(self):