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

pass VSELP1/2 frames (this is experimental, in my tests doesn't break anything else, but it could), this will also pass VSELP1/2 frames to the network core but the host doesn't currently carry code to retransmit network VSELP frames over the air [yet];

Browse Source
pull/51/head
Bryan Biedenkapp 2 years ago
parent 574ede103e
commit 7cc2b99000
3 changed files with 181 additions and 3 deletions
Show Stats Download Patch File Download Diff File

4
src/common/p25/P25Defines.h
Unescape View File

@ -350,8 +350,12 @@ namespace p25
#define P25_TDU_STR "P25_DUID_TDU (Simple Terminator Data Unit)"
const uint8_t P25_DUID_LDU1 = 0x05U; // Logical Link Data Unit 1
#define P25_LDU1_STR "P25_DUID_LDU1 (Logical Link Data Unit 1)"
const uint8_t P25_DUID_VSELP1 = 0x06U; // Motorola VSELP 1
#define P25_VSELP1_STR "P25_DUID_VSELP1 (VSELP Data Unit 1)"
const uint8_t P25_DUID_TSDU = 0x07U; // Trunking System Data Unit
#define P25_TSDU_STR "P25_DUID_TSDU (Trunking System Data Unit)"
const uint8_t P25_DUID_VSELP2 = 0x09U; // Motorola VSELP 2
#define P25_VSELP2_STR "P25_DUID_VSELP2 (VSELP Data Unit 2)"
const uint8_t P25_DUID_LDU2 = 0x0AU; // Logical Link Data Unit 2
#define P25_LDU2_STR "P25_DUID_LDU2 (Logical Link Data Unit 2)"
const uint8_t P25_DUID_PDU = 0x0CU; // Packet Data Unit

4
src/host/p25/Control.cpp
Unescape View File

@ -634,6 +634,8 @@ bool Control::processFrame(uint8_t* data, uint32_t len)
switch (duid) {
case P25_DUID_HDU:
case P25_DUID_LDU1:
case P25_DUID_VSELP1:
case P25_DUID_VSELP2:
case P25_DUID_LDU2:
if (m_controlOnly) {
if (m_debug) {
@ -1303,6 +1305,8 @@ void Control::processNetwork()
switch (duid) {
case P25_DUID_HDU:
case P25_DUID_LDU1:
case P25_DUID_VSELP1:
case P25_DUID_VSELP2:
case P25_DUID_LDU2:
if (m_controlOnly) {
if (m_debug) {

176
src/host/p25/packet/Voice.cpp
Unescape View File

@ -188,8 +188,7 @@ bool Voice::process(uint8_t* data, uint32_t len)
return true;
}
else if (duid == P25_DUID_LDU1) {
// prevent two LDUs of the same type from being sent consecutively
// prevent two xDUs of the same type from being sent consecutively
if (m_lastDUID == P25_DUID_LDU1) {
return false;
}
@ -718,7 +717,7 @@ bool Voice::process(uint8_t* data, uint32_t len)
}
}
else if (duid == P25_DUID_LDU2) {
// prevent two LDUs of the same type from being sent consecutively
// prevent two xDUs of the same type from being sent consecutively
if (m_lastDUID == P25_DUID_LDU2) {
return false;
}
@ -823,6 +822,173 @@ bool Voice::process(uint8_t* data, uint32_t len)
return true;
}
}
else if (duid == P25_DUID_VSELP1) {
// prevent two xDUs of the same type from being sent consecutively
if (m_lastDUID == P25_DUID_VSELP1) {
return false;
}
m_lastDUID = P25_DUID_VSELP1;
// VSELP has no decoding -- its just passed transparently
if (m_p25->m_rfState == RS_RF_LISTENING) {
// stop network frames from processing -- RF wants to transmit on a different talkgroup
if (m_p25->m_netState != RS_NET_IDLE) {
LogWarning(LOG_RF, "Traffic collision detect, preempting new RF traffic to existing network traffic");
resetRF();
m_p25->m_rfState = RS_RF_LISTENING;
return false;
}
// if this is a late entry call, clear states
if (m_rfLastHDU.getDstId() == 0U) {
if (!m_p25->m_dedicatedControl) {
m_p25->m_modem->clearP25Frame();
}
m_p25->m_txQueue.clear();
resetRF();
}
m_lastRejectId = 0U;
::ActivityLog("P25", true, "RF VSELP voice transmission");
m_hadVoice = true;
m_p25->m_rfState = RS_RF_AUDIO;
// make sure we actually got a HDU -- otherwise treat the call as a late entry
if (m_rfLastHDU.getDstId() != 0U) {
m_p25->m_rfTGHang.start();
m_p25->m_netTGHang.stop();
m_p25->m_rfLastDstId = m_rfLastHDU.getDstId();
m_rfLC = lc::LC();
// copy destination and encryption parameters from the last HDU received (if possible)
if (m_rfLC.getDstId() != m_rfLastHDU.getDstId()) {
m_rfLC.setDstId(m_rfLastHDU.getDstId());
}
m_rfLC.setAlgId(m_rfLastHDU.getAlgId());
m_rfLC.setKId(m_rfLastHDU.getKId());
uint8_t mi[P25_MI_LENGTH_BYTES];
m_rfLastHDU.getMI(mi);
m_rfLC.setMI(mi);
uint8_t buffer[P25_HDU_FRAME_LENGTH_BYTES + 2U];
::memset(buffer, 0x00U, P25_HDU_FRAME_LENGTH_BYTES + 2U);
// Generate Sync
Sync::addP25Sync(buffer + 2U);
// Generate NID
m_p25->m_nid.encode(buffer + 2U, P25_DUID_HDU);
// Generate HDU
m_rfLC.encodeHDU(buffer + 2U);
// Add busy bits
P25Utils::addBusyBits(buffer + 2U, P25_HDU_FRAME_LENGTH_BITS, false, true);
writeNetwork(buffer, P25_DUID_HDU);
if (m_p25->m_duplex) {
buffer[0U] = modem::TAG_DATA;
buffer[1U] = 0x00U;
m_p25->addFrame(buffer, P25_HDU_FRAME_LENGTH_BYTES + 2U);
}
if (m_verbose) {
LogMessage(LOG_RF, P25_HDU_STR ", dstId = %u, algo = $%02X, kid = $%04X", m_rfLC.getDstId(), m_rfLC.getAlgId(), m_rfLC.getKId());
}
}
else {
LogWarning(LOG_RF, P25_HDU_STR ", not transmitted; possible late entry, dstId = %u, algo = $%02X, kid = $%04X", m_rfLastHDU.getDstId(), m_rfLastHDU.getAlgId(), m_rfLastHDU.getKId());
}
m_rfFrames = 0U;
m_rfErrs = 0U;
m_rfBits = 1U;
m_rfUndecodableLC = 0U;
m_vocLDU1Count = 0U;
m_roamLDU1Count = 0U;
m_p25->m_rfTimeout.start();
m_lastDUID = P25_DUID_HDU;
m_rfLastHDU = lc::LC();
}
if (m_p25->m_rfState == RS_RF_AUDIO) {
m_rfFrames++;
// generate Sync
Sync::addP25Sync(data + 2U);
// generate NID
m_p25->m_nid.encode(data + 2U, P25_DUID_VSELP1);
// add busy bits
P25Utils::addBusyBits(data + 2U, P25_LDU_FRAME_LENGTH_BITS, false, true);
writeNetwork(data + 2U, P25_DUID_VSELP1);
if (m_p25->m_duplex) {
data[0U] = modem::TAG_DATA;
data[1U] = 0x00U;
m_p25->addFrame(data, P25_LDU_FRAME_LENGTH_BYTES + 2U);
}
if (m_verbose) {
LogMessage(LOG_RF, P25_VSELP1_STR ", audio");
}
return true;
}
}
else if (duid == P25_DUID_VSELP2) {
// prevent two xDUs of the same type from being sent consecutively
if (m_lastDUID == P25_DUID_VSELP2) {
return false;
}
m_lastDUID = P25_DUID_VSELP2;
// VSELP has no decoding -- its just passed transparently
if (m_p25->m_rfState == RS_RF_LISTENING) {
return false;
}
else if (m_p25->m_rfState == RS_RF_AUDIO) {
m_rfFrames++;
// generate Sync
Sync::addP25Sync(data + 2U);
// generate NID
m_p25->m_nid.encode(data + 2U, P25_DUID_VSELP2);
// add busy bits
P25Utils::addBusyBits(data + 2U, P25_LDU_FRAME_LENGTH_BITS, false, true);
writeNetwork(data + 2U, P25_DUID_VSELP2);
if (m_p25->m_duplex) {
data[0U] = modem::TAG_DATA;
data[1U] = 0x00U;
m_p25->addFrame(data, P25_LDU_FRAME_LENGTH_BYTES + 2U);
}
if (m_verbose) {
LogMessage(LOG_RF, P25_VSELP2_STR ", audio");
}
return true;
}
}
else if (duid == P25_DUID_TDU || duid == P25_DUID_TDULC) {
if (!m_p25->m_enableControl) {
m_p25->m_affiliations.releaseGrant(m_rfLC.getDstId(), false);
@ -1120,6 +1286,10 @@ bool Voice::processNetwork(uint8_t* data, uint32_t len, lc::LC& control, data::L
}
}
break;
case P25_DUID_VSELP1:
case P25_DUID_VSELP2:
// currently ignored -- this is a TODO
break;
case P25_DUID_TDU:
case P25_DUID_TDULC:
// ignore a TDU that doesn't contain our destination ID

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.