MMDVM/DMRGateway
1
0
Fork 0
mirror of https://github.com/g4klx/DMRGateway synced 2025-12-23 06:45:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow the XLXBase to affect the reflector choice command.

Browse Source
This commit is contained in:
Jonathan Naylor
2017-08-21 13:17:21 +01:00
parent 225db94a6b
commit da12799d04
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
DMRGateway.cpp
View File

@@ -470,10 +470,12 @@ int CDMRGateway::run()
} }
} }
} }
} else if (dstId > 8000U && dstId < 9000U && flco == FLCO_USER_USER && slotNo == m_xlxSlot) { } else if (dstId > (m_xlxBase + 4000U) && dstId < (m_xlxBase + 5000U) && flco == FLCO_USER_USER && slotNo == m_xlxSlot) {
unsigned int number = dstId - 8000U; dstId += 4000U;
if (number != m_xlxNumber) dstId -= m_xlxBase;
linkXLX(number);
if (dstId != m_xlxNumber)
linkXLX(dstId);
} else { } else {
unsigned int slotNo = data.getSlotNo(); unsigned int slotNo = data.getSlotNo();
unsigned int srcId = data.getSrcId(); unsigned int srcId = data.getSrcId();
@@ -1109,10 +1111,10 @@ bool CDMRGateway::linkXLX(unsigned int number)
LogMessage("XLX, Disconnecting from XLX%03u", m_xlxNumber); LogMessage("XLX, Disconnecting from XLX%03u", m_xlxNumber);
m_xlxNetwork->close(); m_xlxNetwork->close();
delete m_xlxNetwork; delete m_xlxNetwork;
m_xlxRelink.setTimeout(0U);
} }
m_xlxConnected = false; m_xlxConnected = false;
m_xlxRelink.stop();
m_xlxNetwork = new CDMRNetwork(reflector->m_address, reflector->m_port, m_xlxLocal, m_xlxId, reflector->m_password, "XLX", m_xlxDebug); m_xlxNetwork = new CDMRNetwork(reflector->m_address, reflector->m_port, m_xlxLocal, m_xlxId, reflector->m_password, "XLX", m_xlxDebug);
@@ -1130,7 +1132,10 @@ bool CDMRGateway::linkXLX(unsigned int number)
m_xlxNumber = number; m_xlxNumber = number;
m_xlxRoom = reflector->m_startup; m_xlxRoom = reflector->m_startup;
m_xlxRelink.stop();
// By definition the "Room" will be correct
if (m_xlxNumber != m_xlxStartup)
m_xlxRelink.start();
LogMessage("XLX, Connecting to XLX%03u", m_xlxNumber); LogMessage("XLX, Connecting to XLX%03u", m_xlxNumber);