oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix message parsing after data left in unpacker

Browse source
This commit is contained in:
shortcutme 2018-03-14 22:24:38 +01:00
parent 8787774764
commit 2204e0cf9c
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
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/Connection.py
View file

@ -200,7 +200,11 @@ class Connection(object):
self.unpacker.feed(buff) self.unpacker.feed(buff)
unpacker_bytes += buff_len unpacker_bytes += buff_len
for message in self.unpacker: while True:
try:
message = self.unpacker.next()
except StopIteration:
break
if not type(message) is dict: if not type(message) is dict:
raise Exception( raise Exception(
"Invalid message type: %s, content: %r, buffer: %r" % "Invalid message type: %s, content: %r, buffer: %r" %
@ -229,7 +233,6 @@ class Connection(object):
unpacker_bytes = len(buff_left) unpacker_bytes = len(buff_left)
if config.debug_socket: if config.debug_socket:
self.log("Start new unpacker with buff_left: %r" % buff_left) self.log("Start new unpacker with buff_left: %r" % buff_left)
break
else: else:
self.handleMessage(message) self.handleMessage(message)
@ -285,7 +288,7 @@ class Connection(object):
self.log("Stream read error: %s" % Debug.formatException(err)) self.log("Stream read error: %s" % Debug.formatException(err))
if config.debug_socket: if config.debug_socket:
self.log("End stream %s" % message["to"]) self.log("End stream %s, file pos: %s" % (message["to"], file.tell()))
self.incomplete_buff_recv = 0 self.incomplete_buff_recv = 0
self.waiting_requests[message["to"]]["evt"].set(message) # Set the response to event self.waiting_requests[message["to"]]["evt"].set(message) # Set the response to event