ShaYmez
/
P25Clients
mirror of https://github.com/ShaYmez/P25Clients.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #11 from KR0SIV/patch-2 

Revert to startup TG after timeout
This commit is contained in:
Jonathan Naylor 2018-03-30 07:12:22 +01:00 committed by GitHub
parent b48ea93de9 5a6e19bde8
commit 8be8172a8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
P25Gateway/P25Gateway.cpp
View File

@ -343,24 +343,43 @@ void CP25Gateway::run()
inactivityTimer.clock(ms);
if (inactivityTimer.isRunning() && inactivityTimer.hasExpired()) {
if (currentId != 9999U) {
LogMessage("Unlinking from %u due to inactivity", currentId);
unsigned int startId = m_conf.getNetworkStartup();
if (currentId != startId) {
LogMessage("Unlinking from %u due to inactivity", currentId);
remoteNetwork.writeUnlink(currentAddr, currentPort);
remoteNetwork.writeUnlink(currentAddr, currentPort);
remoteNetwork.writeUnlink(currentAddr, currentPort);
remoteNetwork.writeUnlink(currentAddr, currentPort);
remoteNetwork.writeUnlink(currentAddr, currentPort);
remoteNetwork.writeUnlink(currentAddr, currentPort);
if (speech != NULL)
speech->announce(currentId);
currentId = 9999U;
if (speech != NULL)
speech->announce(currentId);
currentId = 9999U;
pollTimer.stop();
lostTimer.stop();
pollTimer.stop();
lostTimer.stop();
inactivityTimer.stop();
//Connecting to default startup reflector
CP25Reflector* reflector = reflectors.find(startId);
currentAddr = reflector->m_address;
currentPort = reflector->m_port;
remoteNetwork.writePoll(currentAddr, currentPort);
remoteNetwork.writePoll(currentAddr, currentPort);
remoteNetwork.writePoll(currentAddr, currentPort);
LogMessage("Linked to startup %u due to inactivity", startId);
inactivityTimer.start();
pollTimer.start();
lostTimer.start();
currentId = startId;
}
inactivityTimer.stop();
}
inactivityTimer.stop();
}
pollTimer.clock(ms);
if (pollTimer.isRunning() && pollTimer.hasExpired()) {
if (currentId != 9999U)