dominic/YSFClients
1
0
Fork 0
Code Releases Activity

Merge pull request from narspt/patch-4

Browse source
This commit is contained in:
Jonathan Naylor 2021-11-29 06:34:26 +00:00 • committed by GitHub
commit 1147745c48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions

12
YSFGateway/YSFGateway.cpp
View file

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

2
YSFGateway/YSFGateway.h
View file

@ -69,7 +69,7 @@ private:
void startupLinking(); void startupLinking();
std::string calculateLocator(); std::string calculateLocator();
bool processWiresX(const unsigned char* buffer, const CYSFFICH& fich, bool dontProcessWiresXLocal, bool wiresXCommandPassthrough); void processWiresX(const unsigned char* buffer, const CYSFFICH& fich, bool dontProcessWiresXLocal, bool wiresXCommandPassthrough);
void processDTMF(unsigned char* buffer, unsigned char dt); void processDTMF(unsigned char* buffer, unsigned char dt);
void createWiresX(CYSFNetwork* rptNetwork); void createWiresX(CYSFNetwork* rptNetwork);
void createGPS(); void createGPS();