From db359d6f71e1fbd5365366d2c8ff8292df6450ac Mon Sep 17 00:00:00 2001
From: Marko Mecina <marko.mecina@univie.ac.at>
Date: Tue, 16 Aug 2022 13:56:47 +0200
Subject: [PATCH] bugfix in SpW packet handling
---
Ccs/pus_datapool.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Ccs/pus_datapool.py b/Ccs/pus_datapool.py
index 906e060..bbc215e 100644
--- a/Ccs/pus_datapool.py
+++ b/Ccs/pus_datapool.py
@@ -1706,7 +1706,7 @@ class DatapoolManager:
if (tla == self.TLA) and (pid in self.PROTOCOL_IDS):
buf = pkt_size_stream
else:
- return None, pkt_size_stream[1:]
+ return pid, None, None, pkt_size_stream[1:]
if self.PROTOCOL_IDS[pid] == "FEEDATA":
header = self.pc.FeeDataTransferHeader()
@@ -1726,7 +1726,7 @@ class DatapoolManager:
elif (instruction >> 5) & 0b11 == 0b00:
header = self.pc.RMapReplyReadHeader()
- hsize = header.__class__.bits.size
+ hsize = type(header).bits.size
while len(buf) < hsize:
buf += sockfd.recv(hsize - len(buf))
--
GitLab