Skip to content

rtu_framer: fix processing of incomplete frames #466

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
merged 2 commits into from
Nov 13, 2019
Merged

rtu_framer: fix processing of incomplete frames #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d2f89b
rtu_framer: fix processing of incomplete frames
stv0g Nov 5, 2019
2f490f9
rtu_framer: fix test case
stv0g Nov 7, 2019
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
8 changes: 7 additions & 1 deletion pymodbus/framer/rtu_framer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,13 @@ def isFrameReady(self):

:returns: True if ready, False otherwise
"""
return len(self._buffer) > self._hsize
if len(self._buffer) > self._hsize:
if not self._header:
self.populateHeader()

return self._header and len(self._buffer) >= self._header['len']
else:
return False

def populateHeader(self, data=None):
"""
Expand Down
10 changes: 8 additions & 2 deletions test/test_framers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,13 @@ def test_reset_framer(rtu_framer, data):
assert rtu_framer._buffer == b''


@pytest.mark.parametrize("data", [(b'', False), (b'abcd', True)])
@pytest.mark.parametrize("data", [
(b'', False),
(b'\x11\x03\x06', False),
(b'\x11\x03\x06\xAE\x41\x56\x52\x43\x40\x49', False),
(b'\x11\x03\x06\xAE\x41\x56\x52\x43\x40\x49\xAD', True),
(b'\x11\x03\x06\xAE\x41\x56\x52\x43\x40\x49\xAD\xAB\xCD', True)
])
def test_is_frame_ready(rtu_framer, data):
data, expected = data
rtu_framer._buffer = data
Expand Down Expand Up @@ -185,4 +191,4 @@ def test_decode_ascii_data(ascii_framer, data):
assert data.get("unit") == 1
assert data.get("fcode") == 1
else:
assert not data
assert not data