diff --git a/src/common/p25/P25Defines.h b/src/common/p25/P25Defines.h index b25b5a4a..d4f0fc52 100644 --- a/src/common/p25/P25Defines.h +++ b/src/common/p25/P25Defines.h @@ -833,6 +833,7 @@ namespace p25 // TSBK Inbound Signalling Packet (ISP) Opcode(s) ISP_TELE_INT_PSTN_REQ = 0x09U, //!< TELE INT PSTN REQ - Telephone Interconnect Request - Implicit ISP_SNDCP_CH_REQ = 0x12U, //!< SNDCP CH REQ - SNDCP Data Channel Request + ISP_SNDCP_DATA_PAGE_RES = 0x13U, //!< SNDCP DATA PAGE RES - SNDCP Data Page Response ISP_SNDCP_REC_REQ = 0x14U, //!< SNDCP REC REQ - SNDCP Reconnect Request ISP_STS_Q_RSP = 0x19U, //!< STS Q RSP - Status Query Response ISP_STS_Q_REQ = 0x1CU, //!< STS Q REQ - Status Query Request @@ -850,6 +851,7 @@ namespace p25 OSP_GRP_VCH_GRANT_UPD = 0x02U, //!< GRP VCH GRANT UPD - Group Voice Channel Grant Update OSP_UU_VCH_GRANT_UPD = 0x06U, //!< UU VCH GRANT UPD - Unit-to-Unit Voice Channel Grant Update OSP_SNDCP_CH_GNT = 0x14U, //!< SNDCP CH GNT - SNDCP Data Channel Grant + OSP_SNDCP_DATA_PAGE_REQ = 0x15U, //!< SNDCP DATA PAGE REQ - SNDCP Data Page Request OSP_SNDCP_CH_ANN = 0x16U, //!< SNDCP CH ANN - SNDCP Data Channel Announcement OSP_STS_Q = 0x1AU, //!< STS Q - Status Query OSP_QUE_RSP = 0x21U, //!< QUE RSP - Queued Response diff --git a/src/common/p25/data/Assembler.cpp b/src/common/p25/data/Assembler.cpp index 8df3a9f5..e6688f49 100644 --- a/src/common/p25/data/Assembler.cpp +++ b/src/common/p25/data/Assembler.cpp @@ -162,10 +162,7 @@ bool Assembler::disassemble(const uint8_t* pduBlock, uint32_t blockLength, bool m_dataBlockCnt = 0U; // process all blocks in the data stream - // if the primary header has a header offset ensure data if offset by that amount - if (dataHeader.getHeaderOffset() > 0U) { - offset += dataHeader.getHeaderOffset(); - } + // the header offset counts octets of reassembled user data, it does not shift the coded blocks uint32_t packetLength = dataHeader.getPacketLength(); uint32_t padLength = dataHeader.getPadLength(); diff --git a/src/common/p25/lc/tsbk/ISP_SNDCP_DATA_PAGE_RES.cpp b/src/common/p25/lc/tsbk/ISP_SNDCP_DATA_PAGE_RES.cpp new file mode 100644 index 00000000..e880eef7 --- /dev/null +++ b/src/common/p25/lc/tsbk/ISP_SNDCP_DATA_PAGE_RES.cpp @@ -0,0 +1,86 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Digital Voice Modem - Common Library + * GPLv2 Open Source. Use is subject to license terms. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright (C) 2026 David Andrzejewski + * + */ +#include "Defines.h" +#include "p25/lc/tsbk/ISP_SNDCP_DATA_PAGE_RES.h" + +using namespace p25; +using namespace p25::defines; +using namespace p25::lc; +using namespace p25::lc::tsbk; + +#include + +// --------------------------------------------------------------------------- +// Public Class Members +// --------------------------------------------------------------------------- + +/* Initializes a new instance of the ISP_SNDCP_DATA_PAGE_RES class. */ + +ISP_SNDCP_DATA_PAGE_RES::ISP_SNDCP_DATA_PAGE_RES() : TSBK(), + m_dataServiceOptions(0U), + m_answerResponse(0U), + m_dataAccessControl(0U) +{ + m_lco = TSBKO::ISP_SNDCP_DATA_PAGE_RES; +} + +/* Decode a trunking signalling block. */ + +bool ISP_SNDCP_DATA_PAGE_RES::decode(const uint8_t* data, bool rawTSBK) +{ + assert(data != nullptr); + + uint8_t tsbk[P25_TSBK_LENGTH_BYTES + 1U]; + ::memset(tsbk, 0x00U, P25_TSBK_LENGTH_BYTES); + + bool ret = TSBK::decode(data, tsbk, rawTSBK); + if (!ret) + return false; + + ulong64_t tsbkValue = TSBK::toValue(tsbk); + + m_dataServiceOptions = (uint8_t)((tsbkValue >> 56) & 0xFFU); // Data Service Options + m_answerResponse = (uint8_t)((tsbkValue >> 48) & 0xFFU); // Answer Response + m_dataAccessControl = (uint16_t)((tsbkValue >> 32) & 0xFFFFU); // Data Access Control + m_srcId = (uint32_t)(tsbkValue & 0xFFFFFFU); // Source Radio Address + + return true; +} + +/* Encode a trunking signalling block. */ + +void ISP_SNDCP_DATA_PAGE_RES::encode(uint8_t* data, bool rawTSBK, bool noTrellis) +{ + assert(data != nullptr); + + /* stub -- inbound only; an SU sends this, the FNE and hosts never encode it */ +} + +/* Returns a string that represents the current TSBK. */ + +std::string ISP_SNDCP_DATA_PAGE_RES::toString(bool isp) +{ + return std::string("TSBKO, ISP_SNDCP_DATA_PAGE_RES (SNDCP Data Page Response)"); +} + +// --------------------------------------------------------------------------- +// Private Class Members +// --------------------------------------------------------------------------- + +/* Internal helper to copy the the class. */ + +void ISP_SNDCP_DATA_PAGE_RES::copy(const ISP_SNDCP_DATA_PAGE_RES& data) +{ + TSBK::copy(data); + + m_dataServiceOptions = data.m_dataServiceOptions; + m_answerResponse = data.m_answerResponse; + m_dataAccessControl = data.m_dataAccessControl; +} diff --git a/src/common/p25/lc/tsbk/ISP_SNDCP_DATA_PAGE_RES.h b/src/common/p25/lc/tsbk/ISP_SNDCP_DATA_PAGE_RES.h new file mode 100644 index 00000000..cc3ce1f6 --- /dev/null +++ b/src/common/p25/lc/tsbk/ISP_SNDCP_DATA_PAGE_RES.h @@ -0,0 +1,84 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Digital Voice Modem - Common Library + * GPLv2 Open Source. Use is subject to license terms. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright (C) 2026 David Andrzejewski + * + */ +/** + * @file ISP_SNDCP_DATA_PAGE_RES.h + * @ingroup p25_tsbk + * @file ISP_SNDCP_DATA_PAGE_RES.cpp + * @ingroup p25_tsbk + */ +#if !defined(__P25_LC_TSBK__ISP_SNDCP_DATA_PAGE_RES_H__) +#define __P25_LC_TSBK__ISP_SNDCP_DATA_PAGE_RES_H__ + +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" + +namespace p25 +{ + namespace lc + { + namespace tsbk + { + // --------------------------------------------------------------------------- + // Class Declaration + // --------------------------------------------------------------------------- + + /** + * @brief Implements SNDCP DATA PAGE RES - SNDCP Data Page Response (ISP) + * @ingroup p25_tsbk + */ + class DVM_COMMON_API ISP_SNDCP_DATA_PAGE_RES : public TSBK { + public: + /** + * @brief Initializes a new instance of the ISP_SNDCP_DATA_PAGE_RES class. + */ + ISP_SNDCP_DATA_PAGE_RES(); + + /** + * @brief Decode a trunking signalling block. + * @param[in] data Buffer containing a TSBK to decode. + * @param rawTSBK Flag indicating whether or not the passed buffer is raw. + * @returns bool True, if TSBK decoded, otherwise false. + */ + bool decode(const uint8_t* data, bool rawTSBK = false) override; + /** + * @brief Encode a trunking signalling block. + * @param[out] data Buffer to encode a TSBK. + * @param rawTSBK Flag indicating whether or not the output buffer is raw. + * @param noTrellis Flag indicating whether or not the encoded data should be Trellis encoded. + */ + void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override; + + /** + * @brief Returns a string that represents the current TSBK. + * @returns std::string String representation of the TSBK. + */ + std::string toString(bool isp = false) override; + + public: + /** + * @brief SNDCP Data Service Options (the low nibble is the NSAPI) + */ + DECLARE_PROPERTY(uint8_t, dataServiceOptions, DataServiceOptions); + /** + * @brief Answer Response (proceed, deny or wait) + */ + DECLARE_PROPERTY(uint8_t, answerResponse, AnswerResponse); + /** + * @brief SNDCP Data Access Control + */ + DECLARE_PROPERTY(uint16_t, dataAccessControl, DataAccessControl); + + DECLARE_COPY(ISP_SNDCP_DATA_PAGE_RES); + }; + } // namespace tsbk + } // namespace lc +} // namespace p25 + +#endif // __P25_LC_TSBK__ISP_SNDCP_DATA_PAGE_RES_H__ diff --git a/src/common/p25/lc/tsbk/OSP_SNDCP_CH_ANN.cpp b/src/common/p25/lc/tsbk/OSP_SNDCP_CH_ANN.cpp index 9d6b18fb..c59b0137 100644 --- a/src/common/p25/lc/tsbk/OSP_SNDCP_CH_ANN.cpp +++ b/src/common/p25/lc/tsbk/OSP_SNDCP_CH_ANN.cpp @@ -25,7 +25,7 @@ using namespace p25::lc::tsbk; OSP_SNDCP_CH_ANN::OSP_SNDCP_CH_ANN() : TSBK(), m_implicitChannel(false), - m_sndcpAutoAccess(true), + m_sndcpAutoAccess(false), // the announced channel is the control channel, which receives no SN-Data m_sndcpRequestedAccess(true), m_sndcpDAC(1U) { diff --git a/src/common/p25/lc/tsbk/OSP_SNDCP_DATA_PAGE_REQ.cpp b/src/common/p25/lc/tsbk/OSP_SNDCP_DATA_PAGE_REQ.cpp new file mode 100644 index 00000000..240f674c --- /dev/null +++ b/src/common/p25/lc/tsbk/OSP_SNDCP_DATA_PAGE_REQ.cpp @@ -0,0 +1,91 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Digital Voice Modem - Common Library + * GPLv2 Open Source. Use is subject to license terms. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright (C) 2026 David Andrzejewski + * + */ +#include "Defines.h" +#include "p25/lc/tsbk/OSP_SNDCP_DATA_PAGE_REQ.h" + +using namespace p25; +using namespace p25::defines; +using namespace p25::lc; +using namespace p25::lc::tsbk; + +#include + +// --------------------------------------------------------------------------- +// Public Class Members +// --------------------------------------------------------------------------- + +/* Initializes a new instance of the OSP_SNDCP_DATA_PAGE_REQ class. */ + +OSP_SNDCP_DATA_PAGE_REQ::OSP_SNDCP_DATA_PAGE_REQ() : TSBK(), + m_dataServiceOptions(0U), + m_dataAccessControl(1U) +{ + m_lco = TSBKO::OSP_SNDCP_DATA_PAGE_REQ; +} + +/* Decode a trunking signalling block. */ + +bool OSP_SNDCP_DATA_PAGE_REQ::decode(const uint8_t* data, bool rawTSBK) +{ + assert(data != nullptr); + + uint8_t tsbk[P25_TSBK_LENGTH_BYTES + 1U]; + ::memset(tsbk, 0x00U, P25_TSBK_LENGTH_BYTES); + + bool ret = TSBK::decode(data, tsbk, rawTSBK); + if (!ret) + return false; + + ulong64_t tsbkValue = TSBK::toValue(tsbk); + + m_dataServiceOptions = (uint8_t)((tsbkValue >> 56) & 0xFFU); // Data Service Options + m_dataAccessControl = (uint16_t)((tsbkValue >> 24) & 0xFFFFU); // Data Access Control + m_dstId = (uint32_t)(tsbkValue & 0xFFFFFFU); // Target Radio Address + + return true; +} + +/* Encode a trunking signalling block. */ + +void OSP_SNDCP_DATA_PAGE_REQ::encode(uint8_t* data, bool rawTSBK, bool noTrellis) +{ + assert(data != nullptr); + + ulong64_t tsbkValue = 0U; + + tsbkValue = m_dataServiceOptions; // Data Service Options + tsbkValue = (tsbkValue << 16); // Reserved + tsbkValue = (tsbkValue << 16) + m_dataAccessControl; // Data Access Control + tsbkValue = (tsbkValue << 24) + m_dstId; // Target Radio Address + + std::unique_ptr tsbk = TSBK::fromValue(tsbkValue); + TSBK::encode(data, tsbk.get(), rawTSBK, noTrellis); +} + +/* Returns a string that represents the current TSBK. */ + +std::string OSP_SNDCP_DATA_PAGE_REQ::toString(bool isp) +{ + return std::string("TSBKO, OSP_SNDCP_DATA_PAGE_REQ (SNDCP Data Page Request)"); +} + +// --------------------------------------------------------------------------- +// Private Class Members +// --------------------------------------------------------------------------- + +/* Internal helper to copy the the class. */ + +void OSP_SNDCP_DATA_PAGE_REQ::copy(const OSP_SNDCP_DATA_PAGE_REQ& data) +{ + TSBK::copy(data); + + m_dataServiceOptions = data.m_dataServiceOptions; + m_dataAccessControl = data.m_dataAccessControl; +} diff --git a/src/common/p25/lc/tsbk/OSP_SNDCP_DATA_PAGE_REQ.h b/src/common/p25/lc/tsbk/OSP_SNDCP_DATA_PAGE_REQ.h new file mode 100644 index 00000000..d9190911 --- /dev/null +++ b/src/common/p25/lc/tsbk/OSP_SNDCP_DATA_PAGE_REQ.h @@ -0,0 +1,80 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Digital Voice Modem - Common Library + * GPLv2 Open Source. Use is subject to license terms. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright (C) 2026 David Andrzejewski + * + */ +/** + * @file OSP_SNDCP_DATA_PAGE_REQ.h + * @ingroup p25_tsbk + * @file OSP_SNDCP_DATA_PAGE_REQ.cpp + * @ingroup p25_tsbk + */ +#if !defined(__P25_LC_TSBK__OSP_SNDCP_DATA_PAGE_REQ_H__) +#define __P25_LC_TSBK__OSP_SNDCP_DATA_PAGE_REQ_H__ + +#include "common/Defines.h" +#include "common/p25/lc/TSBK.h" + +namespace p25 +{ + namespace lc + { + namespace tsbk + { + // --------------------------------------------------------------------------- + // Class Declaration + // --------------------------------------------------------------------------- + + /** + * @brief Implements SNDCP DATA PAGE REQ - SNDCP Data Page Request (OSP) + * @ingroup p25_tsbk + */ + class DVM_COMMON_API OSP_SNDCP_DATA_PAGE_REQ : public TSBK { + public: + /** + * @brief Initializes a new instance of the OSP_SNDCP_DATA_PAGE_REQ class. + */ + OSP_SNDCP_DATA_PAGE_REQ(); + + /** + * @brief Decode a trunking signalling block. + * @param[in] data Buffer containing a TSBK to decode. + * @param rawTSBK Flag indicating whether or not the passed buffer is raw. + * @returns bool True, if TSBK decoded, otherwise false. + */ + bool decode(const uint8_t* data, bool rawTSBK = false) override; + /** + * @brief Encode a trunking signalling block. + * @param[out] data Buffer to encode a TSBK. + * @param rawTSBK Flag indicating whether or not the output buffer is raw. + * @param noTrellis Flag indicating whether or not the encoded data should be Trellis encoded. + */ + void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override; + + /** + * @brief Returns a string that represents the current TSBK. + * @returns std::string String representation of the TSBK. + */ + std::string toString(bool isp = false) override; + + public: + /** + * @brief SNDCP Data Service Options (the low nibble is the NSAPI) + */ + DECLARE_PROPERTY(uint8_t, dataServiceOptions, DataServiceOptions); + /** + * @brief SNDCP Data Access Control + */ + DECLARE_PROPERTY(uint16_t, dataAccessControl, DataAccessControl); + + DECLARE_COPY(OSP_SNDCP_DATA_PAGE_REQ); + }; + } // namespace tsbk + } // namespace lc +} // namespace p25 + +#endif // __P25_LC_TSBK__OSP_SNDCP_DATA_PAGE_REQ_H__ diff --git a/src/common/p25/lc/tsbk/TSBKFactory.cpp b/src/common/p25/lc/tsbk/TSBKFactory.cpp index c3a437aa..d81593e4 100644 --- a/src/common/p25/lc/tsbk/TSBKFactory.cpp +++ b/src/common/p25/lc/tsbk/TSBKFactory.cpp @@ -192,8 +192,12 @@ std::unique_ptr TSBKFactory::createTSBK(const uint8_t* data, bool rawTSBK) return decode(new IOSP_TELE_INT_ANS(), data, rawTSBK); case TSBKO::ISP_SNDCP_CH_REQ: return decode(new ISP_SNDCP_CH_REQ(), data, rawTSBK); + case TSBKO::ISP_SNDCP_DATA_PAGE_RES: + return decode(new ISP_SNDCP_DATA_PAGE_RES(), data, rawTSBK); case TSBKO::ISP_SNDCP_REC_REQ: return decode(new ISP_SNDCP_REC_REQ(), data, rawTSBK); + case TSBKO::OSP_SNDCP_DATA_PAGE_REQ: + return decode(new OSP_SNDCP_DATA_PAGE_REQ(), data, rawTSBK); case TSBKO::IOSP_STS_UPDT: return decode(new IOSP_STS_UPDT(), data, rawTSBK); case TSBKO::IOSP_MSG_UPDT: diff --git a/src/common/p25/lc/tsbk/TSBKFactory.h b/src/common/p25/lc/tsbk/TSBKFactory.h index cfe52dbd..7002335c 100644 --- a/src/common/p25/lc/tsbk/TSBKFactory.h +++ b/src/common/p25/lc/tsbk/TSBKFactory.h @@ -50,6 +50,7 @@ #include "common/p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.h" #include "common/p25/lc/tsbk/ISP_LOC_REG_REQ.h" #include "common/p25/lc/tsbk/ISP_SNDCP_CH_REQ.h" +#include "common/p25/lc/tsbk/ISP_SNDCP_DATA_PAGE_RES.h" #include "common/p25/lc/tsbk/ISP_SNDCP_REC_REQ.h" #include "common/p25/lc/tsbk/ISP_TELE_INT_PSTN_REQ.h" #include "common/p25/lc/tsbk/ISP_U_DEREG_REQ.h" @@ -75,6 +76,7 @@ #include "common/p25/lc/tsbk/OSP_SCCB.h" #include "common/p25/lc/tsbk/OSP_SNDCP_CH_ANN.h" #include "common/p25/lc/tsbk/OSP_SNDCP_CH_GNT.h" +#include "common/p25/lc/tsbk/OSP_SNDCP_DATA_PAGE_REQ.h" #include "common/p25/lc/tsbk/OSP_SYNC_BCAST.h" #include "common/p25/lc/tsbk/OSP_SYS_SRV_BCAST.h" #include "common/p25/lc/tsbk/OSP_TELE_INT_VCH_GRANT.h"