ShaYmez/NXDNClients
1
0
Fork 0
mirror of https://github.com/ShaYmez/NXDNClients.git synced 2025-09-03 21:57:47 -04:00
Code Issues Projects Releases Wiki Activity

Fix bugs.

Browse Source
This commit is contained in:
Jonathan Naylor 2020-10-27 10:58:50 +00:00
parent 3d30aadef1
commit 26427333c6
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
NXDNGateway/NXDNGateway.cpp
View File

@ -287,7 +287,7 @@ void CNXDNGateway::run()
unsigned int len = remoteNetwork.readData(buffer, 200U, addr, addrLen); unsigned int len = remoteNetwork.readData(buffer, 200U, addr, addrLen);
if (len > 0U) { if (len > 0U) {
// If we're linked and it's from the right place, send it on // If we're linked and it's from the right place, send it on
if (currentTG > 0U && CUDPSocket::match(currentAddr, addr)) { if (currentAddrLen > 0U && CUDPSocket::match(currentAddr, addr)) {
// Don't pass reflector control data through to the MMDVM // Don't pass reflector control data through to the MMDVM
if (::memcmp(buffer, "NXDND", 5U) == 0) { if (::memcmp(buffer, "NXDND", 5U) == 0) {
unsigned short dstTG = 0U; unsigned short dstTG = 0U;
@ -349,7 +349,7 @@ void CNXDNGateway::run()
dstTG |= (buffer[11U] << 0) & 0x00FFU; dstTG |= (buffer[11U] << 0) & 0x00FFU;
if (dstTG != currentTG) { if (dstTG != currentTG) {
if (currentTG > 0U) { if (currentAddrLen > 0U) {
std::string callsign = lookup->find(srcId); std::string callsign = lookup->find(srcId);
LogMessage("Unlinking from reflector %u by %s", currentTG, callsign.c_str()); LogMessage("Unlinking from reflector %u by %s", currentTG, callsign.c_str());
@ -370,9 +370,6 @@ void CNXDNGateway::run()
} }
} }
currentTG = 0U;
currentAddrLen = 0U;
if (found == NULL) { if (found == NULL) {
CNXDNReflector* refl = reflectors.find(dstTG); CNXDNReflector* refl = reflectors.find(dstTG);
if (refl != NULL) { if (refl != NULL) {
@ -380,6 +377,10 @@ void CNXDNGateway::run()
currentAddr = refl->m_addr; currentAddr = refl->m_addr;
currentAddrLen = refl->m_addrLen; currentAddrLen = refl->m_addrLen;
currentIsStatic = false; currentIsStatic = false;
} else {
currentTG = dstTG;
currentAddrLen = 0U;
currentIsStatic = false;
} }
} else { } else {
currentTG = found->m_tg; currentTG = found->m_tg;
@ -404,7 +405,7 @@ void CNXDNGateway::run()
} }
if (voice != NULL) { if (voice != NULL) {
if (currentTG == 0U) if (currentAddrLen == 0U)
voice->unlinked(); voice->unlinked();
else else
voice->linkedTo(currentTG); voice->linkedTo(currentTG);
@ -442,7 +443,7 @@ void CNXDNGateway::run()
} }
// If we're linked and we have a network, send it on // If we're linked and we have a network, send it on
if (currentTG > 0U) { if (currentAddrLen > 0U) {
remoteNetwork.writeData(buffer, len, srcId, dstTG, grp, currentAddr, currentAddrLen); remoteNetwork.writeData(buffer, len, srcId, dstTG, grp, currentAddr, currentAddrLen);
hangTimer.start(); hangTimer.start();
} }
@ -466,7 +467,9 @@ void CNXDNGateway::run()
hangTimer.clock(ms); hangTimer.clock(ms);
if (hangTimer.isRunning() && hangTimer.hasExpired()) { if (hangTimer.isRunning() && hangTimer.hasExpired()) {
if (currentTG > 0U) { currentTG = 0U;
if (currentAddrLen > 0U) {
LogMessage("Unlinking from %u due to inactivity", currentTG); LogMessage("Unlinking from %u due to inactivity", currentTG);
if (!currentIsStatic) { if (!currentIsStatic) {
@ -478,7 +481,6 @@ void CNXDNGateway::run()
if (voice != NULL) if (voice != NULL)
voice->unlinked(); voice->unlinked();
currentTG = 0U;
currentAddrLen = 0U; currentAddrLen = 0U;
hangTimer.stop(); hangTimer.stop();

2
NXDNGateway/Version.h
View File

@ -19,6 +19,6 @@
#if !defined(VERSION_H) #if !defined(VERSION_H)
#define VERSION_H #define VERSION_H
const char* VERSION = "20201026"; const char* VERSION = "20201027";
#endif #endif