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

BUGFIX: add more stream ID lockout reset handling;

Browse Source
r05a04_dev
Bryan Biedenkapp 1 month ago
parent a8734c0f31
commit 23e6823ea0
2 changed files with 49 additions and 11 deletions
Show Stats Download Patch File Download Diff File

30
src/bridge/HostBridge.cpp
Unescape View File

@ -1428,22 +1428,27 @@ void HostBridge::processDMRNetwork(uint8_t* buffer, uint32_t length)
if (slotNo > 3U) {
LogError(LOG_DMR, "DMR, invalid slot, slotNo = %u", slotNo);
m_network->resetDMR(1U);
m_network->resetDMR(2U);
return;
}
// DMO mode slot disabling
if (slotNo == 1U && !m_network->getDuplex()) {
LogError(LOG_DMR, "DMR/DMO, invalid slot, slotNo = %u", slotNo);
m_network->resetDMR(1U);
return;
}
// Individual slot disabling
if (slotNo == 1U && !m_network->getDMRSlot1()) {
LogError(LOG_DMR, "DMR, invalid slot, slot 1 disabled, slotNo = %u", slotNo);
m_network->resetDMR(1U);
return;
}
if (slotNo == 2U && !m_network->getDMRSlot2()) {
LogError(LOG_DMR, "DMR, invalid slot, slot 2 disabled, slotNo = %u", slotNo);
m_network->resetDMR(2U);
return;
}
@ -1473,8 +1478,10 @@ void HostBridge::processDMRNetwork(uint8_t* buffer, uint32_t length)
}
if (flco == FLCO::GROUP) {
if (srcId == 0)
if (srcId == 0) {
m_network->resetDMR(slotNo);
return;
}
// ensure destination ID matches and slot matches
if (dstId != m_dstId) {
@ -1545,14 +1552,17 @@ void HostBridge::processDMRNetwork(uint8_t* buffer, uint32_t length)
m_rtpSeqNo = 0U;
m_rtpTimestamp = INVALID_TS;
m_network->resetDMR(slotNo);
return;
}
if (m_ignoreCall && m_callAlgoId == 0U)
m_ignoreCall = false;
if (m_ignoreCall)
if (m_ignoreCall) {
m_network->resetDMR(slotNo);
return;
}
if (m_callAlgoId != 0U) {
if (m_callInProgress) {
@ -1569,6 +1579,7 @@ void HostBridge::processDMRNetwork(uint8_t* buffer, uint32_t length)
}
m_ignoreCall = true;
m_network->resetDMR(slotNo);
return;
}
@ -1951,13 +1962,17 @@ void HostBridge::processP25Network(uint8_t* buffer, uint32_t length)
lsd.setLSD2(lsd2);
if (control.getLCO() == LCO::GROUP) {
if (srcId == 0)
if (srcId == 0) {
m_network->resetP25();
return;
}
if ((duid == DUID::TDU) || (duid == DUID::TDULC)) {
// ignore TDU's that are grant demands
if (grantDemand)
if (grantDemand) {
m_network->resetP25();
return;
}
}
// ensure destination ID matches
@ -1985,6 +2000,7 @@ void HostBridge::processP25Network(uint8_t* buffer, uint32_t length)
m_ignoreCall = true;
LogWarning(LOG_HOST, "P25, call ignored, using different encryption parameters, callAlgoId = $%02X, callKID = $%04X, tekAlgoId = $%02X, tekKID = $%04X", m_callAlgoId, callKID, m_tekAlgoId, m_tekKeyId);
m_network->resetP25();
return;
} else {
uint8_t mi[MI_LENGTH_BYTES];
@ -2030,6 +2046,7 @@ void HostBridge::processP25Network(uint8_t* buffer, uint32_t length)
m_rtpSeqNo = 0U;
m_rtpTimestamp = INVALID_TS;
m_network->resetP25();
return;
}
@ -2050,8 +2067,10 @@ void HostBridge::processP25Network(uint8_t* buffer, uint32_t length)
m_ignoreCall = true;
}
if (m_ignoreCall)
if (m_ignoreCall) {
m_network->resetP25();
return;
}
if (m_callAlgoId != ALGO_UNENCRYPT && m_callAlgoId != m_tekAlgoId && callKID != m_tekKeyId) {
if (m_callInProgress) {
@ -2068,6 +2087,7 @@ void HostBridge::processP25Network(uint8_t* buffer, uint32_t length)
}
m_ignoreCall = true;
m_network->resetP25();
return;
}

30
src/patch/HostPatch.cpp
Unescape View File

@ -628,22 +628,27 @@ void HostPatch::processDMRNetwork(uint8_t* buffer, uint32_t length)
if (slotNo > 3U) {
LogError(LOG_DMR, "DMR, invalid slot, slotNo = %u", slotNo);
m_network->resetDMR(1U);
m_network->resetDMR(2U);
return;
}
// DMO mode slot disabling
if (slotNo == 1U && !m_network->getDuplex()) {
LogError(LOG_DMR, "DMR/DMO, invalid slot, slotNo = %u", slotNo);
m_network->resetDMR(1U);
return;
}
// Individual slot disabling
if (slotNo == 1U && !m_network->getDMRSlot1()) {
LogError(LOG_DMR, "DMR, invalid slot, slot 1 disabled, slotNo = %u", slotNo);
m_network->resetDMR(1U);
return;
}
if (slotNo == 2U && !m_network->getDMRSlot2()) {
LogError(LOG_DMR, "DMR, invalid slot, slot 2 disabled, slotNo = %u", slotNo);
m_network->resetDMR(2U);
return;
}
@ -672,8 +677,10 @@ void HostPatch::processDMRNetwork(uint8_t* buffer, uint32_t length)
}
if (flco == FLCO::GROUP) {
if (srcId == 0)
if (srcId == 0) {
m_network->resetDMR(slotNo);
return;
}
// ensure destination ID matches and slot matches
if (dstId != m_srcTGId && dstId != m_dstTGId) {
@ -690,8 +697,10 @@ void HostPatch::processDMRNetwork(uint8_t* buffer, uint32_t length)
if (dstId == m_dstTGId)
actualDstId = m_srcTGId;
} else {
if (dstId == m_dstTGId)
if (dstId == m_dstTGId) {
m_network->resetDMR(slotNo);
return;
}
}
// is this a new call stream?
@ -893,8 +902,10 @@ void HostPatch::processP25Network(uint8_t* buffer, uint32_t length)
using namespace p25::defines;
using namespace p25::dfsi::defines;
if (m_digiMode != TX_MODE_P25)
if (m_digiMode != TX_MODE_P25) {
m_network->resetP25();
return;
}
bool grantDemand = (buffer[14U] & network::NET_CTRL_GRANT_DEMAND) == network::NET_CTRL_GRANT_DEMAND;
bool grantDenial = (buffer[14U] & network::NET_CTRL_GRANT_DENIAL) == network::NET_CTRL_GRANT_DENIAL;
@ -962,8 +973,10 @@ void HostPatch::processP25Network(uint8_t* buffer, uint32_t length)
lsd.setLSD2(lsd2);
if (control.getLCO() == LCO::GROUP) {
if (srcId == 0)
if (srcId == 0) {
m_network->resetP25();
return;
}
// ensure destination ID matches
if (dstId != m_srcTGId && dstId != m_dstTGId) {
@ -988,8 +1001,10 @@ void HostPatch::processP25Network(uint8_t* buffer, uint32_t length)
reverseEncrypt = true;
}
} else {
if (dstId == m_dstTGId)
if (dstId == m_dstTGId) {
m_network->resetP25();
return;
}
}
}
@ -1010,6 +1025,7 @@ void HostPatch::processP25Network(uint8_t* buffer, uint32_t length)
m_callInProgress = false;
LogWarning(LOG_HOST, "P25, call ignored, using different encryption parameters, callAlgoId = $%02X, callKID = $%04X, tekAlgoId = $%02X, tekKID = $%04X", m_callAlgoId, callKID, tekAlgoId, tekKeyId);
m_network->resetP25();
return;
} else {
uint8_t mi[MI_LENGTH_BYTES];
@ -1051,8 +1067,10 @@ void HostPatch::processP25Network(uint8_t* buffer, uint32_t length)
if ((duid == DUID::TDU) || (duid == DUID::TDULC)) {
// ignore TDU's that are grant demands
if (grantDemand)
if (grantDemand) {
m_network->resetP25();
return;
}
p25::lc::LC lc = p25::lc::LC();
lc.setLCO(P25DEF::LCO::GROUP);

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.