Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Clean up the access control code for DMR.

Browse source
This commit is contained in:
Jonathan Naylor 2016-11-01 08:00:13 +00:00
parent 6fdfb93514
commit 5ae3b6a9d2
1 changed files with 64 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

124
DMRSlot.cpp
View file

@ -152,17 +152,19 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
if (lc == NULL) if (lc == NULL)
return; return;
unsigned int sid = lc->getSrcId(); unsigned int srcId = lc->getSrcId();
unsigned int did = lc->getDstId(); unsigned int dstId = lc->getDstId();
if (!DMRAccessControl::validateAccess(sid, did, m_slotNo, false)) { if (!DMRAccessControl::validateAccess(srcId, dstId, m_slotNo, false)) {
delete lc; delete lc;
return; return;
} }
unsigned int rewriteId = DMRAccessControl::dstIdRewrite(did, sid, m_slotNo, false, lc); unsigned int rewriteId = DMRAccessControl::dstIdRewrite(dstId, srcId, m_slotNo, false, lc);
if (rewriteId != 0U) if (rewriteId != 0U) {
lc->setDstId(rewriteId); lc->setDstId(rewriteId);
dstId = rewriteId;
}
m_rfLC = lc; m_rfLC = lc;
@ -201,11 +203,11 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
m_rfState = RS_RF_AUDIO; m_rfState = RS_RF_AUDIO;
std::string src = m_lookup->find(sid); std::string src = m_lookup->find(srcId);
std::string dst = m_lookup->find(m_rfLC->getDstId()); std::string dst = m_lookup->find(dstId);
if (m_netState == RS_NET_IDLE) { if (m_netState == RS_NET_IDLE) {
setShortLC(m_slotNo, m_rfLC->getDstId(), m_rfLC->getFLCO(), true); setShortLC(m_slotNo, dstId, m_rfLC->getFLCO(), true);
m_display->writeDMR(m_slotNo, src, m_rfLC->getFLCO() == FLCO_GROUP, dst, "R"); m_display->writeDMR(m_slotNo, src, m_rfLC->getFLCO() == FLCO_GROUP, dst, "R");
} }
@ -274,10 +276,10 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
bool gi = dataHeader.getGI(); bool gi = dataHeader.getGI();
unsigned int srcId = dataHeader.getSrcId(); unsigned int srcId = dataHeader.getSrcId();
unsigned int dstId = dataHeader.getDstId(); unsigned int dstId = dataHeader.getDstId();
if (!DMRAccessControl::validateAccess(srcId, dstId, m_slotNo, false)) if (!DMRAccessControl::validateAccess(srcId, dstId, m_slotNo, false))
return; return;
m_rfFrames = dataHeader.getBlocks(); m_rfFrames = dataHeader.getBlocks();
m_rfDataHeader = dataHeader; m_rfDataHeader = dataHeader;
@ -330,6 +332,7 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
bool gi = csbk.getGI(); bool gi = csbk.getGI();
unsigned int srcId = csbk.getSrcId(); unsigned int srcId = csbk.getSrcId();
unsigned int dstId = csbk.getDstId(); unsigned int dstId = csbk.getDstId();
if (!DMRAccessControl::validateAccess(srcId, dstId, m_slotNo, false)) if (!DMRAccessControl::validateAccess(srcId, dstId, m_slotNo, false))
return; return;
@ -485,17 +488,19 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
CDMRLC* lc = m_rfEmbeddedLC.addData(data + 2U, emb.getLCSS()); CDMRLC* lc = m_rfEmbeddedLC.addData(data + 2U, emb.getLCSS());
if (lc != NULL) { if (lc != NULL) {
unsigned int sid = lc->getSrcId(); unsigned int srcId = lc->getSrcId();
unsigned int did = lc->getDstId(); unsigned int dstId = lc->getDstId();
if (!DMRAccessControl::validateAccess(sid, did, m_slotNo, false)) { if (!DMRAccessControl::validateAccess(srcId, dstId, m_slotNo, false)) {
delete lc; delete lc;
return; return;
} }
unsigned int rewriteId = DMRAccessControl::dstIdRewrite(did, sid, m_slotNo, false, lc); unsigned int rewriteId = DMRAccessControl::dstIdRewrite(dstId, srcId, m_slotNo, false, lc);
if (rewriteId != 0U) if (rewriteId != 0U) {
lc->setDstId(rewriteId); lc->setDstId(rewriteId);
dstId = rewriteId;
}
m_rfLC = lc; m_rfLC = lc;
@ -568,11 +573,11 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
m_rfState = RS_RF_AUDIO; m_rfState = RS_RF_AUDIO;
std::string src = m_lookup->find(m_rfLC->getSrcId()); std::string src = m_lookup->find(srcId);
std::string dst = m_lookup->find(m_rfLC->getDstId()); std::string dst = m_lookup->find(dstId);
if (m_netState == RS_NET_IDLE) { if (m_netState == RS_NET_IDLE) {
setShortLC(m_slotNo, m_rfLC->getDstId(), m_rfLC->getFLCO(), true); setShortLC(m_slotNo, dstId, m_rfLC->getFLCO(), true);
m_display->writeDMR(m_slotNo, src, m_rfLC->getFLCO() == FLCO_GROUP, dst, "R"); m_display->writeDMR(m_slotNo, src, m_rfLC->getFLCO() == FLCO_GROUP, dst, "R");
} }
@ -764,22 +769,28 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
return; return;
CDMRFullLC fullLC; CDMRFullLC fullLC;
m_netLC = fullLC.decode(data + 2U, DT_VOICE_LC_HEADER); CDMRLC* lc = fullLC.decode(data + 2U, DT_VOICE_LC_HEADER);
if (m_netLC == NULL) { if (lc == NULL) {
LogMessage("DMR Slot %u, bad LC received from the network, replacing", m_slotNo); LogMessage("DMR Slot %u, bad LC received from the network, replacing", m_slotNo);
m_netLC = new CDMRLC(dmrData.getFLCO(), dmrData.getSrcId(), dmrData.getDstId()); lc = new CDMRLC(dmrData.getFLCO(), dmrData.getSrcId(), dmrData.getDstId());
} }
unsigned int did = m_netLC->getDstId(); unsigned int dstId = lc->getDstId();
unsigned int sid = m_netLC->getSrcId(); unsigned int srcId = lc->getSrcId();
if (!DMRAccessControl::validateAccess(sid, did, m_slotNo, true)) if (!DMRAccessControl::validateAccess(srcId, dstId, m_slotNo, true)) {
return; delete lc;
return;
}
m_netLC = lc;
// Test dst rewrite // Test dst rewrite
unsigned int rewriteId = DMRAccessControl::dstIdRewrite(did, sid, m_slotNo, true, m_netLC); unsigned int rewriteId = DMRAccessControl::dstIdRewrite(dstId, srcId, m_slotNo, true, m_netLC);
if (rewriteId != 0U) if (rewriteId != 0U) {
m_netLC->setDstId(rewriteId); m_netLC->setDstId(rewriteId);
dstId = rewriteId;
}
// Store the LC for the embedded LC // Store the LC for the embedded LC
m_netEmbeddedLC.setData(*m_netLC); m_netEmbeddedLC.setData(*m_netLC);
@ -823,10 +834,10 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
m_netState = RS_NET_AUDIO; m_netState = RS_NET_AUDIO;
setShortLC(m_slotNo, m_netLC->getDstId(), m_netLC->getFLCO(), true); setShortLC(m_slotNo, dstId, m_netLC->getFLCO(), true);
std::string src = m_lookup->find(m_netLC->getSrcId()); std::string src = m_lookup->find(srcId);
std::string dst = m_lookup->find(m_netLC->getDstId()); std::string dst = m_lookup->find(dstId);
m_display->writeDMR(m_slotNo, src, m_netLC->getFLCO() == FLCO_GROUP, dst, "N"); m_display->writeDMR(m_slotNo, src, m_netLC->getFLCO() == FLCO_GROUP, dst, "N");
@ -839,17 +850,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
if (m_netState != RS_NET_AUDIO) if (m_netState != RS_NET_AUDIO)
return; return;
unsigned int did = m_netLC->getDstId();
unsigned int sid = m_netLC->getSrcId();
if (!DMRAccessControl::validateAccess(sid, did, m_slotNo, true))
return;
// Test dst rewrite
unsigned int rewriteId = DMRAccessControl::dstIdRewrite(did, sid, m_slotNo, true, m_netLC);
if (rewriteId != 0U)
m_netLC->setDstId(rewriteId);
// Regenerate the Slot Type // Regenerate the Slot Type
CDMRSlotType slotType; CDMRSlotType slotType;
slotType.setColorCode(m_colorCode); slotType.setColorCode(m_colorCode);
@ -877,11 +877,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
if (m_netState != RS_NET_AUDIO) if (m_netState != RS_NET_AUDIO)
return; return;
unsigned int did = m_netLC->getDstId();
unsigned int id = m_netLC->getSrcId();
if (!DMRAccessControl::validateAccess(id, did, m_slotNo, true))
return;
// Regenerate the LC data // Regenerate the LC data
CDMRFullLC fullLC; CDMRFullLC fullLC;
fullLC.encode(*m_netLC, data + 2U, DT_TERMINATOR_WITH_LC); fullLC.encode(*m_netLC, data + 2U, DT_TERMINATOR_WITH_LC);
@ -932,6 +927,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
bool gi = dataHeader.getGI(); bool gi = dataHeader.getGI();
unsigned int srcId = dataHeader.getSrcId(); unsigned int srcId = dataHeader.getSrcId();
unsigned int dstId = dataHeader.getDstId(); unsigned int dstId = dataHeader.getDstId();
if (!DMRAccessControl::validateAccess(srcId, dstId, m_slotNo, true)) if (!DMRAccessControl::validateAccess(srcId, dstId, m_slotNo, true))
return; return;
@ -973,13 +969,25 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
endOfNetData(); endOfNetData();
} else if (dataType == DT_VOICE_SYNC) { } else if (dataType == DT_VOICE_SYNC) {
if (m_netState == RS_NET_IDLE) { if (m_netState == RS_NET_IDLE) {
m_netLC = new CDMRLC(dmrData.getFLCO(), dmrData.getSrcId(), dmrData.getDstId()); CDMRLC* lc = new CDMRLC(dmrData.getFLCO(), dmrData.getSrcId(), dmrData.getDstId());
unsigned int dstId = lc->getDstId();
unsigned int srcId = lc->getSrcId();
if (!DMRAccessControl::validateAccess(srcId, dstId, m_slotNo, true)) {
delete lc;
return;
}
m_netLC = lc;
// Test dst rewrite
unsigned int rewriteId = DMRAccessControl::dstIdRewrite(dstId, srcId, m_slotNo, true, m_netLC);
if (rewriteId != 0U) {
m_netLC->setDstId(rewriteId);
dstId = rewriteId;
}
unsigned int did = dmrData.getDstId();
unsigned int id = dmrData.getSrcId();
if (!DMRAccessControl::validateAccess(id, did, m_slotNo, true))
return;
m_lastFrameValid = false; m_lastFrameValid = false;
m_netTimeoutTimer.start(); m_netTimeoutTimer.start();
@ -1022,10 +1030,10 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
m_netState = RS_NET_AUDIO; m_netState = RS_NET_AUDIO;
setShortLC(m_slotNo, m_netLC->getDstId(), m_netLC->getFLCO(), true); setShortLC(m_slotNo, dstId, m_netLC->getFLCO(), true);
std::string src = m_lookup->find(m_netLC->getSrcId()); std::string src = m_lookup->find(srcId);
std::string dst = m_lookup->find(m_netLC->getDstId()); std::string dst = m_lookup->find(dstId);
m_display->writeDMR(m_slotNo, src, m_netLC->getFLCO() == FLCO_GROUP, dst, "N"); m_display->writeDMR(m_slotNo, src, m_netLC->getFLCO() == FLCO_GROUP, dst, "N");
@ -1074,11 +1082,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
if (m_netState != RS_NET_AUDIO) if (m_netState != RS_NET_AUDIO)
return; return;
unsigned int did = m_netLC->getDstId();
unsigned int id = m_netLC->getSrcId();
if (!DMRAccessControl::validateAccess(id, did, m_slotNo, true))
return;
unsigned char fid = m_netLC->getFID(); unsigned char fid = m_netLC->getFID();
if (fid == FID_ETSI || fid == FID_DMRA) if (fid == FID_ETSI || fid == FID_DMRA)
m_netErrs += m_fec.regenerateDMR(data + 2U); m_netErrs += m_fec.regenerateDMR(data + 2U);
@ -1136,7 +1139,8 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
bool gi = csbk.getGI(); bool gi = csbk.getGI();
unsigned int srcId = csbk.getSrcId(); unsigned int srcId = csbk.getSrcId();
unsigned int dstId = csbk.getDstId(); unsigned int dstId = csbk.getDstId();
if (!DMRAccessControl::validateAccess(srcId,dstId,m_slotNo,true))
if (!DMRAccessControl::validateAccess(srcId, dstId, m_slotNo, true))
return; return;
// Regenerate the CSBK data // Regenerate the CSBK data