don't make *all* AMBT's goto the immediate queue, only do this for AUTH_DMD;

pull/61/head
Bryan Biedenkapp 2 years ago
parent ca3fc407c0
commit 6dad7186c4

@ -1581,7 +1581,7 @@ void ControlSignaling::writeRF_TSDU_MBF(lc::TSBK* tsbk)
/* Helper to write a alternate multi-block trunking PDU packet. */ /* Helper to write a alternate multi-block trunking PDU packet. */
void ControlSignaling::writeRF_TSDU_AMBT(lc::AMBT* ambt) void ControlSignaling::writeRF_TSDU_AMBT(lc::AMBT* ambt, bool imm)
{ {
if (!m_p25->m_enableControl) if (!m_p25->m_enableControl)
return; return;
@ -1608,7 +1608,7 @@ void ControlSignaling::writeRF_TSDU_AMBT(lc::AMBT* ambt)
Utils::dump(1U, "!!! *PDU (AMBT) TSBK Block Data", pduUserData, P25_PDU_UNCONFIRMED_LENGTH_BYTES * header.getBlocksToFollow()); Utils::dump(1U, "!!! *PDU (AMBT) TSBK Block Data", pduUserData, P25_PDU_UNCONFIRMED_LENGTH_BYTES * header.getBlocksToFollow());
} }
m_p25->m_data->writeRF_PDU_User(header, header, false, pduUserData, true); m_p25->m_data->writeRF_PDU_User(header, header, false, pduUserData, imm);
} }
/* /*
@ -2812,7 +2812,7 @@ void ControlSignaling::writeRF_TSDU_Auth_Dmd(uint32_t srcId)
LogMessage(LOG_RF, P25_TSDU_STR ", %s, srcId = %u, RC = %X", osp->toString().c_str(), srcId, challenge); LogMessage(LOG_RF, P25_TSDU_STR ", %s, srcId = %u, RC = %X", osp->toString().c_str(), srcId, challenge);
} }
writeRF_TSDU_AMBT(osp.get()); writeRF_TSDU_AMBT(osp.get(), true);
} }
/* Helper to write a call termination packet. */ /* Helper to write a call termination packet. */

@ -281,8 +281,9 @@ namespace p25
/** /**
* @brief Helper to write a alternate multi-block PDU packet. * @brief Helper to write a alternate multi-block PDU packet.
* @param tsbk AMBT to write to the modem. * @param tsbk AMBT to write to the modem.
* @param imm Flag indicating the AMBT should be written to the immediate queue.
*/ */
void writeRF_TSDU_AMBT(lc::AMBT* ambt); void writeRF_TSDU_AMBT(lc::AMBT* ambt, bool imm = false);
/* /*
** Control Signalling Logic ** Control Signalling Logic

Loading…
Cancel
Save

Powered by TurnKey Linux.