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

Protocol tweaks

Browse Source
This commit is contained in:
TheKysek 2016-07-09 19:37:07 +02:00
parent 10ee0deb4b
commit 546ac96850
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/connection.py
View File

@ -60,8 +60,8 @@ class Connection(threading.Thread):
data = None data = None
if time.time() - self.last_message_received > 20 and self.status != 'verack_received': if time.time() - self.last_message_received > 20 and self.status != 'verack_received':
data = None data = None
if time.time() - self.last_message_sent > 60 and self.status == 'verack_received': if time.time() - self.last_message_sent > 300 and self.status == 'verack_received':
self.send_queue.put(message.Message(b'alive', b'')) self.send_queue.put(message.Message(b'pong', b''))
if not self.sent_big_inv_message and self.status == 'verack_received' and self.sent_verack: if not self.sent_big_inv_message and self.status == 'verack_received' and self.sent_verack:
self._send_big_inv() self._send_big_inv()
except ConnectionResetError: except ConnectionResetError:
@ -173,11 +173,14 @@ class Connection(threading.Thread):
for vector in getdata.vectors: for vector in getdata.vectors:
if vector in shared.objects: if vector in shared.objects:
self.send_queue.put(message.Message(b'object', shared.objects[vector].to_bytes())) self.send_queue.put(message.Message(b'object', shared.objects[vector].to_bytes()))
elif m.command == b'addr': # TODO fix ;P elif m.command == b'addr':
addr = message.Addr.from_message(m) addr = message.Addr.from_message(m)
logging.debug('{}:{} -> {}'.format(self.host, self.port, addr)) logging.debug('{}:{} -> {}'.format(self.host, self.port, addr))
for a in addr.addresses: for a in addr.addresses:
shared.unchecked_node_pool.add((a.host, a.port)) shared.unchecked_node_pool.add((a.host, a.port))
elif m.command == b'ping':
logging.debug('{}:{} -> ping'.format(self.host, self.port))
self.send_queue.put(message.Message(b'pong', b''))
else: else:
logging.debug('{}:{} -> {}'.format(self.host, self.port, m)) logging.debug('{}:{} -> {}'.format(self.host, self.port, m))