MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-22 16:25:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Signed/Unsigned cleanup

Browse Source
This commit is contained in:
Simon
2016-10-17 21:25:22 +01:00
parent 715369e06e
commit 85f2a8e2c7
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
DMRAccessControl.cpp
View File

@@ -214,8 +214,8 @@ unsigned int DMRAccessControl::dstIdRewrite(unsigned int did, unsigned int sid,
if (network) { if (network) {
m_dstRewriteID[slot] = did; m_dstRewriteID[slot - 1U] = did;
m_srcID[slot] = sid; m_srcID[slot - 1U] = sid;
//not needed at present - for direct dial, which requires change at master end. //not needed at present - for direct dial, which requires change at master end.
//memcpy(&m_lastdmrLC, &dmrLC, sizeof(dmrLC)); //memcpy(&m_lastdmrLC, &dmrLC, sizeof(dmrLC));
@@ -230,16 +230,16 @@ unsigned int DMRAccessControl::dstIdRewrite(unsigned int did, unsigned int sid,
} else { } else {
return 0U; return 0U;
} }
} else if (m_bmAutoRewrite && did == 9U && m_dstRewriteID[slot] != 9U && m_dstRewriteID[slot] != 0U && (m_time[slot] + m_callHang) > currenttime && dmrLC->getFLCO() == FLCO_GROUP ) { } else if (m_bmAutoRewrite && did == 9U && m_dstRewriteID[slot - 1U] != 9U && m_dstRewriteID[slot - 1U] != 0U && (m_time[slot - 1U] + 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); LogMessage("DMR Slot %u, Rewrite DST ID (TG) of outbound network traffic from %u to %u (return traffic during CallHang)",slot,did,m_dstRewriteID[slot - 1]);
return m_dstRewriteID[slot]; return m_dstRewriteID[slot - 1U];
} else if (m_bmAutoRewrite && (did < 4000U || did > 5000U) && did > 0U && did !=9U && did < 99999U && dmrLC->getFLCO() == FLCO_USER_USER) { } else if (m_bmAutoRewrite && (did < 4000U || did > 5000U) && did > 0U && did !=9U && did < 99999U && dmrLC->getFLCO() == FLCO_USER_USER) {
m_dstRewriteID[slot] = did; m_dstRewriteID[slot - 1U] = did;
dmrLC->setFLCO(FLCO_GROUP); dmrLC->setFLCO(FLCO_GROUP);
LogMessage("DMR Slot %u, Rewrite outbound private call to %u Group Call (Connect talkgroup by private call)",slot,did); LogMessage("DMR Slot %u, Rewrite outbound private call to %u Group Call (Connect talkgroup by private call)",slot,did);
return did; return did;
} else if (m_bmAutoRewrite && (did < 4000U || did > 5000U) && did > 0U && did !=9U && did > 99999U) { } else if (m_bmAutoRewrite && (did < 4000U || did > 5000U) && did > 0U && did !=9U && did > 99999U) {
m_dstRewriteID[slot] = did; m_dstRewriteID[slot - 1U] = did;
} }
return 0U; return 0U;
@@ -247,5 +247,5 @@ unsigned int DMRAccessControl::dstIdRewrite(unsigned int did, unsigned int sid,
void DMRAccessControl::setOverEndTime(unsigned int slot) void DMRAccessControl::setOverEndTime(unsigned int slot)
{ {
m_time[slot] = ::time(NULL); m_time[slot - 1U] = ::time(NULL);
} }

3
DMRAccessControl.h
View File

@@ -57,8 +57,7 @@ private:
static time_t m_time[2]; static time_t m_time[2];
static unsigned int m_dstRewriteIDslot1;
static unsigned int m_srcIDslot1;
static unsigned int m_dstRewriteID[2]; static unsigned int m_dstRewriteID[2];
static unsigned int m_srcID[2]; static unsigned int m_srcID[2];