From 59011f3719f6f2b7ccc8d6e10ffd789a92e398e3 Mon Sep 17 00:00:00 2001 From: Ember Date: Sat, 4 Apr 2026 16:49:28 -0700 Subject: [PATCH] Fix stale slot number in RF-to-network rewrite path After rewrite rules transform data (potentially changing the slot), the code used the pre-rewrite slotNo for status tracking and timers. Re-read slotNo after rewrite, matching the network-to-RF path. --- DMRGateway.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DMRGateway.cpp b/DMRGateway.cpp index 7b3f151..a40f12a 100644 --- a/DMRGateway.cpp +++ b/DMRGateway.cpp @@ -620,6 +620,7 @@ int CDMRGateway::run() } if (result == PROCESS_RESULT::MATCHED) { + slotNo = data.getSlotNo(); if (m_extStatus[slotNo].m_status == DMRGW_STATUS::NONE || ( m_extStatus[slotNo].m_status == DMRGW_STATUS::DMRNETWORK && m_extStatus[slotNo].m_dmrNetwork == i) @@ -650,6 +651,7 @@ int CDMRGateway::run() } if (result == PROCESS_RESULT::MATCHED) { + slotNo = data.getSlotNo(); if (m_extStatus[slotNo].m_status == DMRGW_STATUS::NONE || ( m_extStatus[slotNo].m_status == DMRGW_STATUS::DMRNETWORK && m_extStatus[slotNo].m_dmrNetwork == i)