dominic
/
YSFClients
1
0
Fork 0
Code Releases Activity

Merge pull request #133 from AndyTaylorTweet/patch-6

Browse Source 
Update YSFGateway.cpp
ycs232-kbc
Jonathan Naylor 6 years ago committed by GitHub
parent 327c6d0853 76211e05be
commit b7a5e48a00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File

31
YSFGateway/YSFGateway.cpp
Unescape View File

@ -268,25 +268,23 @@ int CYSFGateway::run()
unsigned char ft = fich.getFT(); unsigned char ft = fich.getFT();
CYSFReflector* reflector = m_wiresX->getReflector(); CYSFReflector* reflector = m_wiresX->getReflector();
if (m_ysfNetwork != NULL && m_linkType == LINK_YSF) { if (m_ysfNetwork != NULL && m_linkType == LINK_YSF && wiresXCommandPassthrough) {
// Connected to a YSF reflector, figure out what kind it is if (reflector->m_wiresX) {
if ( (wiresXCommandPassthrough) && (reflector->m_wiresX) ) {
// Pass Control Commands (WiresX capable reflector)
processDTMF(buffer, dt); processDTMF(buffer, dt);
processWiresX(buffer, fi, dt, fn, ft, true); processWiresX(buffer, fi, dt, fn, ft, true, wiresXCommandPassthrough);
} } else {
else {
// Don't Pass Control Commands (Not a WiresX capable reflector)
m_exclude = (dt == YSF_DT_DATA_FR_MODE); m_exclude = (dt == YSF_DT_DATA_FR_MODE);
processDTMF(buffer, dt); processDTMF(buffer, dt);
processWiresX(buffer, fi, dt, fn, ft, false); processWiresX(buffer, fi, dt, fn, ft, false, wiresXCommandPassthrough);
}
} }
else { } else if (wiresXCommandPassthrough) {
// Don't Pass Control Commands (Not connected to a reflector) m_exclude = (dt == YSF_DT_DATA_FR_MODE);
processDTMF(buffer, dt);
processWiresX(buffer, fi, dt, fn, ft, false, wiresXCommandPassthrough);
} else {
m_exclude = (dt == YSF_DT_DATA_FR_MODE); m_exclude = (dt == YSF_DT_DATA_FR_MODE);
processDTMF(buffer, dt); processDTMF(buffer, dt);
processWiresX(buffer, fi, dt, fn, ft, false); processWiresX(buffer, fi, dt, fn, ft, false, wiresXCommandPassthrough);
} }
if (m_gps != NULL) if (m_gps != NULL)
@ -523,11 +521,11 @@ void CYSFGateway::createWiresX(CYSFNetwork* rptNetwork)
m_wiresX->start(); m_wiresX->start();
} }
void CYSFGateway::processWiresX(const unsigned char* buffer, unsigned char fi, unsigned char dt, unsigned char fn, unsigned char ft, bool wiresXCommandPassthrough) void CYSFGateway::processWiresX(const unsigned char* buffer, unsigned char fi, unsigned char dt, unsigned char fn, unsigned char ft, bool dontProcessWiresXLocal, bool wiresXCommandPassthrough)
{ {
assert(buffer != NULL); assert(buffer != NULL);
WX_STATUS status = m_wiresX->process(buffer + 35U, buffer + 14U, fi, dt, fn, ft, wiresXCommandPassthrough); WX_STATUS status = m_wiresX->process(buffer + 35U, buffer + 14U, fi, dt, fn, ft, dontProcessWiresXLocal);
switch (status) { switch (status) {
case WXS_CONNECT_YSF: { case WXS_CONNECT_YSF: {
if (m_linkType == LINK_YSF) if (m_linkType == LINK_YSF)
@ -550,7 +548,8 @@ void CYSFGateway::processWiresX(const unsigned char* buffer, unsigned char fi, u
m_linkType = LINK_YSF; m_linkType = LINK_YSF;
// If we are linking to a YSF2xxx mode, send the YSF2xxx gateway the link command too // If we are linking to a YSF2xxx mode, send the YSF2xxx gateway the link command too
if ( (wiresXCommandPassthrough) && (reflector->m_wiresX) ) { if (reflector->m_wiresX && wiresXCommandPassthrough) {
LogMessage("Forward WiresX Connect to \"%s\"", reflector->m_name.c_str());
m_wiresX->sendConnect(m_ysfNetwork); m_wiresX->sendConnect(m_ysfNetwork);
} }
} }

Write Preview
Loading…
Cancel
Save