fix condition where permitted TG would not be reset after a TG hangtime timeout;

pull/24/head
Bryan Biedenkapp 3 years ago
parent 08d282844d
commit 5b8b6f70af

@ -498,6 +498,11 @@ void Slot::clock()
LogMessage(LOG_RF, "Slot %u, talkgroup hang has expired, lastDstId = %u", m_slotNo, m_rfLastDstId); LogMessage(LOG_RF, "Slot %u, talkgroup hang has expired, lastDstId = %u", m_slotNo, m_rfLastDstId);
} }
m_rfLastDstId = 0U; m_rfLastDstId = 0U;
// reset permitted ID and clear permission state
if (!m_authoritative && m_permittedDstId != 0U) {
m_permittedDstId = 0U;
}
} }
} }

@ -550,6 +550,11 @@ void Control::clock(uint32_t ms)
LogMessage(LOG_RF, "talkgroup hang has expired, lastDstId = %u", m_rfLastDstId); LogMessage(LOG_RF, "talkgroup hang has expired, lastDstId = %u", m_rfLastDstId);
} }
m_rfLastDstId = 0U; m_rfLastDstId = 0U;
// reset permitted ID and clear permission state
if (!m_authoritative && m_permittedDstId != 0U) {
m_permittedDstId = 0U;
}
} }
} }

@ -701,6 +701,11 @@ void Control::clock(uint32_t ms)
LogMessage(LOG_RF, "talkgroup hang has expired, lastDstId = %u", m_rfLastDstId); LogMessage(LOG_RF, "talkgroup hang has expired, lastDstId = %u", m_rfLastDstId);
} }
m_rfLastDstId = 0U; m_rfLastDstId = 0U;
// reset permitted ID and clear permission state
if (!m_authoritative && m_permittedDstId != 0U) {
m_permittedDstId = 0U;
}
} }
} }

Loading…
Cancel
Save

Powered by TurnKey Linux.