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

Account for 8/9 digit DMR IDs

Browse source 
Many hotspot users have 8/9 digit DMR IDs configured, the 7 Digit ID in the radio will then fail the match.
This is a possibly ugly but functional patch that will account for those cases (similar to the recent work on the DMR Access for the same reasons).
This commit is contained in:
Andy Taylor 2017-08-17 14:17:56 +01:00 committed by GitHub
parent f79527174c
commit 2f48d65907
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
P25Control.cpp
View file

@ -188,7 +188,23 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
unsigned int srcId = m_rfData.getSrcId();
if (m_selfOnly) {
if (srcId != m_id) {
if (m_id > 99999999U) { // Check that the Config DMR-ID is bigger than 8 digits
if (srcId != m_id / 100U) {
LogMessage("P25, invalid access attempt from %u", srcId);
m_rfState = RS_RF_REJECTED;
return false;
}
}
else if (m_id > 9999999U) { // Check that the Config DMR-ID is bigger than 7 digits
if (srcId != m_id / 10U) {
LogMessage("P25, invalid access attempt from %u", srcId);
m_rfState = RS_RF_REJECTED;
return false;
}
}
else if (srcId != m_id) { // All other cases
LogMessage("P25, invalid access attempt from %u", srcId);
m_rfState = RS_RF_REJECTED;
return false;