Compare commits
3 Commits
bbd72df6fc
...
7a551ddf04
Author | SHA1 | Date |
---|---|---|
Carsten Schmiemann | 7a551ddf04 | |
Carsten Schmiemann | f8ad2e28ca | |
Carsten Schmiemann | ca8571c276 |
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"files.associations": {
|
||||
"fstream": "cpp",
|
||||
"cstring": "cpp"
|
||||
"cstring": "cpp",
|
||||
"string": "cpp"
|
||||
}
|
||||
}
|
|
@ -61,7 +61,7 @@ bool CDMRAccessControl::validateSrcId(unsigned int id)
|
|||
return false;
|
||||
|
||||
unsigned int prefix = id / 10000U;
|
||||
if (prefix == 0U || prefix > 999U)
|
||||
if (prefix == 0U || prefix > 9999U)
|
||||
return false;
|
||||
|
||||
if (!m_prefixes.empty()) {
|
||||
|
|
|
@ -38,6 +38,11 @@ m_lookup(lookup)
|
|||
// Load black and white lists to DMRAccessControl
|
||||
CDMRAccessControl::init(blacklist, whitelist, slot1TGWhitelist, slot2TGWhitelist, selfOnly, prefixes, id);
|
||||
|
||||
//Print whitelisted IDs
|
||||
LogMessage("Allowed radio ids: ");
|
||||
for (unsigned int i: whitelist)
|
||||
LogMessage((char*)i);
|
||||
|
||||
CDMRSlot::init(colorCode, embeddedLCOnly, dumpTAData, callHang, modem, network, display, duplex, m_lookup, rssi, jitter, ovcm);
|
||||
}
|
||||
|
||||
|
@ -67,11 +72,11 @@ bool CDMRControl::processWakeup(const unsigned char* data)
|
|||
|
||||
bool ret = CDMRAccessControl::validateSrcId(srcId);
|
||||
if (!ret) {
|
||||
LogMessage("Invalid Downlink Activate received from %s", src.c_str());
|
||||
LogMessage("Blocked downlink activation from %s", src.c_str());
|
||||
return false;
|
||||
}
|
||||
|
||||
LogMessage("Downlink Activate received from %s", src.c_str());
|
||||
LogMessage("Downlink request received from %s", src.c_str());
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue