Remove id validation of network data.
This commit is contained in:
parent
b6ffc646af
commit
8732817437
30
DMRSlot.cpp
30
DMRSlot.cpp
|
@ -754,12 +754,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
|
|||
unsigned int dstId = lc->getDstId();
|
||||
unsigned int srcId = lc->getSrcId();
|
||||
|
||||
if (!CDMRAccessControl::validateId(srcId)) {
|
||||
LogMessage("DMR Slot %u, network user %u rejected", m_slotNo, srcId);
|
||||
delete lc;
|
||||
return;
|
||||
}
|
||||
|
||||
m_netLC = lc;
|
||||
|
||||
// Regenerate the LC data
|
||||
|
@ -820,12 +814,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
|
|||
unsigned int dstId = lc->getDstId();
|
||||
unsigned int srcId = lc->getSrcId();
|
||||
|
||||
if (!CDMRAccessControl::validateId(srcId)) {
|
||||
LogMessage("DMR Slot %u, network user %u rejected", m_slotNo, srcId);
|
||||
delete lc;
|
||||
return;
|
||||
}
|
||||
|
||||
m_netLC = lc;
|
||||
|
||||
m_lastFrameValid = false;
|
||||
|
@ -957,11 +945,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
|
|||
unsigned int srcId = dataHeader.getSrcId();
|
||||
unsigned int dstId = dataHeader.getDstId();
|
||||
|
||||
if (!CDMRAccessControl::validateId(srcId)) {
|
||||
LogMessage("DMR Slot %u, network user %u rejected", m_slotNo, srcId);
|
||||
return;
|
||||
}
|
||||
|
||||
m_netFrames = dataHeader.getBlocks();
|
||||
|
||||
// Regenerate the data header
|
||||
|
@ -1005,12 +988,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
|
|||
unsigned int dstId = lc->getDstId();
|
||||
unsigned int srcId = lc->getSrcId();
|
||||
|
||||
if (!CDMRAccessControl::validateId(srcId)) {
|
||||
LogMessage("DMR Slot %u, network user %u rejected", m_slotNo, srcId);
|
||||
delete lc;
|
||||
return;
|
||||
}
|
||||
|
||||
m_netLC = lc;
|
||||
|
||||
m_lastFrameValid = false;
|
||||
|
@ -1161,13 +1138,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
|
|||
unsigned int srcId = csbk.getSrcId();
|
||||
unsigned int dstId = csbk.getDstId();
|
||||
|
||||
if (srcId != 0U || dstId != 0U) {
|
||||
if (!CDMRAccessControl::validateId(srcId)) {
|
||||
LogMessage("DMR Slot %u, network user %u rejected", m_slotNo, srcId);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// Regenerate the CSBK data
|
||||
csbk.get(data + 2U);
|
||||
|
||||
|
|
Loading…
Reference in a new issue