Digital_Voice_Modem_Project
/
dvmhost
mirror of https://github.com/DVMProject/dvmhost.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NXDN LC code cleanup;

Browse Source
2.0-maint
Bryan Biedenkapp 4 years ago
parent 051fa78ba4
commit 76a011c574
4 changed files with 203 additions and 178 deletions
Show Stats Download Patch File Download Diff File

220
nxdn/lc/RCCH.cpp
Unescape View File

@ -79,7 +79,7 @@ RCCH::RCCH(SiteData siteData, lookups::IdenTable entry, bool verbose) : RCCH(sit
/// </summary> /// </summary>
RCCH::~RCCH() RCCH::~RCCH()
{ {
delete[] m_data; /* stub */
} }
/// <summary> /// <summary>
@ -90,14 +90,7 @@ RCCH::~RCCH()
RCCH& RCCH::operator=(const RCCH& data) RCCH& RCCH::operator=(const RCCH& data)
{ {
if (&data != this) { if (&data != this) {
::memcpy(m_data, data.m_data, NXDN_RCCH_LC_LENGTH_BYTES); copy(data);
m_verbose = data.m_verbose;
if (m_data != NULL) {
if ((m_data[0] & 0x3FU) != 0U) {
decodeLC(m_data);
}
}
} }
return *this; return *this;
@ -114,16 +107,19 @@ void RCCH::decode(const uint8_t* data, uint32_t length, uint32_t offset)
{ {
assert(data != NULL); assert(data != NULL);
uint8_t rcch[22U];
::memset(rcch, 0x00U, NXDN_RCCH_LC_LENGTH_BYTES + 4U);
for (uint32_t i = 0U; i < length; i++, offset++) { for (uint32_t i = 0U; i < length; i++, offset++) {
bool b = READ_BIT(data, offset); bool b = READ_BIT(data, offset);
WRITE_BIT(m_data, i, b); WRITE_BIT(rcch, i, b);
} }
if (m_verbose) { if (m_verbose) {
Utils::dump(2U, "Decoded RCCH Data", m_data, NXDN_RCCH_LC_LENGTH_BYTES); Utils::dump(2U, "Decoded RCCH Data", rcch, NXDN_RCCH_LC_LENGTH_BYTES);
} }
decodeLC(m_data); decodeLC(rcch);
} }
/// <summary> /// <summary>
@ -136,10 +132,13 @@ void RCCH::encode(uint8_t* data, uint32_t length, uint32_t offset)
{ {
assert(data != NULL); assert(data != NULL);
encodeLC(m_data); uint8_t rcch[22U];
::memset(rcch, 0x00U, NXDN_RCCH_LC_LENGTH_BYTES + 4U);
encodeLC(rcch);
for (uint32_t i = 0U; i < length; i++, offset++) { for (uint32_t i = 0U; i < length; i++, offset++) {
bool b = READ_BIT(m_data, i); bool b = READ_BIT(rcch, i);
WRITE_BIT(data, offset, b); WRITE_BIT(data, offset, b);
} }
@ -153,8 +152,6 @@ void RCCH::encode(uint8_t* data, uint32_t length, uint32_t offset)
/// </summary> /// </summary>
void RCCH::reset() void RCCH::reset()
{ {
::memset(m_data, 0x00U, NXDN_RCCH_LC_LENGTH_BYTES);
m_messageType = MESSAGE_TYPE_IDLE; m_messageType = MESSAGE_TYPE_IDLE;
m_srcId = 0U; m_srcId = 0U;
@ -233,12 +230,8 @@ RCCH::RCCH(SiteData siteData) :
m_rcchGroupingCnt(1U), m_rcchGroupingCnt(1U),
m_ccchPagingCnt(2U), m_ccchPagingCnt(2U),
m_ccchMultiCnt(2U), m_ccchMultiCnt(2U),
m_rcchIterateCnt(2U), m_rcchIterateCnt(2U)
m_data(NULL)
{ {
m_data = new uint8_t[NXDN_RCCH_LC_LENGTH_BYTES];
::memset(m_data, 0x00U, NXDN_RCCH_LC_LENGTH_BYTES);
m_siteCallsign = new uint8_t[NXDN_CALLSIGN_LENGTH_BYTES]; m_siteCallsign = new uint8_t[NXDN_CALLSIGN_LENGTH_BYTES];
::memset(m_siteCallsign, 0x00U, NXDN_CALLSIGN_LENGTH_BYTES); ::memset(m_siteCallsign, 0x00U, NXDN_CALLSIGN_LENGTH_BYTES);
setCallsign(siteData.callsign()); setCallsign(siteData.callsign());
@ -251,6 +244,8 @@ RCCH::RCCH(SiteData siteData) :
/// <returns></returns> /// <returns></returns>
bool RCCH::decodeLC(const uint8_t* data) bool RCCH::decodeLC(const uint8_t* data)
{ {
assert(data != NULL);
m_messageType = data[0U] & 0x3FU; // Message Type m_messageType = data[0U] & 0x3FU; // Message Type
// message type opcodes // message type opcodes
@ -308,143 +303,145 @@ bool RCCH::decodeLC(const uint8_t* data)
/// <param name="rs"></param> /// <param name="rs"></param>
void RCCH::encodeLC(uint8_t* data) void RCCH::encodeLC(uint8_t* data)
{ {
m_data[0U] = m_messageType & 0x3FU; // Message Type assert(data != NULL);
data[0U] = m_messageType & 0x3FU; // Message Type
// message type opcodes // message type opcodes
switch (m_messageType) { switch (m_messageType) {
case RTCH_MESSAGE_TYPE_VCALL: case RTCH_MESSAGE_TYPE_VCALL:
case RCCH_MESSAGE_TYPE_VCALL_CONN: case RCCH_MESSAGE_TYPE_VCALL_CONN:
m_data[1U] = (m_emergency ? 0x80U : 0x00U) + // Emergency Flag data[1U] = (m_emergency ? 0x80U : 0x00U) + // Emergency Flag
(m_priority ? 0x20U : 0x00U); // Priority Flag (m_priority ? 0x20U : 0x00U); // Priority Flag
m_data[2U] = ((m_callType & 0x07U) << 5) + // Call Type data[2U] = ((m_callType & 0x07U) << 5) + // Call Type
(m_duplex ? 0x10U : 0x00U) + // Half/Full Duplex Flag (m_duplex ? 0x10U : 0x00U) + // Half/Full Duplex Flag
(m_transmissionMode & 0x07U); // Transmission Mode (m_transmissionMode & 0x07U); // Transmission Mode
m_data[3U] = (m_srcId >> 8U) & 0xFFU; // Source Radio Address data[3U] = (m_srcId >> 8U) & 0xFFU; // Source Radio Address
m_data[4U] = (m_srcId >> 0U) & 0xFFU; // ... data[4U] = (m_srcId >> 0U) & 0xFFU; // ...
m_data[5U] = (m_dstId >> 8U) & 0xFFU; // Target Radio Address data[5U] = (m_dstId >> 8U) & 0xFFU; // Target Radio Address
m_data[6U] = (m_dstId >> 0U) & 0xFFU; // ... data[6U] = (m_dstId >> 0U) & 0xFFU; // ...
m_data[7U] = m_causeRsp; // Cause (VD) data[7U] = m_causeRsp; // Cause (VD)
m_data[9U] = (m_siteData.locId() >> 8) & 0xFFU; // Location ID data[9U] = (m_siteData.locId() >> 8) & 0xFFU; // Location ID
m_data[10U] = (m_siteData.locId() >> 0) & 0xFFU; // ... data[10U] = (m_siteData.locId() >> 0) & 0xFFU; // ...
break; break;
case RCCH_MESSAGE_TYPE_VCALL_ASSGN: case RCCH_MESSAGE_TYPE_VCALL_ASSGN:
case RCCH_MESSAGE_TYPE_DCALL_ASSGN: case RCCH_MESSAGE_TYPE_DCALL_ASSGN:
m_data[1U] = (m_emergency ? 0x80U : 0x00U) + // Emergency Flag data[1U] = (m_emergency ? 0x80U : 0x00U) + // Emergency Flag
(m_priority ? 0x20U : 0x00U); // Priority Flag (m_priority ? 0x20U : 0x00U); // Priority Flag
m_data[2U] = ((m_callType & 0x07U) << 5) + // Call Type data[2U] = ((m_callType & 0x07U) << 5) + // Call Type
(m_duplex ? 0x10U : 0x00U) + // Half/Full Duplex Flag (m_duplex ? 0x10U : 0x00U) + // Half/Full Duplex Flag
(m_transmissionMode & 0x07U); // Transmission Mode (m_transmissionMode & 0x07U); // Transmission Mode
m_data[3U] = (m_srcId >> 8U) & 0xFFU; // Source Radio Address data[3U] = (m_srcId >> 8U) & 0xFFU; // Source Radio Address
m_data[4U] = (m_srcId >> 0U) & 0xFFU; // ... data[4U] = (m_srcId >> 0U) & 0xFFU; // ...
m_data[5U] = (m_dstId >> 8U) & 0xFFU; // Target Radio Address data[5U] = (m_dstId >> 8U) & 0xFFU; // Target Radio Address
m_data[6U] = (m_dstId >> 0U) & 0xFFU; // ... data[6U] = (m_dstId >> 0U) & 0xFFU; // ...
m_data[7U] = (m_grpVchNo >> 10) & 0x03U; // Channel data[7U] = (m_grpVchNo >> 10) & 0x03U; // Channel
m_data[8U] = (m_grpVchNo & 0xFFU); // ... data[8U] = (m_grpVchNo & 0xFFU); // ...
m_data[10U] = (m_siteData.locId() >> 8) & 0xFFU; // Location ID data[10U] = (m_siteData.locId() >> 8) & 0xFFU; // Location ID
m_data[11U] = (m_siteData.locId() >> 0) & 0xFFU; // ... data[11U] = (m_siteData.locId() >> 0) & 0xFFU; // ...
break; break;
case RTCH_MESSAGE_TYPE_DCALL_HDR: case RTCH_MESSAGE_TYPE_DCALL_HDR:
m_data[1U] = (m_emergency ? 0x80U : 0x00U) + // Emergency Flag data[1U] = (m_emergency ? 0x80U : 0x00U) + // Emergency Flag
(m_priority ? 0x20U : 0x00U); // Priority Flag (m_priority ? 0x20U : 0x00U); // Priority Flag
m_data[2U] = ((m_callType & 0x07U) << 5) + // Call Type data[2U] = ((m_callType & 0x07U) << 5) + // Call Type
(m_duplex ? 0x10U : 0x00U) + // Half/Full Duplex Flag (m_duplex ? 0x10U : 0x00U) + // Half/Full Duplex Flag
(m_transmissionMode & 0x07U); // Transmission Mode (m_transmissionMode & 0x07U); // Transmission Mode
m_data[3U] = (m_srcId >> 8U) & 0xFFU; // Source Radio Address data[3U] = (m_srcId >> 8U) & 0xFFU; // Source Radio Address
m_data[4U] = (m_srcId >> 0U) & 0xFFU; // ... data[4U] = (m_srcId >> 0U) & 0xFFU; // ...
m_data[5U] = (m_dstId >> 8U) & 0xFFU; // Target Radio Address data[5U] = (m_dstId >> 8U) & 0xFFU; // Target Radio Address
m_data[6U] = (m_dstId >> 0U) & 0xFFU; // ... data[6U] = (m_dstId >> 0U) & 0xFFU; // ...
m_data[7U] = m_causeRsp; // Cause (VD) data[7U] = m_causeRsp; // Cause (VD)
m_data[9U] = (m_siteData.locId() >> 8) & 0xFFU; // Location ID data[9U] = (m_siteData.locId() >> 8) & 0xFFU; // Location ID
m_data[10U] = (m_siteData.locId() >> 0) & 0xFFU; // ... data[10U] = (m_siteData.locId() >> 0) & 0xFFU; // ...
break; break;
case MESSAGE_TYPE_IDLE: case MESSAGE_TYPE_IDLE:
break; break;
case MESSAGE_TYPE_DST_ID_INFO: case MESSAGE_TYPE_DST_ID_INFO:
m_data[1U] = 0xC0U + NXDN_CALLSIGN_LENGTH_BYTES; // Station ID Option - Start / End / Character Count data[1U] = 0xC0U + NXDN_CALLSIGN_LENGTH_BYTES; // Station ID Option - Start / End / Character Count
m_data[2U] = (m_siteCallsign[0]); // Character 0 data[2U] = (m_siteCallsign[0]); // Character 0
for (uint8_t i = 1; i < NXDN_CALLSIGN_LENGTH_BYTES; i++) { for (uint8_t i = 1; i < NXDN_CALLSIGN_LENGTH_BYTES; i++) {
m_data[i + 2U] = m_siteCallsign[i]; // Character 1 - 7 data[i + 2U] = m_siteCallsign[i]; // Character 1 - 7
} }
break; break;
case RCCH_MESSAGE_TYPE_SITE_INFO: case RCCH_MESSAGE_TYPE_SITE_INFO:
{ {
m_data[1U] = (m_siteData.locId() >> 16) & 0xFFU; // Location ID data[1U] = (m_siteData.locId() >> 16) & 0xFFU; // Location ID
m_data[2U] = (m_siteData.locId() >> 8) & 0xFFU; // ... data[2U] = (m_siteData.locId() >> 8) & 0xFFU; // ...
m_data[3U] = (m_siteData.locId() >> 0) & 0xFFU; // ... data[3U] = (m_siteData.locId() >> 0) & 0xFFU; // ...
m_data[4U] = ((m_bcchCnt & 0x03U) << 6) + // Channel Structure - Number of BCCH data[4U] = ((m_bcchCnt & 0x03U) << 6) + // Channel Structure - Number of BCCH
((m_rcchGroupingCnt & 0x07U) << 3) + // ... - Number of Grouping ((m_rcchGroupingCnt & 0x07U) << 3) + // ... - Number of Grouping
(((m_ccchPagingCnt >> 1) & 0x07U) << 0); // ... - Number of Paging Frames (((m_ccchPagingCnt >> 1) & 0x07U) << 0); // ... - Number of Paging Frames
m_data[5U] = ((m_ccchPagingCnt & 0x01U) << 7) + // ... - Number of Paging Frames data[5U] = ((m_ccchPagingCnt & 0x01U) << 7) + // ... - Number of Paging Frames
((m_ccchMultiCnt & 0x07U) << 4) + // ... - Number of Multipurpose Frames ((m_ccchMultiCnt & 0x07U) << 4) + // ... - Number of Multipurpose Frames
((m_rcchIterateCnt & 0x0FU) << 0); // ... - Number of Iteration ((m_rcchIterateCnt & 0x0FU) << 0); // ... - Number of Iteration
m_data[6U] = m_siteData.serviceClass(); // Service Information data[6U] = m_siteData.serviceClass(); // Service Information
m_data[7U] = (m_siteData.netActive() ? NXDN_SIF2_IP_NETWORK : 0x00U); // ... data[7U] = (m_siteData.netActive() ? NXDN_SIF2_IP_NETWORK : 0x00U); // ...
// bryanb: this is currently fixed -- maybe dynamic in the future // bryanb: this is currently fixed -- maybe dynamic in the future
m_data[8U] = 0U; // Restriction Information - No access restriction / No cycle restriction data[8U] = 0U; // Restriction Information - No access restriction / No cycle restriction
m_data[9U] = 0x08U; // ... - No group restriction / GMS; Location Registration Restriction data[9U] = 0x08U; // ... - No group restriction / GMS; Location Registration Restriction
m_data[10U] = (!m_siteData.netActive() ? 0x01U : 0x00U); // ... - No group ratio restriction / No delay time extension / ISO data[10U] = (!m_siteData.netActive() ? 0x01U : 0x00U); // ... - No group ratio restriction / No delay time extension / ISO
// bryanb: this is currently fixed -- maybe dynamic in the future // bryanb: this is currently fixed -- maybe dynamic in the future
m_data[11U] = NXDN_CH_ACCESS_BASE_FREQ_SYS_DEFINED; // Channel Access Information - Channel Version / Sys Defined Step / Sys Defined Base Freq data[11U] = NXDN_CH_ACCESS_BASE_FREQ_SYS_DEFINED; // Channel Access Information - Channel Version / Sys Defined Step / Sys Defined Base Freq
m_data[14U] = 1U; // Version data[14U] = 1U; // Version
uint16_t channelNo = m_siteData.channelNo() & 0x3FFU; uint16_t channelNo = m_siteData.channelNo() & 0x3FFU;
m_data[15U] = (channelNo >> 6) & 0x0FU; // 1st Control Channel data[15U] = (channelNo >> 6) & 0x0FU; // 1st Control Channel
m_data[16U] = (channelNo & 0x3FU) << 2; // ... data[16U] = (channelNo & 0x3FU) << 2; // ...
} }
break; break;
case MESSAGE_TYPE_SRV_INFO: case MESSAGE_TYPE_SRV_INFO:
m_data[1U] = (m_siteData.locId() >> 16) & 0xFFU; // Location ID data[1U] = (m_siteData.locId() >> 16) & 0xFFU; // Location ID
m_data[2U] = (m_siteData.locId() >> 8) & 0xFFU; // ... data[2U] = (m_siteData.locId() >> 8) & 0xFFU; // ...
m_data[3U] = (m_siteData.locId() >> 0) & 0xFFU; // ... data[3U] = (m_siteData.locId() >> 0) & 0xFFU; // ...
m_data[4U] = m_siteData.serviceClass(); // Service Information data[4U] = m_siteData.serviceClass(); // Service Information
m_data[5U] = (m_siteData.netActive() ? NXDN_SIF2_IP_NETWORK : 0x00U); // ... data[5U] = (m_siteData.netActive() ? NXDN_SIF2_IP_NETWORK : 0x00U); // ...
// bryanb: this is currently fixed -- maybe dynamic in the future // bryanb: this is currently fixed -- maybe dynamic in the future
m_data[6U] = 0U; // Restriction Information - No access restriction / No cycle restriction data[6U] = 0U; // Restriction Information - No access restriction / No cycle restriction
m_data[7U] = 0x08U; // ... - No group restriction / GMS; Location Registration Restriction data[7U] = 0x08U; // ... - No group restriction / GMS; Location Registration Restriction
m_data[8U] = (!m_siteData.netActive() ? 0x01U : 0x00U); // ... - No group ratio restriction / No delay time extension / ISO data[8U] = (!m_siteData.netActive() ? 0x01U : 0x00U); // ... - No group ratio restriction / No delay time extension / ISO
break; break;
case RCCH_MESSAGE_TYPE_REG: case RCCH_MESSAGE_TYPE_REG:
m_data[2U] = (m_siteData.locId() >> 8) & 0xFFU; // ... data[2U] = (m_siteData.locId() >> 8) & 0xFFU; // ...
m_data[3U] = (m_siteData.locId() >> 0) & 0xFFU; // ... data[3U] = (m_siteData.locId() >> 0) & 0xFFU; // ...
m_data[4U] = (m_srcId >> 8U) & 0xFFU; // Source Radio Address data[4U] = (m_srcId >> 8U) & 0xFFU; // Source Radio Address
m_data[5U] = (m_srcId >> 0U) & 0xFFU; // ... data[5U] = (m_srcId >> 0U) & 0xFFU; // ...
m_data[6U] = (m_dstId >> 8U) & 0xFFU; // Target Radio Address data[6U] = (m_dstId >> 8U) & 0xFFU; // Target Radio Address
m_data[7U] = (m_dstId >> 0U) & 0xFFU; // ... data[7U] = (m_dstId >> 0U) & 0xFFU; // ...
m_data[8U] = m_causeRsp; // Cause (MM) data[8U] = m_causeRsp; // Cause (MM)
break; break;
case RCCH_MESSAGE_TYPE_REG_C: case RCCH_MESSAGE_TYPE_REG_C:
m_data[2U] = (m_siteData.locId() >> 8) & 0xFFU; // Location ID data[2U] = (m_siteData.locId() >> 8) & 0xFFU; // Location ID
m_data[3U] = (m_siteData.locId() >> 0) & 0xFFU; // ... data[3U] = (m_siteData.locId() >> 0) & 0xFFU; // ...
m_data[4U] = (m_dstId >> 8U) & 0xFFU; // Target Radio Address data[4U] = (m_dstId >> 8U) & 0xFFU; // Target Radio Address
m_data[5U] = (m_dstId >> 0U) & 0xFFU; // ... data[5U] = (m_dstId >> 0U) & 0xFFU; // ...
m_data[6U] = m_causeRsp; // Cause (MM) data[6U] = m_causeRsp; // Cause (MM)
break; break;
case RCCH_MESSAGE_TYPE_REG_COMM: case RCCH_MESSAGE_TYPE_REG_COMM:
m_data[2U] = (m_siteData.locId() >> 8) & 0xFFU; // Location ID data[2U] = (m_siteData.locId() >> 8) & 0xFFU; // Location ID
m_data[3U] = (m_siteData.locId() >> 0) & 0xFFU; // ... data[3U] = (m_siteData.locId() >> 0) & 0xFFU; // ...
m_data[4U] = (m_dstId >> 8U) & 0xFFU; // Target Radio Address data[4U] = (m_dstId >> 8U) & 0xFFU; // Target Radio Address
m_data[5U] = (m_dstId >> 0U) & 0xFFU; // ... data[5U] = (m_dstId >> 0U) & 0xFFU; // ...
break; break;
case RCCH_MESSAGE_TYPE_GRP_REG: case RCCH_MESSAGE_TYPE_GRP_REG:
m_data[2U] = (m_srcId >> 8U) & 0xFFU; // Source Radio Address data[2U] = (m_srcId >> 8U) & 0xFFU; // Source Radio Address
m_data[3U] = (m_srcId >> 0U) & 0xFFU; // ... data[3U] = (m_srcId >> 0U) & 0xFFU; // ...
m_data[4U] = (m_dstId >> 8U) & 0xFFU; // Target Radio Address data[4U] = (m_dstId >> 8U) & 0xFFU; // Target Radio Address
m_data[5U] = (m_dstId >> 0U) & 0xFFU; // ... data[5U] = (m_dstId >> 0U) & 0xFFU; // ...
m_data[6U] = m_causeRsp; // Cause (MM) data[6U] = m_causeRsp; // Cause (MM)
m_data[8U] = (m_siteData.locId() >> 8) & 0xFFU; // Location ID data[8U] = (m_siteData.locId() >> 8) & 0xFFU; // Location ID
m_data[9U] = (m_siteData.locId() >> 0) & 0xFFU; // ... data[9U] = (m_siteData.locId() >> 0) & 0xFFU; // ...
break; break;
default: default:
LogError(LOG_NXDN, "RCCH::encodeRCCH(), unknown RCCH value, messageType = $%02X", m_messageType); LogError(LOG_NXDN, "RCCH::encodeRCCH(), unknown RCCH value, messageType = $%02X", m_messageType);
@ -458,11 +455,30 @@ void RCCH::encodeLC(uint8_t* data)
/// <param name="data"></param> /// <param name="data"></param>
void RCCH::copy(const RCCH& data) void RCCH::copy(const RCCH& data)
{ {
m_data = new uint8_t[22U];
::memcpy(m_data, data.m_data, 22U);
m_verbose = data.m_verbose; m_verbose = data.m_verbose;
m_srcId = data.m_srcId;
m_dstId = data.m_dstId;
m_locId = data.m_locId;
m_regOption = data.m_regOption;
m_version = data.m_version;
m_causeRsp = data.m_causeRsp;
m_grpVchNo = data.m_grpVchNo;
m_callType = data.m_callType;
m_emergency = data.m_emergency;
m_encrypted = data.m_encrypted;
m_priority = data.m_priority;
m_group = data.m_group;
m_duplex = data.m_duplex;
m_transmissionMode = data.m_transmissionMode;
m_siteData = data.m_siteData; m_siteData = data.m_siteData;
m_siteIdenEntry = data.m_siteIdenEntry; m_siteIdenEntry = data.m_siteIdenEntry;
@ -478,6 +494,4 @@ void RCCH::copy(const RCCH& data)
m_ccchPagingCnt = data.m_ccchPagingCnt; m_ccchPagingCnt = data.m_ccchPagingCnt;
m_ccchMultiCnt = data.m_ccchMultiCnt; m_ccchMultiCnt = data.m_ccchMultiCnt;
m_rcchIterateCnt = data.m_rcchIterateCnt; m_rcchIterateCnt = data.m_rcchIterateCnt;
decodeLC(m_data);
} }

2
nxdn/lc/RCCH.h
Unescape View File

@ -139,8 +139,6 @@ namespace nxdn
/// <summary>Initializes a new instance of the RCCH class.</summary> /// <summary>Initializes a new instance of the RCCH class.</summary>
RCCH(SiteData siteData); RCCH(SiteData siteData);
uint8_t* m_data;
/** Local Site data */ /** Local Site data */
uint8_t* m_siteCallsign; uint8_t* m_siteCallsign;

157
nxdn/lc/RTCH.cpp
Unescape View File

@ -66,12 +66,8 @@ RTCH::RTCH() :
m_delayCount(0U), m_delayCount(0U),
m_algId(NXDN_CIPHER_TYPE_NONE), m_algId(NXDN_CIPHER_TYPE_NONE),
m_kId(0U), m_kId(0U),
m_causeRsp(NXDN_CAUSE_VD_ACCEPTED), m_causeRsp(NXDN_CAUSE_VD_ACCEPTED)
m_data(NULL)
{ {
m_data = new uint8_t[NXDN_RTCH_LC_LENGTH_BYTES];
::memset(m_data, 0x00U, NXDN_RTCH_LC_LENGTH_BYTES);
m_mi = new uint8_t[NXDN_MI_LENGTH_BYTES]; m_mi = new uint8_t[NXDN_MI_LENGTH_BYTES];
::memset(m_mi, 0x00U, NXDN_MI_LENGTH_BYTES); ::memset(m_mi, 0x00U, NXDN_MI_LENGTH_BYTES);
} }
@ -99,8 +95,7 @@ RTCH::RTCH(const RTCH& data) :
m_delayCount(0U), m_delayCount(0U),
m_algId(NXDN_CIPHER_TYPE_NONE), m_algId(NXDN_CIPHER_TYPE_NONE),
m_kId(0U), m_kId(0U),
m_causeRsp(NXDN_CAUSE_VD_ACCEPTED), m_causeRsp(NXDN_CAUSE_VD_ACCEPTED)
m_data(NULL)
{ {
copy(data); copy(data);
} }
@ -110,7 +105,6 @@ RTCH::RTCH(const RTCH& data) :
/// </summary> /// </summary>
RTCH::~RTCH() RTCH::~RTCH()
{ {
delete[] m_data;
delete[] m_mi; delete[] m_mi;
} }
@ -122,14 +116,7 @@ RTCH::~RTCH()
RTCH& RTCH::operator=(const RTCH& data) RTCH& RTCH::operator=(const RTCH& data)
{ {
if (&data != this) { if (&data != this) {
::memcpy(m_data, data.m_data, NXDN_RTCH_LC_LENGTH_BYTES); copy(data);
m_verbose = data.m_verbose;
if (m_data != NULL) {
if ((m_data[0] & 0x3FU) != 0U) {
decodeLC(m_data);
}
}
} }
return *this; return *this;
@ -144,16 +131,19 @@ void RTCH::decode(const uint8_t* data, uint32_t length, uint32_t offset)
{ {
assert(data != NULL); assert(data != NULL);
uint8_t rtch[NXDN_RTCH_LC_LENGTH_BYTES];
::memset(rtch, 0x00U, NXDN_RTCH_LC_LENGTH_BYTES);
for (uint32_t i = 0U; i < length; i++, offset++) { for (uint32_t i = 0U; i < length; i++, offset++) {
bool b = READ_BIT(data, offset); bool b = READ_BIT(data, offset);
WRITE_BIT(m_data, i, b); WRITE_BIT(rtch, i, b);
} }
if (m_verbose) { if (m_verbose) {
Utils::dump(2U, "Decoded RTCH Data", m_data, NXDN_RTCH_LC_LENGTH_BYTES); Utils::dump(2U, "Decoded RTCH Data", rtch, NXDN_RTCH_LC_LENGTH_BYTES);
} }
decodeLC(m_data); decodeLC(rtch);
} }
/// <summary> /// <summary>
@ -166,10 +156,13 @@ void RTCH::encode(uint8_t* data, uint32_t length, uint32_t offset)
{ {
assert(data != NULL); assert(data != NULL);
encodeLC(m_data); uint8_t rtch[NXDN_RTCH_LC_LENGTH_BYTES];
::memset(rtch, 0x00U, NXDN_RTCH_LC_LENGTH_BYTES);
encodeLC(rtch);
for (uint32_t i = 0U; i < length; i++, offset++) { for (uint32_t i = 0U; i < length; i++, offset++) {
bool b = READ_BIT(m_data, i); bool b = READ_BIT(rtch, i);
WRITE_BIT(data, offset, b); WRITE_BIT(data, offset, b);
} }
@ -183,8 +176,6 @@ void RTCH::encode(uint8_t* data, uint32_t length, uint32_t offset)
/// </summary> /// </summary>
void RTCH::reset() void RTCH::reset()
{ {
::memset(m_data, 0x00U, NXDN_RTCH_LC_LENGTH_BYTES);
m_messageType = MESSAGE_TYPE_IDLE; m_messageType = MESSAGE_TYPE_IDLE;
m_callType = CALL_TYPE_UNSPECIFIED; m_callType = CALL_TYPE_UNSPECIFIED;
@ -222,6 +213,8 @@ void RTCH::reset()
/// <returns></returns> /// <returns></returns>
bool RTCH::decodeLC(const uint8_t* data) bool RTCH::decodeLC(const uint8_t* data)
{ {
assert(data != NULL);
m_messageType = data[0U] & 0x3FU; // Message Type m_messageType = data[0U] & 0x3FU; // Message Type
// message type opcodes // message type opcodes
@ -336,59 +329,61 @@ bool RTCH::decodeLC(const uint8_t* data)
/// <param name="rs"></param> /// <param name="rs"></param>
void RTCH::encodeLC(uint8_t* data) void RTCH::encodeLC(uint8_t* data)
{ {
m_data[0U] = m_messageType & 0x3FU; // Message Type assert(data != NULL);
data[0U] = m_messageType & 0x3FU; // Message Type
// message type opcodes // message type opcodes
switch (m_messageType) { switch (m_messageType) {
case RTCH_MESSAGE_TYPE_VCALL: case RTCH_MESSAGE_TYPE_VCALL:
m_data[1U] = (m_emergency ? 0x80U : 0x00U) + // Emergency Flag data[1U] = (m_emergency ? 0x80U : 0x00U) + // Emergency Flag
(m_priority ? 0x20U : 0x00U); // Priority Flag (m_priority ? 0x20U : 0x00U); // Priority Flag
m_data[2U] = ((m_callType & 0x07U) << 5) + // Call Type data[2U] = ((m_callType & 0x07U) << 5) + // Call Type
(m_duplex ? 0x10U : 0x00U) + // Half/Full Duplex Flag (m_duplex ? 0x10U : 0x00U) + // Half/Full Duplex Flag
(m_transmissionMode & 0x07U); // Transmission Mode (m_transmissionMode & 0x07U); // Transmission Mode
m_data[3U] = (m_srcId >> 8U) & 0xFFU; // Source Radio Address data[3U] = (m_srcId >> 8U) & 0xFFU; // Source Radio Address
m_data[4U] = (m_srcId >> 0U) & 0xFFU; // ... data[4U] = (m_srcId >> 0U) & 0xFFU; // ...
m_data[5U] = (m_dstId >> 8U) & 0xFFU; // Target Radio Address data[5U] = (m_dstId >> 8U) & 0xFFU; // Target Radio Address
m_data[6U] = (m_dstId >> 0U) & 0xFFU; // ... data[6U] = (m_dstId >> 0U) & 0xFFU; // ...
m_data[7U] = ((m_algId & 0x03U) << 6) + // Cipher Type data[7U] = ((m_algId & 0x03U) << 6) + // Cipher Type
(m_kId & 0x3FU); // Key ID (m_kId & 0x3FU); // Key ID
break; break;
case RTCH_MESSAGE_TYPE_VCALL_IV: case RTCH_MESSAGE_TYPE_VCALL_IV:
if (m_algId != NXDN_CIPHER_TYPE_NONE && m_kId > 0U) { if (m_algId != NXDN_CIPHER_TYPE_NONE && m_kId > 0U) {
::memcpy(m_data + 1U, m_mi, NXDN_MI_LENGTH_BYTES); // Message Indicator ::memcpy(data + 1U, m_mi, NXDN_MI_LENGTH_BYTES); // Message Indicator
} }
break; break;
case RTCH_MESSAGE_TYPE_TX_REL: case RTCH_MESSAGE_TYPE_TX_REL:
m_data[1U] = (m_emergency ? 0x80U : 0x00U) + // Emergency Flag data[1U] = (m_emergency ? 0x80U : 0x00U) + // Emergency Flag
(m_priority ? 0x20U : 0x00U); // Priority Flag (m_priority ? 0x20U : 0x00U); // Priority Flag
m_data[2U] = (m_callType & 0x07U) << 5; // Call Type data[2U] = (m_callType & 0x07U) << 5; // Call Type
m_data[3U] = (m_srcId >> 8U) & 0xFFU; // Source Radio Address data[3U] = (m_srcId >> 8U) & 0xFFU; // Source Radio Address
m_data[4U] = (m_srcId >> 0U) & 0xFFU; // ... data[4U] = (m_srcId >> 0U) & 0xFFU; // ...
m_data[5U] = (m_dstId >> 8U) & 0xFFU; // Target Radio Address data[5U] = (m_dstId >> 8U) & 0xFFU; // Target Radio Address
m_data[6U] = (m_dstId >> 0U) & 0xFFU; // ... data[6U] = (m_dstId >> 0U) & 0xFFU; // ...
break; break;
case RTCH_MESSAGE_TYPE_DCALL_HDR: case RTCH_MESSAGE_TYPE_DCALL_HDR:
m_data[1U] = (m_emergency ? 0x80U : 0x00U) + // Emergency Flag data[1U] = (m_emergency ? 0x80U : 0x00U) + // Emergency Flag
(m_priority ? 0x20U : 0x00U); // Priority Flag (m_priority ? 0x20U : 0x00U); // Priority Flag
m_data[2U] = ((m_callType & 0x07U) << 5) + // Call Type data[2U] = ((m_callType & 0x07U) << 5) + // Call Type
(m_duplex ? 0x10U : 0x00U) + // Half/Full Duplex Flag (m_duplex ? 0x10U : 0x00U) + // Half/Full Duplex Flag
(m_transmissionMode & 0x07U); // Transmission Mode (m_transmissionMode & 0x07U); // Transmission Mode
m_data[3U] = (m_srcId >> 8U) & 0xFFU; // Source Radio Address data[3U] = (m_srcId >> 8U) & 0xFFU; // Source Radio Address
m_data[4U] = (m_srcId >> 0U) & 0xFFU; // ... data[4U] = (m_srcId >> 0U) & 0xFFU; // ...
m_data[5U] = (m_dstId >> 8U) & 0xFFU; // Target Radio Address data[5U] = (m_dstId >> 8U) & 0xFFU; // Target Radio Address
m_data[6U] = (m_dstId >> 0U) & 0xFFU; // ... data[6U] = (m_dstId >> 0U) & 0xFFU; // ...
m_data[7U] = ((m_algId & 0x03U) << 6) + // Cipher Type data[7U] = ((m_algId & 0x03U) << 6) + // Cipher Type
(m_kId & 0x3FU); // Key ID (m_kId & 0x3FU); // Key ID
m_packetInfo.encode(m_messageType, data + 8U); // Packet Information m_packetInfo.encode(m_messageType, data + 8U); // Packet Information
if (m_algId != NXDN_CIPHER_TYPE_NONE && m_kId > 0U) { if (m_algId != NXDN_CIPHER_TYPE_NONE && m_kId > 0U) {
::memcpy(m_data + 11U, m_mi, NXDN_MI_LENGTH_BYTES); // Message Indicator ::memcpy(data + 11U, m_mi, NXDN_MI_LENGTH_BYTES); // Message Indicator
} }
break; break;
case RTCH_MESSAGE_TYPE_DCALL_DATA: case RTCH_MESSAGE_TYPE_DCALL_DATA:
@ -397,47 +392,47 @@ void RTCH::encodeLC(uint8_t* data)
(m_dataBlockNumber & 0x0FU); // Block Number (m_dataBlockNumber & 0x0FU); // Block Number
break; break;
case RTCH_MESSAGE_TYPE_DCALL_ACK: case RTCH_MESSAGE_TYPE_DCALL_ACK:
m_data[1U] = (m_emergency ? 0x80U : 0x00U) + // Emergency Flag data[1U] = (m_emergency ? 0x80U : 0x00U) + // Emergency Flag
(m_priority ? 0x20U : 0x00U); // Priority Flag (m_priority ? 0x20U : 0x00U); // Priority Flag
m_data[2U] = ((m_callType & 0x07U) << 5) + // Call Type data[2U] = ((m_callType & 0x07U) << 5) + // Call Type
(m_duplex ? 0x10U : 0x00U) + // Half/Full Duplex Flag (m_duplex ? 0x10U : 0x00U) + // Half/Full Duplex Flag
(m_transmissionMode & 0x07U); // Transmission Mode (m_transmissionMode & 0x07U); // Transmission Mode
m_data[3U] = (m_srcId >> 8U) & 0xFFU; // Source Radio Address data[3U] = (m_srcId >> 8U) & 0xFFU; // Source Radio Address
m_data[4U] = (m_srcId >> 0U) & 0xFFU; // ... data[4U] = (m_srcId >> 0U) & 0xFFU; // ...
m_data[5U] = (m_dstId >> 8U) & 0xFFU; // Target Radio Address data[5U] = (m_dstId >> 8U) & 0xFFU; // Target Radio Address
m_data[6U] = (m_dstId >> 0U) & 0xFFU; // ... data[6U] = (m_dstId >> 0U) & 0xFFU; // ...
m_rsp.encode(m_messageType, data + 7U); // Response m_rsp.encode(m_messageType, data + 7U); // Response
break; break;
case RTCH_MESSAGE_TYPE_HEAD_DLY: case RTCH_MESSAGE_TYPE_HEAD_DLY:
m_data[1U] = (m_emergency ? 0x80U : 0x00U) + // Emergency Flag data[1U] = (m_emergency ? 0x80U : 0x00U) + // Emergency Flag
(m_priority ? 0x20U : 0x00U); // Priority Flag (m_priority ? 0x20U : 0x00U); // Priority Flag
m_data[2U] = (m_callType & 0x07U) << 5; // Call Type data[2U] = (m_callType & 0x07U) << 5; // Call Type
m_data[3U] = (m_srcId >> 8U) & 0xFFU; // Source Radio Address data[3U] = (m_srcId >> 8U) & 0xFFU; // Source Radio Address
m_data[4U] = (m_srcId >> 0U) & 0xFFU; // ... data[4U] = (m_srcId >> 0U) & 0xFFU; // ...
m_data[5U] = (m_dstId >> 8U) & 0xFFU; // Target Radio Address data[5U] = (m_dstId >> 8U) & 0xFFU; // Target Radio Address
m_data[6U] = (m_dstId >> 0U) & 0xFFU; // ... data[6U] = (m_dstId >> 0U) & 0xFFU; // ...
m_data[7U] = (m_delayCount >> 8U) & 0xFFU; // Delay Count data[7U] = (m_delayCount >> 8U) & 0xFFU; // Delay Count
m_data[8U] = (m_delayCount >> 0U) & 0xFFU; // ... data[8U] = (m_delayCount >> 0U) & 0xFFU; // ...
break; break;
case MESSAGE_TYPE_IDLE: case MESSAGE_TYPE_IDLE:
break; break;
case RTCH_MESSAGE_TYPE_SDCALL_REQ_HDR: case RTCH_MESSAGE_TYPE_SDCALL_REQ_HDR:
m_data[1U] = (m_emergency ? 0x80U : 0x00U) + // Emergency Flag data[1U] = (m_emergency ? 0x80U : 0x00U) + // Emergency Flag
(m_priority ? 0x20U : 0x00U); // Priority Flag (m_priority ? 0x20U : 0x00U); // Priority Flag
m_data[2U] = ((m_callType & 0x07U) << 5) + // Call Type data[2U] = ((m_callType & 0x07U) << 5) + // Call Type
(m_duplex ? 0x10U : 0x00U) + // Half/Full Duplex Flag (m_duplex ? 0x10U : 0x00U) + // Half/Full Duplex Flag
(m_transmissionMode & 0x07U); // Transmission Mode (m_transmissionMode & 0x07U); // Transmission Mode
m_data[3U] = (m_srcId >> 8U) & 0xFFU; // Source Radio Address data[3U] = (m_srcId >> 8U) & 0xFFU; // Source Radio Address
m_data[4U] = (m_srcId >> 0U) & 0xFFU; // ... data[4U] = (m_srcId >> 0U) & 0xFFU; // ...
m_data[5U] = (m_dstId >> 8U) & 0xFFU; // Target Radio Address data[5U] = (m_dstId >> 8U) & 0xFFU; // Target Radio Address
m_data[6U] = (m_dstId >> 0U) & 0xFFU; // ... data[6U] = (m_dstId >> 0U) & 0xFFU; // ...
m_data[7U] = ((m_algId & 0x03U) << 6) + // Cipher Type data[7U] = ((m_algId & 0x03U) << 6) + // Cipher Type
(m_kId & 0x3FU); // Key ID (m_kId & 0x3FU); // Key ID
m_packetInfo.encode(m_messageType, data + 8U); // Packet Information m_packetInfo.encode(m_messageType, data + 8U); // Packet Information
@ -454,10 +449,30 @@ void RTCH::encodeLC(uint8_t* data)
/// <param name="data"></param> /// <param name="data"></param>
void RTCH::copy(const RTCH& data) void RTCH::copy(const RTCH& data)
{ {
m_data = new uint8_t[NXDN_RTCH_LC_LENGTH_BYTES];
::memcpy(m_data, data.m_data, NXDN_RTCH_LC_LENGTH_BYTES);
m_verbose = data.m_verbose; m_verbose = data.m_verbose;
decodeLC(m_data); m_messageType = data.m_messageType;
m_callType = data.m_callType;
m_srcId = data.m_srcId;
m_dstId = data.m_dstId;
m_emergency = data.m_emergency;
m_encrypted = data.m_encrypted;
m_priority = data.m_priority;
m_group = data.m_group;
m_duplex = data.m_duplex;
m_transmissionMode = data.m_transmissionMode;
m_packetInfo = data.m_packetInfo;
m_rsp = data.m_packetInfo;
m_dataFrameNumber = data.m_dataFrameNumber;
m_dataBlockNumber = data.m_dataBlockNumber;
m_delayCount = data.m_delayCount;
m_algId = data.m_algId;
m_kId = data.m_kId;
m_causeRsp = data.m_causeRsp;
} }

2
nxdn/lc/RTCH.h
Unescape View File

@ -118,8 +118,6 @@ namespace nxdn
__PROPERTY(uint8_t, causeRsp, CauseResponse); __PROPERTY(uint8_t, causeRsp, CauseResponse);
private: private:
uint8_t* m_data;
/** Encryption data */ /** Encryption data */
uint8_t* m_mi; uint8_t* m_mi;

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.