ua1zbe
/
MMDVMHost
mirror of https://github.com/g4klx/MMDVMHost
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #330 from AndyTaylorTweet/master 

Account for 8/9 digit DMR IDs in P25 SelfOnly access control.
This commit is contained in:
Jonathan Naylor 2017-08-17 15:06:58 +01:00 committed by GitHub
parent f79527174c 2f48d65907
commit 85bd2f1236
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(); unsigned int srcId = m_rfData.getSrcId();
if (m_selfOnly) { 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); LogMessage("P25, invalid access attempt from %u", srcId);
m_rfState = RS_RF_REJECTED; m_rfState = RS_RF_REJECTED;
return false; return false;