From 211261a14698129412da9f63151dbbf9403bb215 Mon Sep 17 00:00:00 2001 From: Panya Bhinder Date: Fri, 8 Mar 2024 12:11:52 -0500 Subject: [PATCH 1/8] 107 added more descriptive error to packet decode --- EosLib/packet/packet.py | 1 + 1 file changed, 1 insertion(+) diff --git a/EosLib/packet/packet.py b/EosLib/packet/packet.py index f655880..b86ac19 100644 --- a/EosLib/packet/packet.py +++ b/EosLib/packet/packet.py @@ -141,6 +141,7 @@ def decode(packet_bytes: bytes): decoded_data_header = decoded_data_header packet_bytes = packet_bytes[struct.calcsize(DataHeader.data_header_struct_format_string):] else: + print(f"Unexpected packet header: {packet_bytes[0]}, should be: {HeaderPreamble.DATA}") raise PacketFormatError("Packet does not contain a header") decoded_packet = Packet(EosLib.format.decode_factory.decode_factory.decode(decoded_data_header.data_type, From aef29528830cbc906586621b9868458c85e94d7f Mon Sep 17 00:00:00 2001 From: Panya Bhinder Date: Fri, 8 Mar 2024 12:20:35 -0500 Subject: [PATCH 2/8] 107 added more descriptive error to packet decode again --- EosLib/packet/packet.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/EosLib/packet/packet.py b/EosLib/packet/packet.py index b86ac19..0b0172c 100644 --- a/EosLib/packet/packet.py +++ b/EosLib/packet/packet.py @@ -141,8 +141,7 @@ def decode(packet_bytes: bytes): decoded_data_header = decoded_data_header packet_bytes = packet_bytes[struct.calcsize(DataHeader.data_header_struct_format_string):] else: - print(f"Unexpected packet header: {packet_bytes[0]}, should be: {HeaderPreamble.DATA}") - raise PacketFormatError("Packet does not contain a header") + raise PacketFormatError(f"Packet does not contain a header. Unexpected packet header: {packet_bytes[0]}, should be: {HeaderPreamble.DATA}") decoded_packet = Packet(EosLib.format.decode_factory.decode_factory.decode(decoded_data_header.data_type, packet_bytes), From 54a375181d839bd7a47e5e2e7ef14bda53e4cf91 Mon Sep 17 00:00:00 2001 From: Panya Bhinder Date: Fri, 8 Mar 2024 12:39:11 -0500 Subject: [PATCH 3/8] 107 remove error for testing --- EosLib/packet/packet.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/EosLib/packet/packet.py b/EosLib/packet/packet.py index 0b0172c..13e68bd 100644 --- a/EosLib/packet/packet.py +++ b/EosLib/packet/packet.py @@ -141,7 +141,8 @@ def decode(packet_bytes: bytes): decoded_data_header = decoded_data_header packet_bytes = packet_bytes[struct.calcsize(DataHeader.data_header_struct_format_string):] else: - raise PacketFormatError(f"Packet does not contain a header. Unexpected packet header: {packet_bytes[0]}, should be: {HeaderPreamble.DATA}") + pass + #raise PacketFormatError(f"Packet does not contain a header. Unexpected packet header: {packet_bytes[0]}, should be: {HeaderPreamble.DATA}") decoded_packet = Packet(EosLib.format.decode_factory.decode_factory.decode(decoded_data_header.data_type, packet_bytes), From bfc740e78e080996ec1e806aff977baf35df6e5a Mon Sep 17 00:00:00 2001 From: Panya Bhinder Date: Fri, 8 Mar 2024 12:49:40 -0500 Subject: [PATCH 4/8] 107 remove error for testing and set header to none --- EosLib/packet/packet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EosLib/packet/packet.py b/EosLib/packet/packet.py index 13e68bd..d0dfa60 100644 --- a/EosLib/packet/packet.py +++ b/EosLib/packet/packet.py @@ -141,7 +141,7 @@ def decode(packet_bytes: bytes): decoded_data_header = decoded_data_header packet_bytes = packet_bytes[struct.calcsize(DataHeader.data_header_struct_format_string):] else: - pass + decoded_data_header = None #raise PacketFormatError(f"Packet does not contain a header. Unexpected packet header: {packet_bytes[0]}, should be: {HeaderPreamble.DATA}") decoded_packet = Packet(EosLib.format.decode_factory.decode_factory.decode(decoded_data_header.data_type, From 60a296761cbe1f4f5a6a73f2f8ecee4b40678be2 Mon Sep 17 00:00:00 2001 From: Panya Bhinder Date: Fri, 8 Mar 2024 12:55:38 -0500 Subject: [PATCH 5/8] 107 remove error for testing and set header to default --- EosLib/packet/packet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EosLib/packet/packet.py b/EosLib/packet/packet.py index d0dfa60..705eafd 100644 --- a/EosLib/packet/packet.py +++ b/EosLib/packet/packet.py @@ -141,7 +141,7 @@ def decode(packet_bytes: bytes): decoded_data_header = decoded_data_header packet_bytes = packet_bytes[struct.calcsize(DataHeader.data_header_struct_format_string):] else: - decoded_data_header = None + decoded_data_header = DataHeader(sender=Device.RADIO) #raise PacketFormatError(f"Packet does not contain a header. Unexpected packet header: {packet_bytes[0]}, should be: {HeaderPreamble.DATA}") decoded_packet = Packet(EosLib.format.decode_factory.decode_factory.decode(decoded_data_header.data_type, From a3ff84fd7a293badfb56821966294f6484788a8a Mon Sep 17 00:00:00 2001 From: Panya Bhinder Date: Fri, 8 Mar 2024 12:58:04 -0500 Subject: [PATCH 6/8] 107 remove error for testing and set header to default again --- EosLib/packet/packet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EosLib/packet/packet.py b/EosLib/packet/packet.py index 705eafd..54a3093 100644 --- a/EosLib/packet/packet.py +++ b/EosLib/packet/packet.py @@ -141,7 +141,7 @@ def decode(packet_bytes: bytes): decoded_data_header = decoded_data_header packet_bytes = packet_bytes[struct.calcsize(DataHeader.data_header_struct_format_string):] else: - decoded_data_header = DataHeader(sender=Device.RADIO) + decoded_data_header = DataHeader(sender=Device.RADIO, data_type=Type.EMPTY) #raise PacketFormatError(f"Packet does not contain a header. Unexpected packet header: {packet_bytes[0]}, should be: {HeaderPreamble.DATA}") decoded_packet = Packet(EosLib.format.decode_factory.decode_factory.decode(decoded_data_header.data_type, From 52096cce67ead2139948913618af6f016efc58e7 Mon Sep 17 00:00:00 2001 From: Panya Bhinder Date: Fri, 8 Mar 2024 13:07:45 -0500 Subject: [PATCH 7/8] 107 more descriptive error again --- EosLib/packet/packet.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/EosLib/packet/packet.py b/EosLib/packet/packet.py index 54a3093..b57a2ae 100644 --- a/EosLib/packet/packet.py +++ b/EosLib/packet/packet.py @@ -141,8 +141,10 @@ def decode(packet_bytes: bytes): decoded_data_header = decoded_data_header packet_bytes = packet_bytes[struct.calcsize(DataHeader.data_header_struct_format_string):] else: - decoded_data_header = DataHeader(sender=Device.RADIO, data_type=Type.EMPTY) - #raise PacketFormatError(f"Packet does not contain a header. Unexpected packet header: {packet_bytes[0]}, should be: {HeaderPreamble.DATA}") + decoded_data_header = DataHeader.decode( + packet_bytes[0:struct.calcsize(DataHeader.data_header_struct_format_string)]) + raise PacketFormatError(f"Packet does not contain a header. Unexpected packet header: {packet_bytes[0]}, \ + should be: {HeaderPreamble.DATA}. Decoded header: {decoded_data_header}") decoded_packet = Packet(EosLib.format.decode_factory.decode_factory.decode(decoded_data_header.data_type, packet_bytes), From 539afcc586e631062cb3d5ba9232edb9b7349f25 Mon Sep 17 00:00:00 2001 From: Panya Bhinder Date: Fri, 8 Mar 2024 16:14:20 -0500 Subject: [PATCH 8/8] 107 more descriptive error and deleted any other additions --- EosLib/packet/packet.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/EosLib/packet/packet.py b/EosLib/packet/packet.py index b57a2ae..3c43cb4 100644 --- a/EosLib/packet/packet.py +++ b/EosLib/packet/packet.py @@ -141,10 +141,8 @@ def decode(packet_bytes: bytes): decoded_data_header = decoded_data_header packet_bytes = packet_bytes[struct.calcsize(DataHeader.data_header_struct_format_string):] else: - decoded_data_header = DataHeader.decode( - packet_bytes[0:struct.calcsize(DataHeader.data_header_struct_format_string)]) raise PacketFormatError(f"Packet does not contain a header. Unexpected packet header: {packet_bytes[0]}, \ - should be: {HeaderPreamble.DATA}. Decoded header: {decoded_data_header}") + should be: {HeaderPreamble.DATA}") decoded_packet = Packet(EosLib.format.decode_factory.decode_factory.decode(decoded_data_header.data_type, packet_bytes),