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

Talkgroup rewrite now working

Browse source
This commit is contained in:
Simon 2016-09-15 14:19:00 +01:00
parent 105d18594a
commit 21691b046b
3 changed files with 44 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
DMRAccessControl.cpp
View file

@ -39,10 +39,13 @@ 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;
std::time_t DMRAccessControl::m_time; std::time_t DMRAccessControl::m_time;
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 DMRAccessControl::m_callHang;
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)
{ {
m_dstBlackListSlot1RF = DstIdBlacklistSlot1RF; m_dstBlackListSlot1RF = DstIdBlacklistSlot1RF;
m_dstWhiteListSlot1RF = DstIdWhitelistSlot1RF; m_dstWhiteListSlot1RF = DstIdWhitelistSlot1RF;
@ -52,6 +55,7 @@ void DMRAccessControl::init(const std::vector<unsigned int>& DstIdBlacklistSlot1
m_dstWhiteListSlot1NET = DstIdWhitelistSlot1NET; m_dstWhiteListSlot1NET = DstIdWhitelistSlot1NET;
m_dstBlackListSlot2NET = DstIdBlacklistSlot2NET; m_dstBlackListSlot2NET = DstIdBlacklistSlot2NET;
m_dstWhiteListSlot2NET = DstIdWhitelistSlot2NET; m_dstWhiteListSlot2NET = DstIdWhitelistSlot2NET;
m_callHang = callHang;
} }
bool DMRAccessControl::DstIdBlacklist(unsigned int did, unsigned int slot, bool network) bool DMRAccessControl::DstIdBlacklist(unsigned int did, unsigned int slot, bool network)
@ -186,33 +190,31 @@ bool DMRAccessControl::validateAccess (unsigned int src_id, unsigned int dst_id,
} }
} }
unsigned int DMRAccessControl::DstIdRewrite (unsigned int id, bool network) unsigned int DMRAccessControl::DstIdRewrite (unsigned int did, unsigned int sid, unsigned int slot, bool network)
{ {
// record current time
std::time_t currenttime = std::time(nullptr); std::time_t currenttime = std::time(nullptr);
// if the traffic is from the network
if (network) { if (network) {
m_dstRewriteID = id; m_dstRewriteID = did;
// record current time m_SrcID = sid;
m_time = std::time(nullptr); if (did < 4000 && did > 0 && did != 9) {
// if the ID is a talkgroup, log and rewrite to TG9 LogMessage("DMR Slot %u, Rewrite DST ID (TG) of of inbound network traffic from %u to 9",slot,did);
if (id < 4000 && id > 0) {
LogMessage("Rewrite DST ID (TG) of of inbound network traffic from %u to 9", id);
return 9; return 9;
} else { } else {
return 0; return 0;
} }
} else { } else {
// if less than 30 seconds has passed since we last saw traffic from network if (m_SrcID == sid && (m_time + m_callHang) > currenttime) {
if (m_dstRewriteID == id && (m_time + 30) > currenttime) { LogMessage("DMR Slot %u, Rewrite DST ID (TG) of outbound network traffic from 9 to %u (return traffic during CallHang)",slot,m_dstRewriteID);
LogMessage("Inbound DST ID (TG) rewrite seen in last 30 seconds"); return(m_dstRewriteID);
LogMessage("Rewrite DST ID (TG) of outbound network traffic from 9 to %u", id);
m_time = std::time(nullptr);
return(id);
} else { } else {
return(0); return(0);
} }
} }
} }
void DMRAccessControl::setOverEndTime()
{
m_time = std::time(nullptr);
}

8
DMRAccessControl.h
View file

@ -22,9 +22,10 @@ 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 src_id, unsigned int dst_id, 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); 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);
static unsigned int DstIdRewrite(unsigned int id, bool network); static unsigned int DstIdRewrite(unsigned int id, unsigned int sid,unsigned int slot, bool network);
static void setOverEndTime();
private: private:
static std::vector<unsigned int> m_dstBlackListSlot1RF; static std::vector<unsigned int> m_dstBlackListSlot1RF;
@ -40,6 +41,8 @@ private:
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;
static unsigned int m_callHang;
static bool m_selfOnly; static bool m_selfOnly;
static unsigned int m_id; static unsigned int m_id;
@ -52,6 +55,7 @@ private:
static std::time_t m_time; static std::time_t m_time;
static unsigned int m_dstRewriteID; static unsigned int m_dstRewriteID;
static unsigned int m_SrcID;
}; };

38
DMRSlot.cpp
View file

@ -152,17 +152,16 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
if (lc == NULL) if (lc == NULL)
return; return;
unsigned int id = lc->getSrcId(); unsigned int sid = lc->getSrcId();
unsigned int did = lc->getDstId(); unsigned int did = lc->getDstId();
if (!DMRAccessControl::validateAccess(id, did, m_slotNo, false)) { if (!DMRAccessControl::validateAccess(sid, did, m_slotNo, false)) {
delete lc; delete lc;
return; return;
} }
// Test dst rewrite unsigned int rw_id = DMRAccessControl::DstIdRewrite(did,sid,m_slotNo,false);
unsigned int rw_id = DMRAccessControl::DstIdRewrite(did, false);
if (rw_id) { if (rw_id) {
LogMessage("Rewrite ID: %u", rw_id);
lc->setDstId(rw_id); lc->setDstId(rw_id);
} }
@ -203,7 +202,7 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
m_rfState = RS_RF_AUDIO; m_rfState = RS_RF_AUDIO;
std::string src = m_lookup->find(id); std::string src = m_lookup->find(sid);
std::string dst = m_lookup->find(m_rfLC->getDstId()); std::string dst = m_lookup->find(m_rfLC->getDstId());
if (m_netState == RS_NET_IDLE) { if (m_netState == RS_NET_IDLE) {
@ -486,16 +485,16 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
CDMRLC* lc = m_rfEmbeddedLC.addData(data + 2U, emb.getLCSS()); CDMRLC* lc = m_rfEmbeddedLC.addData(data + 2U, emb.getLCSS());
if (lc != NULL) { if (lc != NULL) {
unsigned int id = lc->getSrcId(); unsigned int sid = lc->getSrcId();
unsigned int did = lc->getDstId(); unsigned int did = lc->getDstId();
if (!DMRAccessControl::validateAccess(id,did,m_slotNo,false)) { if (!DMRAccessControl::validateAccess(sid,did,m_slotNo,false)) {
delete lc; delete lc;
return; return;
} }
// Test dst rewrite // Test dst rewrite
unsigned int rw_id = DMRAccessControl::DstIdRewrite(did, false); unsigned int rw_id = DMRAccessControl::DstIdRewrite(did,sid,m_slotNo,false);
if (rw_id) { if (rw_id) {
LogMessage("Rewrite ID: %u", rw_id);
lc->setDstId(rw_id); lc->setDstId(rw_id);
} }
@ -773,14 +772,14 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
} }
unsigned int did = m_netLC->getDstId(); unsigned int did = m_netLC->getDstId();
unsigned int id = m_netLC->getSrcId(); unsigned int sid = m_netLC->getSrcId();
if (!DMRAccessControl::validateAccess(did, did, m_slotNo, true)) if (!DMRAccessControl::validateAccess(sid, did, m_slotNo, true))
return; return;
// Test dst rewrite // Test dst rewrite
unsigned int rw_id = DMRAccessControl::DstIdRewrite(did, true); unsigned int rw_id = DMRAccessControl::DstIdRewrite(did, sid,m_slotNo, true);
if (rw_id) { if (rw_id) {
LogMessage("Rewrite ID: %u", rw_id);
m_netLC->setDstId(rw_id); m_netLC->setDstId(rw_id);
} }
@ -843,14 +842,14 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
return; return;
unsigned int did = m_netLC->getDstId(); unsigned int did = m_netLC->getDstId();
unsigned int id = m_netLC->getSrcId(); unsigned int sid = m_netLC->getSrcId();
if (!DMRAccessControl::validateAccess(id, did, m_slotNo, true)) if (!DMRAccessControl::validateAccess(sid, did, m_slotNo, true))
return; return;
// Test dst rewrite // Test dst rewrite
unsigned int rw_id = DMRAccessControl::DstIdRewrite(id,true); unsigned int rw_id = DMRAccessControl::DstIdRewrite(did,sid,m_slotNo,true);
if (rw_id) { if (rw_id) {
LogMessage("Rewrite ID: %u", rw_id);
m_netLC->setDstId(rw_id); m_netLC->setDstId(rw_id);
} }
@ -919,6 +918,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
LogMessage("DMR Slot %u, received network end of voice transmission, %.1f seconds, %u%% packet loss, BER: %.1f%%", m_slotNo, float(m_netFrames) / 16.667F, (m_netLost * 100U) / m_netFrames, float(m_netErrs * 100U) / float(m_netBits)); LogMessage("DMR Slot %u, received network end of voice transmission, %.1f seconds, %u%% packet loss, BER: %.1f%%", m_slotNo, float(m_netFrames) / 16.667F, (m_netLost * 100U) / m_netFrames, float(m_netErrs * 100U) / float(m_netBits));
writeEndNet(); writeEndNet();
DMRAccessControl::setOverEndTime();
} else if (dataType == DT_DATA_HEADER) { } else if (dataType == DT_DATA_HEADER) {
if (m_netState == RS_NET_DATA) if (m_netState == RS_NET_DATA)
return; return;
@ -1396,7 +1396,7 @@ void CDMRSlot::init(unsigned int id, unsigned int colorCode, unsigned int callHa
slotType.getData(m_idle + 2U); slotType.getData(m_idle + 2U);
//Load black and white lists to DMRAccessControl //Load black and white lists to DMRAccessControl
DMRAccessControl::init(DstIdBlacklistSlot1RF, DstIdWhitelistSlot1RF, DstIdBlacklistSlot2RF, DstIdWhitelistSlot2RF, DstIdBlacklistSlot1NET, DstIdWhitelistSlot1NET, DstIdBlacklistSlot2NET, DstIdWhitelistSlot2NET, SrcIdBlacklist, m_selfOnly, m_prefixes, m_id); DMRAccessControl::init(DstIdBlacklistSlot1RF, DstIdWhitelistSlot1RF, DstIdBlacklistSlot2RF, DstIdWhitelistSlot2RF, DstIdBlacklistSlot1NET, DstIdWhitelistSlot1NET, DstIdBlacklistSlot2NET, DstIdWhitelistSlot2NET, SrcIdBlacklist, m_selfOnly, m_prefixes, m_id,callHang);
} }