MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 15:09:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add TG rewrite code call to DMRSlot.cpp

Browse Source
This commit is contained in:
Simon
2016-09-11 13:01:05 +01:00
parent c53a96baab
commit 809153e0f2
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
DMRSlot.cpp
View File

@@ -157,7 +157,14 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
if (!DMRAccessControl::validateAccess(id, did, m_slotNo, false)) { if (!DMRAccessControl::validateAccess(id, did, m_slotNo, false)) {
delete lc; delete lc;
return; return;
} }
// Test dst rewrite
unsigned int rw_id = DMRAccessControl::DstIdRewrite(id, false);
if (rw_id) {
LogMessage("Rewrite ID: %u", rw_id);
lc->setDstId(rw_id);
}
m_rfLC = lc; m_rfLC = lc;
@@ -271,6 +278,7 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
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;
@@ -325,7 +333,7 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
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;
// Regenerate the CSBK data // Regenerate the CSBK data
csbk.get(data + 2U); csbk.get(data + 2U);
@@ -484,6 +492,12 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
delete lc; delete lc;
return; return;
} }
// Test dst rewrite
unsigned int rw_id = DMRAccessControl::DstIdRewrite(id, false);
if (rw_id) {
LogMessage("Rewrite ID: %u", rw_id);
lc->setDstId(rw_id);
}
m_rfLC = lc; m_rfLC = lc;