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

Add network bool value to validateAccess

Browse source
This commit is contained in:
Simon 2016-07-10 17:48:09 +01:00
parent 10feb892b4
commit adc360b042
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
DMRAccessControl.cpp
View file

@ -111,9 +111,10 @@ bool DMRAccessControl::validateSrcId(unsigned int id)
}
}
bool DMRAccessControl::validateAccess (unsigned int src_id, unsigned int dst_id, unsigned int slot)
bool DMRAccessControl::validateAccess (unsigned int src_id, unsigned int dst_id, unsigned int slot, bool network)
{
if (!DMRAccessControl::validateSrcId(src_id)) {
// source ID validation is only applied to RF traffic
if (!network && !DMRAccessControl::validateSrcId(src_id)) {
LogMessage("DMR Slot %u, invalid access attempt from %u (blacklisted)", slot, src_id);
return false;

2
DMRAccessControl.h
View file

@ -24,7 +24,7 @@ public:
static bool validateSrcId(unsigned int id);
static bool validateAccess (unsigned int src_id, unsigned int dst_id, unsigned int slot);
static bool validateAccess (unsigned int src_id, unsigned int dst_id, unsigned int slot, bool network);
static void init(const std::vector<unsigned int>& DstIdBlacklistSlot1, const std::vector<unsigned int>& DstIdWhitelistSlot1, const std::vector<unsigned int>& DstIdBlacklistSlot2, const std::vector<unsigned int>& DstIdWhitelistSlot2, const std::vector<unsigned int>& SrcIdBlacklist, bool selfOnly, const std::vector<unsigned int>& prefixes,unsigned int id);