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

Further clean up of DMR Access Control.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-10-13 17:46:02 +01:00
parent 989bd8a1fd
commit 3c7bdd6e12
4 changed files with 88 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.kateproject
View File

@@ -1,4 +0,0 @@
{
"name": "MMDVMHost"
, "files": [ { "git": 1 } ]
}

135
DMRAccessControl.cpp
View File

@@ -18,8 +18,7 @@
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>
#include <ctime> #include <cstring>
#include <string.h>
std::vector<unsigned int> DMRAccessControl::m_dstBlackListSlot1RF; std::vector<unsigned int> DMRAccessControl::m_dstBlackListSlot1RF;
@@ -32,7 +31,7 @@ std::vector<unsigned int> DMRAccessControl::m_dstBlackListSlot2NET;
std::vector<unsigned int> DMRAccessControl::m_dstWhiteListSlot1NET; std::vector<unsigned int> DMRAccessControl::m_dstWhiteListSlot1NET;
std::vector<unsigned int> DMRAccessControl::m_dstWhiteListSlot2NET; std::vector<unsigned int> DMRAccessControl::m_dstWhiteListSlot2NET;
std::vector<unsigned int> DMRAccessControl::m_SrcIdBlacklist; std::vector<unsigned int> DMRAccessControl::m_srcIdBlacklist;
std::vector<unsigned int> DMRAccessControl::m_prefixes; std::vector<unsigned int> DMRAccessControl::m_prefixes;
@@ -41,37 +40,37 @@ bool DMRAccessControl::m_selfOnly = false;
unsigned int DMRAccessControl::m_id = 0U; unsigned int DMRAccessControl::m_id = 0U;
unsigned int DMRAccessControl::m_dstRewriteID = 0U; unsigned int DMRAccessControl::m_dstRewriteID = 0U;
unsigned int DMRAccessControl::m_SrcID = 0U; unsigned int DMRAccessControl::m_srcID = 0U;
CDMRLC* DMRAccessControl::m_lastdmrLC; CDMRLC* DMRAccessControl::m_lastdmrLC;
std::time_t DMRAccessControl::m_time; time_t DMRAccessControl::m_time;
int DMRAccessControl::m_callHang; int DMRAccessControl::m_callHang;
bool DMRAccessControl::m_TGRewriteSlot1; bool DMRAccessControl::m_tgRewriteSlot1;
bool DMRAccessControl::m_TGRewriteSlot2; bool DMRAccessControl::m_tgRewriteSlot2;
bool DMRAccessControl::m_BMAutoRewrite; bool DMRAccessControl::m_bmAutoRewrite;
bool DMRAccessControl::m_BMRewriteReflectorVoicePrompts; bool DMRAccessControl::m_bmRewriteReflectorVoicePrompts;
void DMRAccessControl::init(const std::vector<unsigned int>& DstIdBlacklistSlot1RF, const std::vector<unsigned int>& DstIdWhitelistSlot1RF, const std::vector<unsigned int>& DstIdBlacklistSlot2RF, const std::vector<unsigned int>& DstIdWhitelistSlot2RF, const std::vector<unsigned int>& DstIdBlacklistSlot1NET, const std::vector<unsigned int>& DstIdWhitelistSlot1NET, const std::vector<unsigned int>& DstIdBlacklistSlot2NET, const std::vector<unsigned int>& DstIdWhitelistSlot2NET, const std::vector<unsigned int>& SrcIdBlacklist, bool selfOnly, const std::vector<unsigned int>& prefixes,unsigned int id,unsigned int callHang,bool TGRewriteSlot1, bool TGRewriteSlot2, bool BMAutoRewrite, bool BMRewriteReflectorVoicePrompts) void DMRAccessControl::init(const std::vector<unsigned int>& dstIdBlacklistSlot1RF, const std::vector<unsigned int>& dstIdWhitelistSlot1RF, const std::vector<unsigned int>& dstIdBlacklistSlot2RF, const std::vector<unsigned int>& dstIdWhitelistSlot2RF, const std::vector<unsigned int>& dstIdBlacklistSlot1NET, const std::vector<unsigned int>& dstIdWhitelistSlot1NET, const std::vector<unsigned int>& dstIdBlacklistSlot2NET, const std::vector<unsigned int>& dstIdWhitelistSlot2NET, const std::vector<unsigned int>& srcIdBlacklist, bool selfOnly, const std::vector<unsigned int>& prefixes, unsigned int id, unsigned int callHang, bool tgRewriteSlot1, bool tgRewriteSlot2, bool bmAutoRewrite, bool bmRewriteReflectorVoicePrompts)
{ {
m_dstBlackListSlot1RF = DstIdBlacklistSlot1RF; m_dstBlackListSlot1RF = dstIdBlacklistSlot1RF;
m_dstWhiteListSlot1RF = DstIdWhitelistSlot1RF; m_dstWhiteListSlot1RF = dstIdWhitelistSlot1RF;
m_dstBlackListSlot2RF = DstIdBlacklistSlot2RF; m_dstBlackListSlot2RF = dstIdBlacklistSlot2RF;
m_dstWhiteListSlot2RF = DstIdWhitelistSlot2RF; m_dstWhiteListSlot2RF = dstIdWhitelistSlot2RF;
m_dstBlackListSlot1NET = DstIdBlacklistSlot1NET; m_dstBlackListSlot1NET = dstIdBlacklistSlot1NET;
m_dstWhiteListSlot1NET = DstIdWhitelistSlot1NET; m_dstWhiteListSlot1NET = dstIdWhitelistSlot1NET;
m_dstBlackListSlot2NET = DstIdBlacklistSlot2NET; m_dstBlackListSlot2NET = dstIdBlacklistSlot2NET;
m_dstWhiteListSlot2NET = DstIdWhitelistSlot2NET; m_dstWhiteListSlot2NET = dstIdWhitelistSlot2NET;
m_callHang = callHang; m_callHang = callHang;
m_TGRewriteSlot1 = TGRewriteSlot1; m_tgRewriteSlot1 = tgRewriteSlot1;
m_TGRewriteSlot2 = TGRewriteSlot2; m_tgRewriteSlot2 = tgRewriteSlot2;
m_BMAutoRewrite = BMAutoRewrite; m_bmAutoRewrite = bmAutoRewrite;
m_BMRewriteReflectorVoicePrompts = BMRewriteReflectorVoicePrompts; m_bmRewriteReflectorVoicePrompts = bmRewriteReflectorVoicePrompts;
} }
bool DMRAccessControl::DstIdBlacklist(unsigned int did, unsigned int slot, bool network) bool DMRAccessControl::dstIdBlacklist(unsigned int did, unsigned int slot, bool network)
{ {
static std::vector<unsigned int> blacklist; static std::vector<unsigned int> blacklist;
@@ -90,7 +89,7 @@ bool DMRAccessControl::DstIdBlacklist(unsigned int did, unsigned int slot, bool
return std::find(blacklist.begin(), blacklist.end(), did) != blacklist.end(); return std::find(blacklist.begin(), blacklist.end(), did) != blacklist.end();
} }
bool DMRAccessControl::DstIdWhitelist(unsigned int did, unsigned int slot, bool gt4k, bool network) bool DMRAccessControl::dstIdWhitelist(unsigned int did, unsigned int slot, bool gt4k, bool network)
{ {
if (network) { if (network) {
if (slot == 1U) { if (slot == 1U) {
@@ -151,7 +150,7 @@ bool DMRAccessControl::DstIdWhitelist(unsigned int did, unsigned int slot, bool
if (std::find(m_dstWhiteListSlot2RF.begin(), m_dstWhiteListSlot2RF.end(), did) != m_dstWhiteListSlot2RF.end() || did == 0) if (std::find(m_dstWhiteListSlot2RF.begin(), m_dstWhiteListSlot2RF.end(), did) != m_dstWhiteListSlot2RF.end() || did == 0)
return true; return true;
// If dstId in secondary TG range or whitelist // If dstId in secondary TG range or whitelist
else if (did >= 4000) { else if (did >= 4000U) {
if (did > 5000U && did < 10000U) if (did > 5000U && did < 10000U)
return false; return false;
else else
@@ -172,7 +171,7 @@ bool DMRAccessControl::validateSrcId(unsigned int id)
if (m_selfOnly) { if (m_selfOnly) {
return id == m_id; return id == m_id;
} else { } else {
if (std::find(m_SrcIdBlacklist.begin(), m_SrcIdBlacklist.end(), id) != m_SrcIdBlacklist.end()) if (std::find(m_srcIdBlacklist.begin(), m_srcIdBlacklist.end(), id) != m_srcIdBlacklist.end())
return false; return false;
unsigned int prefix = id / 10000U; unsigned int prefix = id / 10000U;
@@ -186,16 +185,16 @@ bool DMRAccessControl::validateSrcId(unsigned int id)
} }
} }
bool DMRAccessControl::validateAccess (unsigned int src_id, unsigned int dst_id, unsigned int slot, bool network) bool DMRAccessControl::validateAccess(unsigned int src_id, unsigned int dst_id, unsigned int slot, bool network)
{ {
// source ID validation is only applied to RF traffic // source ID validation is only applied to RF traffic
if (!network && !DMRAccessControl::validateSrcId(src_id)) { if (!network && !DMRAccessControl::validateSrcId(src_id)) {
LogMessage("DMR Slot %u, invalid access attempt from %u (blacklisted)", slot, src_id); LogMessage("DMR Slot %u, invalid access attempt from %u (blacklisted)", slot, src_id);
return false; return false;
} else if (DMRAccessControl::DstIdBlacklist(dst_id, slot, network)) { } else if (DMRAccessControl::dstIdBlacklist(dst_id, slot, network)) {
LogMessage("DMR Slot %u, invalid access attempt to TG%u (TG blacklisted)", slot, dst_id); LogMessage("DMR Slot %u, invalid access attempt to TG%u (TG blacklisted)", slot, dst_id);
return false; return false;
} else if (!DMRAccessControl::DstIdWhitelist(dst_id, slot, true, network)) { } else if (!DMRAccessControl::dstIdWhitelist(dst_id, slot, true, network)) {
LogMessage("DMR Slot %u, invalid access attempt to TG%u (TG not in whitelist)", slot, dst_id); LogMessage("DMR Slot %u, invalid access attempt to TG%u (TG not in whitelist)", slot, dst_id);
return false; return false;
} else { } else {
@@ -203,51 +202,49 @@ bool DMRAccessControl::validateAccess (unsigned int src_id, unsigned int dst_id,
} }
} }
unsigned int DMRAccessControl::DstIdRewrite (unsigned int did, unsigned int sid, unsigned int slot, bool network, CDMRLC* dmrLC) unsigned int DMRAccessControl::dstIdRewrite(unsigned int did, unsigned int sid, unsigned int slot, bool network, CDMRLC* dmrLC)
{ {
if (slot == 1U && !m_tgRewriteSlot1)
return 0U;
if (slot == 1U && m_TGRewriteSlot1 == false) if (slot == 2U && !m_tgRewriteSlot2)
return 0U; return 0U;
time_t currenttime = ::time(NULL);
if (slot == 2U && m_TGRewriteSlot2 == false) if (network) {
return 0U; m_dstRewriteID = did;
m_srcID = sid;
std::time_t currenttime = std::time(nullptr); //not needed at present - for direct dial, which requires change at master end.
//memcpy(&m_lastdmrLC, &dmrLC, sizeof(dmrLC));
if (network) { if (m_bmAutoRewrite && (did < 4000U || did > 5000U) && did > 0U && did != 9U && dmrLC->getFLCO() == FLCO_GROUP ) {
m_dstRewriteID = did; LogMessage("DMR Slot %u, Rewrite DST ID (TG) of of inbound network traffic from %u to 9",slot,did);
m_SrcID = sid; return 9U;
//not needed at present - for direct dial, which requires change at master end. // rewrite incoming BM voice prompts to TG 9
//memcpy(&m_lastdmrLC, &dmrLC, sizeof(dmrLC)); } else if (m_bmRewriteReflectorVoicePrompts && (sid >= 4000U && sid <= 5000U) && dmrLC->getFLCO() == FLCO_USER_USER) {
if (m_BMAutoRewrite && (did < 4000U || did > 5000U) && did > 0U && did != 9U && dmrLC->getFLCO() == FLCO_GROUP ) { dmrLC->setFLCO(FLCO_GROUP);
LogMessage("DMR Slot %u, Rewrite DST ID (TG) of of inbound network traffic from %u to 9",slot,did); LogMessage("DMR Slot %u, Rewrite inbound private call to %u to Group Call on TG 9 (BM reflector voice prompt)",slot,did);
return 9U; return 9U;
// rewrite incoming BM voice prompts to TG 9 } else {
} else if (m_BMRewriteReflectorVoicePrompts && (sid >= 4000U && sid <= 5000U) && dmrLC->getFLCO() == FLCO_USER_USER) { return 0U;
dmrLC->setFLCO(FLCO_GROUP); }
LogMessage("DMR Slot %u, Rewrite inbound private call to %u to Group Call on TG 9 (BM reflector voice prompt)",slot,did); } else if (m_bmAutoRewrite && did == 9U && m_dstRewriteID != 9U && m_dstRewriteID != 0U && (m_time + m_callHang) > currenttime && dmrLC->getFLCO() == FLCO_GROUP ) {
return 9U; LogMessage("DMR Slot %u, Rewrite DST ID (TG) of outbound network traffic from %u to %u (return traffic during CallHang)",slot,did,m_dstRewriteID);
} else { return m_dstRewriteID;
return 0U; } else if (m_bmAutoRewrite && (did < 4000U || did > 5000U) && did > 0U && did !=9U && did < 99999U && dmrLC->getFLCO() == FLCO_USER_USER) {
m_dstRewriteID = did;
dmrLC->setFLCO(FLCO_GROUP);
LogMessage("DMR Slot %u, Rewrite outbound private call to %u Group Call (Connect talkgroup by private call)",slot,did);
return did;
} else if (m_bmAutoRewrite && (did < 4000U || did > 5000U) && did > 0U && did !=9U && did > 99999U) {
m_dstRewriteID = did;
} }
} else if (m_BMAutoRewrite && did == 9U && m_dstRewriteID != 9U && m_dstRewriteID != 0U && (m_time + m_callHang) > currenttime && dmrLC->getFLCO() == FLCO_GROUP ) {
LogMessage("DMR Slot %u, Rewrite DST ID (TG) of outbound network traffic from %u to %u (return traffic during CallHang)",slot,did,m_dstRewriteID);
return(m_dstRewriteID);
} else if (m_BMAutoRewrite && (did < 4000U || did > 5000U) && did > 0U && did !=9U && did < 99999U && dmrLC->getFLCO() == FLCO_USER_USER) { return 0U;
m_dstRewriteID = did;
dmrLC->setFLCO(FLCO_GROUP);
LogMessage("DMR Slot %u, Rewrite outbound private call to %u Group Call (Connect talkgroup by private call)",slot,did);
return did;
} else if (m_BMAutoRewrite && (did < 4000U || did > 5000U) && did > 0U && did !=9U && did > 99999U) {
m_dstRewriteID = did;
}
return 0U;
} }
void DMRAccessControl::setOverEndTime() void DMRAccessControl::setOverEndTime()
{ {
m_time = std::time(nullptr); m_time = ::time(NULL);
} }

38
DMRAccessControl.h
View File

@@ -17,15 +17,17 @@
#include <vector> #include <vector>
#include <ctime> #include <ctime>
#include "DMRLC.h" #include "DMRLC.h"
class DMRAccessControl { class DMRAccessControl {
public: public:
static bool validateAccess (unsigned int src_id, unsigned int dst_id, unsigned int slot, bool network); static bool validateAccess(unsigned int srcId, unsigned int dstId, unsigned int slot, bool network);
static void init(const std::vector<unsigned int>& DstIdBlacklistSlot1RF, const std::vector<unsigned int>& DstIdWhitelistSlot1RF, const std::vector<unsigned int>& DstIdBlacklistSlot2RF, const std::vector<unsigned int>& DstIdWhitelistSlot2RF, const std::vector<unsigned int>& DstIdBlacklistSlot1NET, const std::vector<unsigned int>& DstIdWhitelistSlot1NET, const std::vector<unsigned int>& DstIdBlacklistSlot2NET, const std::vector<unsigned int>& DstIdWhitelistSlot2NET, const std::vector<unsigned int>& SrcIdBlacklist, bool selfOnly, const std::vector<unsigned int>& prefixes,unsigned int id,unsigned int callHang, bool TGRewrteSlot1, bool TGRewrteSlot2, bool m_BMAutoRewrite, bool m_BMRewriteReflectorVoicePrompts); static void init(const std::vector<unsigned int>& dstIdBlacklistSlot1RF, const std::vector<unsigned int>& dstIdWhitelistSlot1RF, const std::vector<unsigned int>& dstIdBlacklistSlot2RF, const std::vector<unsigned int>& dstIdWhitelistSlot2RF, const std::vector<unsigned int>& dstIdBlacklistSlot1NET, const std::vector<unsigned int>& dstIdWhitelistSlot1NET, const std::vector<unsigned int>& dstIdBlacklistSlot2NET, const std::vector<unsigned int>& dstIdWhitelistSlot2NET, const std::vector<unsigned int>& srcIdBlacklist, bool selfOnly, const std::vector<unsigned int>& prefixes,unsigned int id,unsigned int callHang, bool tgRewrteSlot1, bool tgRewrteSlot2, bool m_bmAutoRewrite, bool m_bmRewriteReflectorVoicePrompts);
static unsigned int DstIdRewrite(unsigned int id, unsigned int sid,unsigned int slot, bool network, CDMRLC* dmrLC); static unsigned int dstIdRewrite(unsigned int id, unsigned int sid, unsigned int slot, bool network, CDMRLC* dmrLC);
static void setOverEndTime(); static void setOverEndTime();
private: private:
@@ -39,7 +41,7 @@ private:
static std::vector<unsigned int> m_dstWhiteListSlot1NET; static std::vector<unsigned int> m_dstWhiteListSlot1NET;
static std::vector<unsigned int> m_dstWhiteListSlot2NET; static std::vector<unsigned int> m_dstWhiteListSlot2NET;
static std::vector<unsigned int> m_SrcIdBlacklist; static std::vector<unsigned int> m_srcIdBlacklist;
static std::vector<unsigned int> m_prefixes; static std::vector<unsigned int> m_prefixes;
@@ -48,26 +50,22 @@ private:
static bool m_selfOnly; static bool m_selfOnly;
static unsigned int m_id; static unsigned int m_id;
static bool DstIdBlacklist(unsigned int did,unsigned int slot, bool network); static bool dstIdBlacklist(unsigned int did, unsigned int slot, bool network);
static bool DstIdWhitelist(unsigned int did,unsigned int slot,bool gt4k, bool network); static bool dstIdWhitelist(unsigned int did, unsigned int slot, bool gt4k, bool network);
static bool validateSrcId(unsigned int id); static bool validateSrcId(unsigned int id);
static std::time_t m_time; static time_t m_time;
static unsigned int m_dstRewriteID; static unsigned int m_dstRewriteID;
static unsigned int m_SrcID; static unsigned int m_srcID;
static bool m_TGRewriteSlot1; static bool m_tgRewriteSlot1;
static bool m_TGRewriteSlot2; static bool m_tgRewriteSlot2;
static bool m_BMAutoRewrite; static bool m_bmAutoRewrite;
static bool m_BMRewriteReflectorVoicePrompts; static bool m_bmRewriteReflectorVoicePrompts;
static CDMRLC* m_lastdmrLC; static CDMRLC* m_lastdmrLC;
}; };
#endif #endif

8
DMRSlot.cpp
View File

@@ -160,7 +160,7 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
return; return;
} }
unsigned int rewriteId = DMRAccessControl::DstIdRewrite(did, sid, m_slotNo, false, lc); unsigned int rewriteId = DMRAccessControl::dstIdRewrite(did, sid, m_slotNo, false, lc);
if (rewriteId != 0U) if (rewriteId != 0U)
lc->setDstId(rewriteId); lc->setDstId(rewriteId);
@@ -493,7 +493,7 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
return; return;
} }
unsigned int rewriteId = DMRAccessControl::DstIdRewrite(did, sid, m_slotNo, false, lc); unsigned int rewriteId = DMRAccessControl::dstIdRewrite(did, sid, m_slotNo, false, lc);
if (rewriteId != 0U) if (rewriteId != 0U)
lc->setDstId(rewriteId); lc->setDstId(rewriteId);
@@ -777,7 +777,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
return; return;
// Test dst rewrite // Test dst rewrite
unsigned int rewriteId = DMRAccessControl::DstIdRewrite(did, sid, m_slotNo, true, m_netLC); unsigned int rewriteId = DMRAccessControl::dstIdRewrite(did, sid, m_slotNo, true, m_netLC);
if (rewriteId != 0U) if (rewriteId != 0U)
m_netLC->setDstId(rewriteId); m_netLC->setDstId(rewriteId);
@@ -846,7 +846,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
return; return;
// Test dst rewrite // Test dst rewrite
unsigned int rewriteId = DMRAccessControl::DstIdRewrite(did, sid, m_slotNo, true, m_netLC); unsigned int rewriteId = DMRAccessControl::dstIdRewrite(did, sid, m_slotNo, true, m_netLC);
if (rewriteId != 0U) if (rewriteId != 0U)
m_netLC->setDstId(rewriteId); m_netLC->setDstId(rewriteId);