dominic/YSFClients
1
0
Fork 0
Code Releases Activity

fix wiresx cmd passthrough happening even disabled

Browse source
This commit is contained in:
narspt 2021-11-29 01:43:34 +00:00 committed by GitHub
parent 1456810fa9
commit 54ae27d63b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
YSFGateway/YSFGateway.cpp
View file

@ -281,10 +281,12 @@ int CYSFGateway::run()
CYSFReflector* reflector = m_wiresX->getReflector();
if (m_ysfNetwork != NULL && m_linkType == LINK_YSF && wiresXCommandPassthrough && reflector->m_wiresX) {
processDTMF(buffer, dt);
m_exclude = processWiresX(buffer, fich, true, wiresXCommandPassthrough);
processWiresX(buffer, fich, true, wiresXCommandPassthrough);
} else {
if (m_ysfNetwork != NULL && m_linkType == LINK_YSF && reflector->m_wiresX)
m_exclude = (dt == YSF_DT_DATA_FR_MODE);
processDTMF(buffer, dt);
m_exclude = processWiresX(buffer, fich, false, wiresXCommandPassthrough);
processWiresX(buffer, fich, false, wiresXCommandPassthrough);
}
if (m_gps != NULL)
@ -530,10 +532,8 @@ void CYSFGateway::createWiresX(CYSFNetwork* rptNetwork)
m_wiresX->start();
}
bool CYSFGateway::processWiresX(const unsigned char* buffer, const CYSFFICH& fich, bool dontProcessWiresXLocal, bool wiresXCommandPassthrough)
void CYSFGateway::processWiresX(const unsigned char* buffer, const CYSFFICH& fich, bool dontProcessWiresXLocal, bool wiresXCommandPassthrough)
{
bool ret=true;
assert(buffer != NULL);
WX_STATUS status = m_wiresX->process(buffer + 35U, buffer + 14U, fich, dontProcessWiresXLocal);
@ -624,10 +624,8 @@ bool CYSFGateway::processWiresX(const unsigned char* buffer, const CYSFFICH& fic
}
break;
default:
ret = false;
break;
}
return ret;
}
void CYSFGateway::processDTMF(unsigned char* buffer, unsigned char dt)