MMDVM/DMRGateway
1
0
Fork 0
mirror of https://github.com/g4klx/DMRGateway synced 2025-12-21 05:25:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20 from g0wfv/develop

Browse Source 
Alert connected host of gateway shutdown
This commit is contained in:
Jonathan Naylor
2017-06-07 20:31:44 +01:00
committed by GitHub
parent 1b96901f88 e1d0a469eb
commit 60a95881ca
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DMRGateway.cpp
View File

@@ -99,6 +99,7 @@ int main(int argc, char** argv)
} }
#if !defined(_WIN32) && !defined(_WIN64) #if !defined(_WIN32) && !defined(_WIN64)
::signal(SIGINT, sigHandler);
::signal(SIGTERM, sigHandler); ::signal(SIGTERM, sigHandler);
::signal(SIGHUP, sigHandler); ::signal(SIGHUP, sigHandler);
#endif #endif
@@ -113,11 +114,14 @@ int main(int argc, char** argv)
delete host; delete host;
if (m_signal == 2)
::LogInfo("DMRGateway-%s exited on receipt of SIGINT", VERSION);
if (m_signal == 15) if (m_signal == 15)
::LogInfo("Caught SIGTERM, exiting"); ::LogInfo("DMRGateway-%s exited on receipt of SIGTERM", VERSION);
if (m_signal == 1) if (m_signal == 1)
::LogInfo("Caught SIGHUP, restarting"); ::LogInfo("DMRGateway-%s restarted on receipt of SIGHUP", VERSION);
} while (m_signal == 1); } while (m_signal == 1);
::LogFinalise(); ::LogFinalise();
@@ -277,7 +281,7 @@ int CDMRGateway::run()
} }
if (m_killed) { if (m_killed) {
LogMessage("DMRGateway-%s is exiting on receipt of SIGHUP1", VERSION); // LogMessage("DMRGateway-%s is exiting on receipt of SIGHUP1", VERSION);
m_repeater->close(); m_repeater->close();
delete m_repeater; delete m_repeater;
return 0; return 0;
@@ -759,7 +763,7 @@ int CDMRGateway::run()
CThread::sleep(10U); CThread::sleep(10U);
} }
LogMessage("DMRGateway-%s is exiting on receipt of SIGHUP1", VERSION); // LogMessage("DMRGateway-%s is exiting on receipt of SIGHUP1", VERSION);
delete voice1; delete voice1;
delete voice2; delete voice2;

12
MMDVMNetwork.cpp
View File

@@ -255,9 +255,21 @@ bool CMMDVMNetwork::writeBeacon()
void CMMDVMNetwork::close() void CMMDVMNetwork::close()
{ {
unsigned char buffer[HOMEBREW_DATA_PACKET_LENGTH];
::memset(buffer, 0x00U, HOMEBREW_DATA_PACKET_LENGTH);
LogMessage("DMR, Closing MMDVM Network"); LogMessage("DMR, Closing MMDVM Network");
buffer[0U] = 'M';
buffer[1U] = 'S';
buffer[2U] = 'T';
buffer[3U] = 'N';
buffer[4U] = 'A';
buffer[5U] = 'K';
m_socket.write(buffer, HOMEBREW_DATA_PACKET_LENGTH, m_rptAddress, m_rptPort);
m_socket.close(); m_socket.close();
} }
void CMMDVMNetwork::clock(unsigned int ms) void CMMDVMNetwork::clock(unsigned int ms)