From 4d234ccfe7576772a32ea740bc709f15c4763a21 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Sat, 2 Dec 2023 15:18:44 -0500 Subject: [PATCH] okay at least my APX6000 fails authentication now; --- src/p25/lc/AMBT.cpp | 5 ++++- src/p25/packet/ControlSignaling.cpp | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/p25/lc/AMBT.cpp b/src/p25/lc/AMBT.cpp index 12fac0a0..f256910d 100644 --- a/src/p25/lc/AMBT.cpp +++ b/src/p25/lc/AMBT.cpp @@ -165,7 +165,10 @@ void AMBT::encode(data::DataHeader& dataHeader, uint8_t* pduUserData) dataHeader.setSAP(PDU_SAP_TRUNK_CTRL); dataHeader.setLLId(m_srcId); dataHeader.setFullMessage(true); - dataHeader.setBlocksToFollow(1U); + + if (dataHeader.getBlocksToFollow() == 0U) { + dataHeader.setBlocksToFollow(1U); + } dataHeader.setAMBTOpcode(m_lco); diff --git a/src/p25/packet/ControlSignaling.cpp b/src/p25/packet/ControlSignaling.cpp index ad6d09f7..4e5cddae 100644 --- a/src/p25/packet/ControlSignaling.cpp +++ b/src/p25/packet/ControlSignaling.cpp @@ -2864,7 +2864,8 @@ bool ControlSignaling::writeRF_TSDU_Loc_Reg_Rsp(uint32_t srcId, uint32_t dstId, void ControlSignaling::writeRF_TSDU_Auth_Dmd(uint32_t srcId) { std::unique_ptr osp = new_unique(MBT_OSP_AUTH_DMD); - osp->setSrcId(srcId); + osp->setSrcId(P25_WUID_FNE); + osp->setDstId(srcId); osp->setAuthRS(m_p25->m_llaRS); // generate challenge