From 01e26c74a20a1fea5a004a3da1266bbd25983524 Mon Sep 17 00:00:00 2001 From: Bob Jacobsen Date: Wed, 10 Apr 2024 18:20:18 -0400 Subject: [PATCH 1/2] FIXME fixes --- openlcb/datagramservice.py | 6 ++---- openlcb/tcplink/tcplink.py | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/openlcb/datagramservice.py b/openlcb/datagramservice.py index 9539f66..909aefe 100644 --- a/openlcb/datagramservice.py +++ b/openlcb/datagramservice.py @@ -222,8 +222,7 @@ def handleDatagramRejected(self, message): "Outstanding and replied-to memos don't match on rejected" ) - currentOutstandingMemo = None - # FIXME: unused currentOutstandingMemo. Is any code incomplete here? + self.currentOutstandingMemo = None # fire the callback memo.rejectedReply(memo) @@ -232,8 +231,7 @@ def handleDatagramRejected(self, message): def handleLinkQuiesce(self, message): '''Link quiesced before outage: stop operation''' - quiesced = True - # FIXME: unused quiesced. Is any code incomplete here? + self.quiesced = True def handleLinkRestarted(self, message): '''Link restarted after outage: diff --git a/openlcb/tcplink/tcplink.py b/openlcb/tcplink/tcplink.py index 0dec6cc..0c7dca1 100644 --- a/openlcb/tcplink/tcplink.py +++ b/openlcb/tcplink/tcplink.py @@ -146,8 +146,7 @@ def forwardMessage(self, messageBytes, gatewayNodeID) : # not sure why gatewayN data = messageBytes[8:] if mti.addressPresent() : destNodeID = NodeID(messagePart[8:13]) - # FIXME: ^ messagePart is undefined. Slice data or messageBytes? - data = messageBytes[14:] + data = messagePart[14:] # and finally create the message message = Message(mti, sourceNodeID, destNodeID, data) # forward to listeners From af9ebf350c7774cfd66c1ce6113436f09cc92e8b Mon Sep 17 00:00:00 2001 From: Bob Jacobsen Date: Sun, 14 Apr 2024 19:31:00 -0400 Subject: [PATCH 2/2] messageBytes not messagePart --- openlcb/tcplink/tcplink.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openlcb/tcplink/tcplink.py b/openlcb/tcplink/tcplink.py index 0c7dca1..1ff188e 100644 --- a/openlcb/tcplink/tcplink.py +++ b/openlcb/tcplink/tcplink.py @@ -145,8 +145,8 @@ def forwardMessage(self, messageBytes, gatewayNodeID) : # not sure why gatewayN destNodeID = None data = messageBytes[8:] if mti.addressPresent() : - destNodeID = NodeID(messagePart[8:13]) - data = messagePart[14:] + destNodeID = NodeID(messageBytes[8:13]) + data = messageBytes[14:] # and finally create the message message = Message(mti, sourceNodeID, destNodeID, data) # forward to listeners