Once linked, pass all traffic to the room/reflector, regardless of the
DG-Id.
This commit is contained in:
parent
1344f545e9
commit
1015f3d55f
2 changed files with 3 additions and 9 deletions
DGIdGateway
|
@ -427,13 +427,7 @@ int CDGIdGateway::run()
|
||||||
if (dgId == WIRESX_DGID)
|
if (dgId == WIRESX_DGID)
|
||||||
dgId = 0U;
|
dgId = 0U;
|
||||||
|
|
||||||
if (dgId != currentDGId) {
|
if (currentDGId == UNSET_DGID) {
|
||||||
if (currentDGId != UNSET_DGID && dgIdNetwork[currentDGId] != NULL && !dgIdNetwork[currentDGId]->m_static) {
|
|
||||||
dgIdNetwork[currentDGId]->unlink();
|
|
||||||
dgIdNetwork[currentDGId]->unlink();
|
|
||||||
dgIdNetwork[currentDGId]->unlink();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (dgIdNetwork[dgId] != NULL && !dgIdNetwork[dgId]->m_static) {
|
if (dgIdNetwork[dgId] != NULL && !dgIdNetwork[dgId]->m_static) {
|
||||||
dgIdNetwork[dgId]->link();
|
dgIdNetwork[dgId]->link();
|
||||||
dgIdNetwork[dgId]->link();
|
dgIdNetwork[dgId]->link();
|
||||||
|
@ -443,13 +437,13 @@ int CDGIdGateway::run()
|
||||||
if (dgIdNetwork[dgId] != NULL) {
|
if (dgIdNetwork[dgId] != NULL) {
|
||||||
std::string desc = dgIdNetwork[dgId]->getDesc(dgId);
|
std::string desc = dgIdNetwork[dgId]->getDesc(dgId);
|
||||||
LogMessage("DG-ID set to %u (%s) via RF", dgId, desc.c_str());
|
LogMessage("DG-ID set to %u (%s) via RF", dgId, desc.c_str());
|
||||||
|
currentDGId = dgId;
|
||||||
state = DS_NOTLINKED;
|
state = DS_NOTLINKED;
|
||||||
} else {
|
} else {
|
||||||
LogMessage("DG-ID set to %u (None) via RF", dgId);
|
LogMessage("DG-ID set to %u (None) via RF", dgId);
|
||||||
state = DS_NOTOPEN;
|
state = DS_NOTOPEN;
|
||||||
}
|
}
|
||||||
|
|
||||||
currentDGId = dgId;
|
|
||||||
fromRF = true;
|
fromRF = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -19,6 +19,6 @@
|
||||||
#if !defined(VERSION_H)
|
#if !defined(VERSION_H)
|
||||||
#define VERSION_H
|
#define VERSION_H
|
||||||
|
|
||||||
const char* VERSION = "20210922";
|
const char* VERSION = "20220603";
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Add table
Reference in a new issue