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

Add better validation of DG-ID for DSQ use.

Browse source
This commit is contained in:
Jonathan Naylor 2017-09-17 12:16:14 +01:00
parent 5fa3b8f524
commit 139be054be
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
YSFControl.cpp
View file

@ -154,13 +154,23 @@ bool CYSFControl::writeModem(unsigned char *data, unsigned int len)
if (valid)
m_lastFICH = fich;
// Validate the DSQ value if enabled
// Validate the DSQ/DG-ID value if enabled
if (m_sqlEnabled) {
bool sql = m_lastFICH.getSQL();
unsigned char value = m_lastFICH.getSQ();
unsigned char cm = m_lastFICH.getCM();
if (cm == YSF_CM_GROUP2) {
// Using the DG-ID value
unsigned char value = m_lastFICH.getSQ();
if (!sql || value != m_sqlValue)
return false;
if (value != m_sqlValue)
return false;
} else {
// Using the DSQ value
bool sql = m_lastFICH.getSQL();
unsigned char value = m_lastFICH.getSQ();
if (!sql || value != m_sqlValue)
return false;
}
}
// Stop repeater packets coming through, unless we're acting as a remote gateway