From 1015f3d55f8da003a8df2db4ea11514281f0b6db Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Fri, 3 Jun 2022 17:06:07 +0100 Subject: [PATCH] Once linked, pass all traffic to the room/reflector, regardless of the DG-Id. --- DGIdGateway/DGIdGateway.cpp | 10 ++-------- DGIdGateway/Version.h | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/DGIdGateway/DGIdGateway.cpp b/DGIdGateway/DGIdGateway.cpp index ce64249..8e8a170 100644 --- a/DGIdGateway/DGIdGateway.cpp +++ b/DGIdGateway/DGIdGateway.cpp @@ -427,13 +427,7 @@ int CDGIdGateway::run() if (dgId == WIRESX_DGID) dgId = 0U; - if (dgId != currentDGId) { - if (currentDGId != UNSET_DGID && dgIdNetwork[currentDGId] != NULL && !dgIdNetwork[currentDGId]->m_static) { - dgIdNetwork[currentDGId]->unlink(); - dgIdNetwork[currentDGId]->unlink(); - dgIdNetwork[currentDGId]->unlink(); - } - + if (currentDGId == UNSET_DGID) { if (dgIdNetwork[dgId] != NULL && !dgIdNetwork[dgId]->m_static) { dgIdNetwork[dgId]->link(); dgIdNetwork[dgId]->link(); @@ -443,13 +437,13 @@ int CDGIdGateway::run() if (dgIdNetwork[dgId] != NULL) { std::string desc = dgIdNetwork[dgId]->getDesc(dgId); LogMessage("DG-ID set to %u (%s) via RF", dgId, desc.c_str()); + currentDGId = dgId; state = DS_NOTLINKED; } else { LogMessage("DG-ID set to %u (None) via RF", dgId); state = DS_NOTOPEN; } - currentDGId = dgId; fromRF = true; } diff --git a/DGIdGateway/Version.h b/DGIdGateway/Version.h index d7e0172..bb409ab 100644 --- a/DGIdGateway/Version.h +++ b/DGIdGateway/Version.h @@ -19,6 +19,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20210922"; +const char* VERSION = "20220603"; #endif