Skip to content

Commit

Permalink
Merge pull request #4 from antaris-inc/bw-len
Browse files Browse the repository at this point in the history
Correct length field validation
  • Loading branch information
bcwaldon authored Oct 1, 2024
2 parents b458329 + bf01950 commit 7df077b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
4 changes: 2 additions & 2 deletions satcom/openlst/client_packet_lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ class ClientPacketHeader(BaseModel):

def err(self):
"""Throws an error if any params are out of bounds"""
if self.length < 6 or self.length > 251:
return ValueError('length must be 6-251')
if self.length < 7 or self.length > 251:
return ValueError('length must be 7-251')
if self.hardware_id < 0 or self.hardware_id > 65535:
return ValueError('hardware_id must be 0-65535')
if self.sequence_number < 0 or self.sequence_number > 65535:
Expand Down
4 changes: 2 additions & 2 deletions satcom/openlst/space_packet_lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ class SpacePacketHeader(BaseModel):

def err(self):
"""Throws an error if any params are out of bounds"""
if self.length < 9 or self.length > 251:
return ValueError('length must be 9-251')
if self.length < 10 or self.length > 254:
return ValueError('length must be 10-254')
if self.sequence_number < 0 or self.sequence_number > 65535:
return ValueError('sequence_number must be 0-65535')
if self.destination < 0 or self.destination > 255:
Expand Down
3 changes: 1 addition & 2 deletions satcom/openlst/test_client_packet.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,5 +82,4 @@ def test_client_packet_from_bytes_empty_frame(self):
p = client_pkt_lib.ClientPacket(val)
pkt = p.from_bytes(val)

self.assertIsNone(pkt.err(), msg=f'{pkt.header.length}')
self.assertEqual(len(pkt.data), 0, f'expected empty result, got {pkt.data}')
self.assertIsNotNone(pkt.err())

0 comments on commit 7df077b

Please sign in to comment.