|
|
|
@ -1138,6 +1138,10 @@ void Voice::writeNet_LDU1()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
else {
|
|
|
|
|
|
|
|
if (m_p25->m_rfLastDstId != 0U) {
|
|
|
|
|
|
|
|
resetNet();
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
LogWarning(LOG_NET, P25_LDU1_STR ", last LDU1 LC has bad data, dstId = 0");
|
|
|
|
LogWarning(LOG_NET, P25_LDU1_STR ", last LDU1 LC has bad data, dstId = 0");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -1272,6 +1276,8 @@ void Voice::writeNet_LDU1()
|
|
|
|
(m_netLC.getPriority() & 0x07U); // Priority
|
|
|
|
(m_netLC.getPriority() & 0x07U); // Priority
|
|
|
|
|
|
|
|
|
|
|
|
if (!m_p25->m_trunk->writeRF_TSDU_Grant(srcId, dstId, serviceOptions, group, false, true)) {
|
|
|
|
if (!m_p25->m_trunk->writeRF_TSDU_Grant(srcId, dstId, serviceOptions, group, false, true)) {
|
|
|
|
|
|
|
|
LogError(LOG_NET, P25_HDU_STR " call failure, not granted, this should not happen, dstId = %u", dstId);
|
|
|
|
|
|
|
|
|
|
|
|
if (m_network != nullptr)
|
|
|
|
if (m_network != nullptr)
|
|
|
|
m_network->resetP25();
|
|
|
|
m_network->resetP25();
|
|
|
|
|
|
|
|
|
|
|
|
|