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

Allow for locking the MMDVM to the callsign or id of the

Browse Source 
repeater/hostspot.
This commit is contained in:
Jonathan Naylor
2016-04-04 17:40:05 +01:00
parent 5c6e0ea4c1
commit ea51eee15c
10 changed files with 111 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
DMRControl.cpp
View File

@@ -19,9 +19,10 @@
#include <cstdio>
#include <cassert>
CDMRControl::CDMRControl(unsigned int id, unsigned int colorCode, unsigned int timeout, CModem* modem, CDMRIPSC* network, IDisplay* display, bool duplex) :
CDMRControl::CDMRControl(unsigned int id, unsigned int colorCode, bool selfOnly, unsigned int timeout, CModem* modem, CDMRIPSC* network, IDisplay* display, bool duplex) :
m_id(id),
m_colorCode(colorCode),
m_selfOnly(selfOnly),
m_modem(modem),
m_network(network),
m_slot1(1U, timeout),
@@ -30,7 +31,7 @@ m_slot2(2U, timeout)
assert(modem != NULL);
assert(display != NULL);
CDMRSlot::init(colorCode, modem, network, display, duplex);
CDMRSlot::init(id, colorCode, selfOnly, modem, network, display, duplex);
}
CDMRControl::~CDMRControl()
@@ -54,13 +55,25 @@ bool CDMRControl::processWakeup(const unsigned char* data)
if (csbko != CSBKO_BSDWNACT)
return false;
unsigned int bsId = csbk.getBSId();
unsigned int srcId = csbk.getSrcId();
unsigned int bsId = csbk.getBSId();
if (bsId == 0xFFFFFFU) {
LogMessage("CSBK BS_Dwn_Act for ANY received from %u", csbk.getSrcId());
return true;
if (m_selfOnly && srcId != m_id) {
LogMessage("Invalid CSBK BS_Dwn_Act for ANY received from %u", srcId);
return false;
} else {
LogMessage("CSBK BS_Dwn_Act for ANY received from %u", srcId);
return true;
}
} else if (bsId == m_id) {
LogMessage("CSBK BS_Dwn_Act for %u received from %u", bsId, csbk.getSrcId());
return true;
if (m_selfOnly && srcId != m_id) {
LogMessage("Invalid CSBK BS_Dwn_Act for %u received from %u", bsId, srcId);
return false;
} else {
LogMessage("CSBK BS_Dwn_Act for %u received from %u", bsId, srcId);
return true;
}
}
return false;