don't network repeat AMBT PDUs; ensure AMBTs aren't processed if control processing is disabled;

pull/35/head
Bryan Biedenkapp 3 years ago
parent b4bbca3ca5
commit 31e6769ddc

@ -236,7 +236,11 @@ bool Data::process(uint8_t* data, uint32_t len)
}
}
writeNetwork(m_rfDataBlockCnt, m_pduUserData + dataOffset, (m_rfDataHeader.getFormat() == PDU_FMT_CONFIRMED) ? P25_PDU_CONFIRMED_DATA_LENGTH_BYTES : P25_PDU_UNCONFIRMED_LENGTH_BYTES);
// only repeat data blocks if we're not an AMBT
if (m_rfDataHeader.getFormat() != PDU_FMT_AMBT) {
writeNetwork(m_rfDataBlockCnt, m_pduUserData + dataOffset, (m_rfDataHeader.getFormat() == PDU_FMT_CONFIRMED) ? P25_PDU_CONFIRMED_DATA_LENGTH_BYTES : P25_PDU_UNCONFIRMED_LENGTH_BYTES);
}
m_rfDataBlockCnt++;
}
else {

@ -909,6 +909,10 @@ bool Trunk::processNetwork(uint8_t* data, uint32_t len, lc::LC& control, data::L
/// <param name="dataBlock"></param>
bool Trunk::processMBT(DataHeader dataHeader, DataBlock* blocks)
{
if (!m_p25->m_control) {
return false;
}
uint8_t data[1U];
::memset(data, 0x00U, 1U);

Loading…
Cancel
Save

Powered by TurnKey Linux.