Skip to content

Avoid disconnect on short read #235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ikalchev merged 3 commits into from
Apr 6, 2020
Merged

Avoid disconnect on short read #235

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab3a110
Handle short read in crypto stream
bdraco Apr 4, 2020
7c870a9
Wait for a full block
bdraco Apr 5, 2020
35995b1
not keyword
bdraco Apr 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions pyhap/hap_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,11 +709,10 @@ def _wrapper(self, *args, **kwargs):
return func(self, *args, **kwargs)
return _wrapper

def recv_into(self, buffer, nbytes=1042, flags=0):
def recv_into(self, buffer, nbytes=None, flags=0):
"""Receive and decrypt up to nbytes in the given buffer."""
data = self.recv(nbytes, flags)
for i, b in enumerate(data):
buffer[i] = b
data = self.recv(nbytes or len(buffer), flags)
buffer[:len(data)] = data
return len(data)

def recv(self, buflen=1042, flags=0):
Expand All @@ -734,11 +733,12 @@ def recv(self, buflen=1042, flags=0):
# It may be that we already read some data and we have
# 1 byte left, return whatever we have.
return result
block_length_bytes = self.socket.recv(self.LENGTH_LENGTH)
# Always wait for a full block to arrive
block_length_bytes = self.socket.recv(
self.LENGTH_LENGTH, socket.MSG_WAITALL
)
if not block_length_bytes:
return result
# TODO: handle this
assert len(block_length_bytes) == self.LENGTH_LENGTH
# Init. info about the block we just started.
# Note we are setting the total length to block_length + mac length
self.curr_in_total = \
Expand Down