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

correct some inconsistencies with the V.24-like packet implementation;

Browse Source
pull/1/head
Bryan Biedenkapp 5 years ago
parent 268783e89d
commit f899af0680
3 changed files with 68 additions and 48 deletions
Show Stats Download Patch File Download Diff File

6
network/BaseNetwork.cpp
Unescape View File

@ -600,6 +600,7 @@ bool BaseNetwork::writeP25LDU1(const uint32_t id, const uint32_t streamId, const
::memcpy(tempBuf, LDU1_REC64, 17U); ::memcpy(tempBuf, LDU1_REC64, 17U);
tempBuf[1U] = control.getLCO(); tempBuf[1U] = control.getLCO();
tempBuf[2U] = control.getMFId(); tempBuf[2U] = control.getMFId();
tempBuf[3U] = serviceOptions;
m_audio.decode(data, tempBuf + 5U, 2U); m_audio.decode(data, tempBuf + 5U, 2U);
::memcpy(buffer + 60U, tempBuf, 17U); ::memcpy(buffer + 60U, tempBuf, 17U);
count += 17U; count += 17U;
@ -642,7 +643,8 @@ bool BaseNetwork::writeP25LDU1(const uint32_t id, const uint32_t streamId, const
// The '6A' record // The '6A' record
::memcpy(tempBuf, LDU1_REC6A, 16U); ::memcpy(tempBuf, LDU1_REC6A, 16U);
tempBuf[1U] = serviceOptions; tempBuf[1U] = lsd.getLSD1();
tempBuf[2U] = lsd.getLSD2();
m_audio.decode(data, tempBuf + 4U, 8U); m_audio.decode(data, tempBuf + 4U, 8U);
::memcpy(buffer + 162U, tempBuf, 16U); ::memcpy(buffer + 162U, tempBuf, 16U);
count += 16U; count += 16U;
@ -768,6 +770,8 @@ bool BaseNetwork::writeP25LDU2(const uint32_t id, const uint32_t streamId, const
// The '73' record // The '73' record
::memcpy(tempBuf, LDU2_REC73, 16U); ::memcpy(tempBuf, LDU2_REC73, 16U);
tempBuf[1U] = lsd.getLSD1();
tempBuf[2U] = lsd.getLSD2();
m_audio.decode(data, tempBuf + 4U, 8U); m_audio.decode(data, tempBuf + 4U, 8U);
::memcpy(buffer + 162U, tempBuf, 16U); ::memcpy(buffer + 162U, tempBuf, 16U);

70
network/BaseNetwork.h
Unescape View File

@ -84,61 +84,77 @@ namespace network
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// P25 V.24 LDU1 Encapsulation Frames // P25 V.24 LDU1 Encapsulation Frames
const uint8_t LDU1_REC62[] = { const uint8_t LDU1_REC62[] = { // IMBE Voice 1
0x62U, 0x02U, 0x02U, 0x0CU, 0x0BU, 0x12U, 0x64U, 0x00U, 0x00U, 0x80U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, // ID IMBE Voice
0x00U, 0x00U, 0x00U, 0x00U, 0x00U }; 0x62U, 0x02U, 0x02U, 0x0CU, 0x0BU, 0x12U, 0x64U, 0x00U, 0x00U, 0x80U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U };
const uint8_t LDU1_REC63[] = { const uint8_t LDU1_REC63[] = { // IMBE Voice 2
// ID IMBE Voice Status
0x63U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U }; 0x63U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U };
const uint8_t LDU1_REC64[] = { const uint8_t LDU1_REC64[] = { // IMBE Voice 3 + Link Control
// ID Link Control IMBE Voice Status
0x64U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U }; 0x64U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U };
const uint8_t LDU1_REC65[] = { const uint8_t LDU1_REC65[] = { // IMBE Voice 4 + Link Control
// ID Link Control IMBE Voice Status
0x65U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U }; 0x65U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U };
const uint8_t LDU1_REC66[] = { const uint8_t LDU1_REC66[] = { // IMBE Voice 5 + Link Control
// ID Link Control IMBE Voice Status
0x66U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U }; 0x66U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U };
const uint8_t LDU1_REC67[] = { const uint8_t LDU1_REC67[] = { // IMBE Voice 6 + Link Control
0x67U, 0xF0U, 0x9DU, 0x6AU, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U }; // ID Link Control IMBE Voice Status
0x67U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U };
const uint8_t LDU1_REC68[] = { const uint8_t LDU1_REC68[] = { // IMBE Voice 7 + Link Control
0x68U, 0x19U, 0xD4U, 0x26U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U }; // ID Link Control IMBE Voice Status
0x68U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U };
const uint8_t LDU1_REC69[] = { const uint8_t LDU1_REC69[] = { // IMBE Voice 8 + Link Control
0x69U, 0xE0U, 0xEBU, 0x7BU, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U }; // ID Link Control IMBE Voice Status
0x69U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U };
const uint8_t LDU1_REC6A[] = { const uint8_t LDU1_REC6A[] = { // IMBE Voice 9 + Low Speed Data
// ID LSD Status IMBE Voice
0x6AU, 0x00U, 0x00U, 0x02U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U }; 0x6AU, 0x00U, 0x00U, 0x02U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U };
// P25 V.24 LDU2 Encapsulation Frames // P25 V.24 LDU2 Encapsulation Frames
const uint8_t LDU2_REC6B[] = { const uint8_t LDU2_REC6B[] = { // IMBE Voice 10
0x6BU, 0x02U, 0x02U, 0x0CU, 0x0BU, 0x12U, 0x64U, 0x00U, 0x00U, 0x80U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, // ID IMBE Voice
0x00U, 0x00U, 0x00U, 0x00U, 0x00U }; 0x6BU, 0x02U, 0x02U, 0x0CU, 0x0BU, 0x12U, 0x64U, 0x00U, 0x00U, 0x80U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U };
const uint8_t LDU2_REC6C[] = { const uint8_t LDU2_REC6C[] = { // IMBE Voice 11
// ID IMBE Voice Status
0x6CU, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U }; 0x6CU, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U };
const uint8_t LDU2_REC6D[] = { const uint8_t LDU2_REC6D[] = { // IMBE Voice 12 + Encryption Sync
// ID Encryption Sync IMBE Voice Status
0x6DU, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U }; 0x6DU, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U };
const uint8_t LDU2_REC6E[] = { const uint8_t LDU2_REC6E[] = { // IMBE Voice 13 + Encryption Sync
// ID Encryption Sync IMBE Voice Status
0x6EU, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U }; 0x6EU, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U };
const uint8_t LDU2_REC6F[] = { const uint8_t LDU2_REC6F[] = { // IMBE Voice 14 + Encryption Sync
// ID Encryption Sync IMBE Voice Status
0x6FU, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U }; 0x6FU, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U };
const uint8_t LDU2_REC70[] = { const uint8_t LDU2_REC70[] = { // IMBE Voice 15 + Encryption Sync
// ID Encryption Sync IMBE Voice Status
0x70U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U }; 0x70U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U };
const uint8_t LDU2_REC71[] = { const uint8_t LDU2_REC71[] = { // IMBE Voice 16 + Encryption Sync
0x71U, 0xACU, 0xB8U, 0xA4U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U }; // ID Encryption Sync IMBE Voice Status
0x71U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U };
const uint8_t LDU2_REC72[] = { const uint8_t LDU2_REC72[] = { // IMBE Voice 17 + Encryption Sync
0x72U, 0x9BU, 0xDCU, 0x75U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U }; // ID Encryption Sync IMBE Voice Status
0x72U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U };
const uint8_t LDU2_REC73[] = { const uint8_t LDU2_REC73[] = { // IMBE Voice 18 + Low Speed Data
// ID LSD Status IMBE Voice
0x73U, 0x00U, 0x00U, 0x02U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U }; 0x73U, 0x00U, 0x00U, 0x02U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U };
const uint32_t DATA_PACKET_LENGTH = 8192U; const uint32_t DATA_PACKET_LENGTH = 8192U;

40
p25/VoicePacket.cpp
Unescape View File

@ -666,39 +666,39 @@ bool VoicePacket::processNetwork(uint8_t* data, uint32_t len, lc::LC& control, d
(data[70U] == 0x66U) && (data[87U] == 0x67U) && (data[70U] == 0x66U) && (data[87U] == 0x67U) &&
(data[104U] == 0x68U) && (data[121U] == 0x69U) && (data[104U] == 0x68U) && (data[121U] == 0x69U) &&
(data[138U] == 0x6AU)) { (data[138U] == 0x6AU)) {
// The '62' record // The '62' record - IMBE Voice 1
::memcpy(m_netLDU1 + 0U, data + count, 22U); ::memcpy(m_netLDU1 + 0U, data + count, 22U);
count += 22U; count += 22U;
// The '63' record // The '63' record - IMBE Voice 2
::memcpy(m_netLDU1 + 25U, data + count, 14U); ::memcpy(m_netLDU1 + 25U, data + count, 14U);
count += 14U; count += 14U;
// The '64' record // The '64' record - IMBE Voice 3 + Link Control
::memcpy(m_netLDU1 + 50U, data + count, 17U); ::memcpy(m_netLDU1 + 50U, data + count, 17U);
count += 17U; count += 17U;
// The '65' record // The '65' record - IMBE Voice 4 + Link Control
::memcpy(m_netLDU1 + 75U, data + count, 17U); ::memcpy(m_netLDU1 + 75U, data + count, 17U);
count += 17U; count += 17U;
// The '66' record // The '66' record - IMBE Voice 5 + Link Control
::memcpy(m_netLDU1 + 100U, data + count, 17U); ::memcpy(m_netLDU1 + 100U, data + count, 17U);
count += 17U; count += 17U;
// The '67' record // The '67' record - IMBE Voice 6 + Link Control
::memcpy(m_netLDU1 + 125U, data + count, 17U); ::memcpy(m_netLDU1 + 125U, data + count, 17U);
count += 17U; count += 17U;
// The '68' record // The '68' record - IMBE Voice 7 + Link Control
::memcpy(m_netLDU1 + 150U, data + count, 17U); ::memcpy(m_netLDU1 + 150U, data + count, 17U);
count += 17U; count += 17U;
// The '69' record // The '69' record - IMBE Voice 8 + Link Control
::memcpy(m_netLDU1 + 175U, data + count, 17U); ::memcpy(m_netLDU1 + 175U, data + count, 17U);
count += 17U; count += 17U;
// The '6A' record // The '6A' record - IMBE Voice 9 + Low Speed Data
::memcpy(m_netLDU1 + 200U, data + count, 16U); ::memcpy(m_netLDU1 + 200U, data + count, 16U);
count += 17U; count += 17U;
@ -719,39 +719,39 @@ bool VoicePacket::processNetwork(uint8_t* data, uint32_t len, lc::LC& control, d
(data[70U] == 0x6FU) && (data[87U] == 0x70U) && (data[70U] == 0x6FU) && (data[87U] == 0x70U) &&
(data[104U] == 0x71U) && (data[121U] == 0x72U) && (data[104U] == 0x71U) && (data[121U] == 0x72U) &&
(data[138U] == 0x73U)) { (data[138U] == 0x73U)) {
// The '6B' record // The '6B' record - IMBE Voice 10
::memcpy(m_netLDU2 + 0U, data + count, 22U); ::memcpy(m_netLDU2 + 0U, data + count, 22U);
count += 22U; count += 22U;
// The '6C' record // The '6C' record - IMBE Voice 11
::memcpy(m_netLDU2 + 25U, data + count, 14U); ::memcpy(m_netLDU2 + 25U, data + count, 14U);
count += 14U; count += 14U;
// The '6D' record // The '6D' record - IMBE Voice 12 + Encryption Sync
::memcpy(m_netLDU2 + 50U, data + count, 17U); ::memcpy(m_netLDU2 + 50U, data + count, 17U);
count += 17U; count += 17U;
// The '6E' record // The '6E' record - IMBE Voice 13 + Encryption Sync
::memcpy(m_netLDU2 + 75U, data + count, 17U); ::memcpy(m_netLDU2 + 75U, data + count, 17U);
count += 17U; count += 17U;
// The '6F' record // The '6F' record - IMBE Voice 14 + Encryption Sync
::memcpy(m_netLDU2 + 100U, data + count, 17U); ::memcpy(m_netLDU2 + 100U, data + count, 17U);
count += 17U; count += 17U;
// The '70' record // The '70' record - IMBE Voice 15 + Encryption Sync
::memcpy(m_netLDU2 + 125U, data + count, 17U); ::memcpy(m_netLDU2 + 125U, data + count, 17U);
count += 17U; count += 17U;
// The '71' record // The '71' record - IMBE Voice 16 + Encryption Sync
::memcpy(m_netLDU2 + 150U, data + count, 17U); ::memcpy(m_netLDU2 + 150U, data + count, 17U);
count += 17U; count += 17U;
// The '72' record // The '72' record - IMBE Voice 17 + Encryption Sync
::memcpy(m_netLDU2 + 175U, data + count, 17U); ::memcpy(m_netLDU2 + 175U, data + count, 17U);
count += 17U; count += 17U;
// The '73' record // The '73' record - IMBE Voice 18 + Low Speed Data
::memcpy(m_netLDU2 + 200U, data + count, 16U); ::memcpy(m_netLDU2 + 200U, data + count, 16U);
count += 17U; count += 17U;
@ -1036,7 +1036,7 @@ void VoicePacket::writeNet_HDU(const lc::LC& control, const data::LowSpeedData&
::memcpy(mi + 3U, m_netLDU2 + 76U, 3U); ::memcpy(mi + 3U, m_netLDU2 + 76U, 3U);
::memcpy(mi + 6U, m_netLDU2 + 101U, 3U); ::memcpy(mi + 6U, m_netLDU2 + 101U, 3U);
uint8_t serviceOptions = (uint8_t)(m_netLDU1[201U]); uint8_t serviceOptions = (uint8_t)(m_netLDU1[53U]);
m_netLC.reset(); m_netLC.reset();
m_netLC.setMI(mi); m_netLC.setMI(mi);
@ -1266,7 +1266,7 @@ void VoicePacket::writeNet_LDU1(const lc::LC& control, const data::LowSpeedData&
} }
} }
uint8_t serviceOptions = (uint8_t)(m_netLDU1[201U]); uint8_t serviceOptions = (uint8_t)(m_netLDU1[53U]);
if (m_p25->m_control) { if (m_p25->m_control) {
m_p25->m_trunk->touchDstIdGrant(m_rfLC.getDstId()); m_p25->m_trunk->touchDstIdGrant(m_rfLC.getDstId());

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.