Skip to content

Commit 21691b0

Browse files
hacknixhacknix
committed
Talkgroup rewrite now working
1 parent 105d185 commit 21691b0

File tree

3 files changed

+44
-38
lines changed

3 files changed

+44
-38
lines changed

‎DMRAccessControl.cpp

+19-17
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,13 @@ bool DMRAccessControl::m_selfOnly = false;
3939
unsigned int DMRAccessControl::m_id = 0U;
4040

4141
unsigned int DMRAccessControl::m_dstRewriteID = 0U;
42+
unsigned int DMRAccessControl::m_SrcID = 0U;
4243

4344
std::time_t DMRAccessControl::m_time;
4445

45-
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)
46+
unsigned int DMRAccessControl::m_callHang;
47+
48+
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)
4649
{
4750
m_dstBlackListSlot1RF = DstIdBlacklistSlot1RF;
4851
m_dstWhiteListSlot1RF = DstIdWhitelistSlot1RF;
@@ -52,6 +55,7 @@ void DMRAccessControl::init(const std::vector<unsigned int>& DstIdBlacklistSlot1
5255
m_dstWhiteListSlot1NET = DstIdWhitelistSlot1NET;
5356
m_dstBlackListSlot2NET = DstIdBlacklistSlot2NET;
5457
m_dstWhiteListSlot2NET = DstIdWhitelistSlot2NET;
58+
m_callHang = callHang;
5559
}
5660

5761
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,
186190
}
187191
}
188192

189-
unsigned int DMRAccessControl::DstIdRewrite (unsigned int id, bool network)
193+
unsigned int DMRAccessControl::DstIdRewrite (unsigned int did, unsigned int sid, unsigned int slot, bool network)
190194
{
191-
// record current time
192195
std::time_t currenttime = std::time(nullptr);
193196

194-
// if the traffic is from the network
195197
if (network) {
196-
m_dstRewriteID = id;
197-
// record current time
198-
m_time = std::time(nullptr);
199-
// if the ID is a talkgroup, log and rewrite to TG9
200-
if (id < 4000 && id > 0) {
201-
LogMessage("Rewrite DST ID (TG) of of inbound network traffic from %u to 9", id);
198+
m_dstRewriteID = did;
199+
m_SrcID = sid;
200+
if (did < 4000 && did > 0 && did != 9) {
201+
LogMessage("DMR Slot %u, Rewrite DST ID (TG) of of inbound network traffic from %u to 9",slot,did);
202202
return 9;
203203
} else {
204204
return 0;
205205
}
206206
} else {
207-
// if less than 30 seconds has passed since we last saw traffic from network
208-
if (m_dstRewriteID == id && (m_time + 30) > currenttime) {
209-
LogMessage("Inbound DST ID (TG) rewrite seen in last 30 seconds");
210-
LogMessage("Rewrite DST ID (TG) of outbound network traffic from 9 to %u", id);
211-
m_time = std::time(nullptr);
212-
return(id);
207+
if (m_SrcID == sid && (m_time + m_callHang) > currenttime) {
208+
LogMessage("DMR Slot %u, Rewrite DST ID (TG) of outbound network traffic from 9 to %u (return traffic during CallHang)",slot,m_dstRewriteID);
209+
return(m_dstRewriteID);
213210
} else {
214211
return(0);
215212
}
216213
}
217214

218-
}
215+
}
216+
217+
void DMRAccessControl::setOverEndTime()
218+
{
219+
m_time = std::time(nullptr);
220+
}

‎DMRAccessControl.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ class DMRAccessControl {
2222
public:
2323
static bool validateAccess (unsigned int src_id, unsigned int dst_id, unsigned int slot, bool network);
2424

25-
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);
25+
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);
2626

27-
static unsigned int DstIdRewrite(unsigned int id, bool network);
27+
static unsigned int DstIdRewrite(unsigned int id, unsigned int sid,unsigned int slot, bool network);
28+
static void setOverEndTime();
2829

2930
private:
3031
static std::vector<unsigned int> m_dstBlackListSlot1RF;
@@ -40,6 +41,8 @@ class DMRAccessControl {
4041
static std::vector<unsigned int> m_SrcIdBlacklist;
4142

4243
static std::vector<unsigned int> m_prefixes;
44+
45+
static unsigned int m_callHang;
4346

4447
static bool m_selfOnly;
4548
static unsigned int m_id;
@@ -52,6 +55,7 @@ class DMRAccessControl {
5255
static std::time_t m_time;
5356

5457
static unsigned int m_dstRewriteID;
58+
static unsigned int m_SrcID;
5559

5660

5761
};

‎DMRSlot.cpp

+19-19
Original file line numberDiff line numberDiff line change
@@ -152,17 +152,16 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
152152
if (lc == NULL)
153153
return;
154154

155-
unsigned int id = lc->getSrcId();
155+
unsigned int sid = lc->getSrcId();
156156
unsigned int did = lc->getDstId();
157-
if (!DMRAccessControl::validateAccess(id, did, m_slotNo, false)) {
157+
if (!DMRAccessControl::validateAccess(sid, did, m_slotNo, false)) {
158158
delete lc;
159159
return;
160160
}
161161

162-
// Test dst rewrite
163-
unsigned int rw_id = DMRAccessControl::DstIdRewrite(did, false);
162+
unsigned int rw_id = DMRAccessControl::DstIdRewrite(did,sid,m_slotNo,false);
164163
if (rw_id) {
165-
LogMessage("Rewrite ID: %u", rw_id);
164+
166165
lc->setDstId(rw_id);
167166
}
168167

@@ -203,7 +202,7 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
203202

204203
m_rfState = RS_RF_AUDIO;
205204

206-
std::string src = m_lookup->find(id);
205+
std::string src = m_lookup->find(sid);
207206
std::string dst = m_lookup->find(m_rfLC->getDstId());
208207

209208
if (m_netState == RS_NET_IDLE) {
@@ -486,16 +485,16 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
486485

487486
CDMRLC* lc = m_rfEmbeddedLC.addData(data + 2U, emb.getLCSS());
488487
if (lc != NULL) {
489-
unsigned int id = lc->getSrcId();
488+
unsigned int sid = lc->getSrcId();
490489
unsigned int did = lc->getDstId();
491-
if (!DMRAccessControl::validateAccess(id,did,m_slotNo,false)) {
490+
if (!DMRAccessControl::validateAccess(sid,did,m_slotNo,false)) {
492491
delete lc;
493492
return;
494493
}
495494
// Test dst rewrite
496-
unsigned int rw_id = DMRAccessControl::DstIdRewrite(did, false);
495+
unsigned int rw_id = DMRAccessControl::DstIdRewrite(did,sid,m_slotNo,false);
497496
if (rw_id) {
498-
LogMessage("Rewrite ID: %u", rw_id);
497+
499498
lc->setDstId(rw_id);
500499
}
501500

@@ -773,14 +772,14 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
773772
}
774773

775774
unsigned int did = m_netLC->getDstId();
776-
unsigned int id = m_netLC->getSrcId();
777-
if (!DMRAccessControl::validateAccess(did, did, m_slotNo, true))
775+
unsigned int sid = m_netLC->getSrcId();
776+
if (!DMRAccessControl::validateAccess(sid, did, m_slotNo, true))
778777
return;
779778

780779
// Test dst rewrite
781-
unsigned int rw_id = DMRAccessControl::DstIdRewrite(did, true);
780+
unsigned int rw_id = DMRAccessControl::DstIdRewrite(did, sid,m_slotNo, true);
782781
if (rw_id) {
783-
LogMessage("Rewrite ID: %u", rw_id);
782+
784783
m_netLC->setDstId(rw_id);
785784
}
786785

@@ -843,14 +842,14 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
843842
return;
844843

845844
unsigned int did = m_netLC->getDstId();
846-
unsigned int id = m_netLC->getSrcId();
847-
if (!DMRAccessControl::validateAccess(id, did, m_slotNo, true))
845+
unsigned int sid = m_netLC->getSrcId();
846+
if (!DMRAccessControl::validateAccess(sid, did, m_slotNo, true))
848847
return;
849848

850849
// Test dst rewrite
851-
unsigned int rw_id = DMRAccessControl::DstIdRewrite(id,true);
850+
unsigned int rw_id = DMRAccessControl::DstIdRewrite(did,sid,m_slotNo,true);
852851
if (rw_id) {
853-
LogMessage("Rewrite ID: %u", rw_id);
852+
854853
m_netLC->setDstId(rw_id);
855854
}
856855

@@ -919,6 +918,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
919918
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));
920919

921920
writeEndNet();
921+
DMRAccessControl::setOverEndTime();
922922
} else if (dataType == DT_DATA_HEADER) {
923923
if (m_netState == RS_NET_DATA)
924924
return;
@@ -1396,7 +1396,7 @@ void CDMRSlot::init(unsigned int id, unsigned int colorCode, unsigned int callHa
13961396
slotType.getData(m_idle + 2U);
13971397

13981398
//Load black and white lists to DMRAccessControl
1399-
DMRAccessControl::init(DstIdBlacklistSlot1RF, DstIdWhitelistSlot1RF, DstIdBlacklistSlot2RF, DstIdWhitelistSlot2RF, DstIdBlacklistSlot1NET, DstIdWhitelistSlot1NET, DstIdBlacklistSlot2NET, DstIdWhitelistSlot2NET, SrcIdBlacklist, m_selfOnly, m_prefixes, m_id);
1399+
DMRAccessControl::init(DstIdBlacklistSlot1RF, DstIdWhitelistSlot1RF, DstIdBlacklistSlot2RF, DstIdWhitelistSlot2RF, DstIdBlacklistSlot1NET, DstIdWhitelistSlot1NET, DstIdBlacklistSlot2NET, DstIdWhitelistSlot2NET, SrcIdBlacklist, m_selfOnly, m_prefixes, m_id,callHang);
14001400
}
14011401

14021402

0 commit comments

Comments
 (0)