oe7drt/YSFClients
1
0
Fork 0
mirror of https://github.com/oe7drt/YSFClients.git synced 2026-01-03 15:10:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update the signal handling.

Browse source
This commit is contained in:
Jonathan Naylor 2024-08-28 17:03:51 +01:00
parent aecc34ee64
commit ae29471f58
2 changed files with 84 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
DGIdGateway/DGIdGateway.cpp
View file

@ -63,6 +63,17 @@ const unsigned char DT_VD_MODE2 = 0x02U;
const unsigned char DT_VOICE_FR_MODE = 0x04U;
const unsigned char DT_DATA_FR_MODE = 0x08U;
static bool m_killed = false;
static int m_signal = 0;
#if !defined(_WIN32) && !defined(_WIN64)
static void sigHandler(int signum)
{
m_killed = true;
m_signal = signum;
}
#endif
int main(int argc, char** argv)
{
const char* iniFile = DEFAULT_INI_FILE;
@ -81,11 +92,38 @@ int main(int argc, char** argv)
}
}
CDGIdGateway* gateway = new CDGIdGateway(std::string(iniFile));
#if !defined(_WIN32) && !defined(_WIN64)
::signal(SIGINT, sigHandler);
::signal(SIGTERM, sigHandler);
::signal(SIGHUP, sigHandler);
#endif
int ret = gateway->run();
int ret = 0;
delete gateway;
do {
m_signal = 0;
m_killed = false;
CDGIdGateway* gateway = new CDGIdGateway(std::string(iniFile));
ret = gateway->run();
delete gateway;
switch (m_signal) {
case 2:
::LogInfo("DGIdGateway-%s exited on receipt of SIGINT", VERSION);
break;
case 15:
::LogInfo("DGIdGateway-%s exited on receipt of SIGTERM", VERSION);
break;
case 1:
::LogInfo("DGIdGateway-%s is restarting on receipt of SIGHUP", VERSION);
break;
default:
::LogInfo("DGIdGateway-%s exited on receipt of an unknown signal", VERSION);
break;
}
} while (m_signal == 1);
return ret;
}
@ -414,7 +452,7 @@ int CDGIdGateway::run()
DGID_STATUS state = DS_NOTLINKED;
unsigned int nPips = 0U;
for (;;) {
while (!m_killed) {
unsigned char buffer[200U];
memset(buffer, 0U, 200U);

46
YSFGateway/YSFGateway.cpp
View file

@ -50,6 +50,17 @@ const char* DEFAULT_INI_FILE = "/etc/YSFGateway.ini";
#include <cmath>
#include <algorithm>
static bool m_killed = false;
static int m_signal = 0;
#if !defined(_WIN32) && !defined(_WIN64)
static void sigHandler(int signum)
{
m_killed = true;
m_signal = signum;
}
#endif
int main(int argc, char** argv)
{
const char* iniFile = DEFAULT_INI_FILE;
@ -68,11 +79,38 @@ int main(int argc, char** argv)
}
}
CYSFGateway* gateway = new CYSFGateway(std::string(iniFile));
#if !defined(_WIN32) && !defined(_WIN64)
::signal(SIGINT, sigHandler);
::signal(SIGTERM, sigHandler);
::signal(SIGHUP, sigHandler);
#endif
int ret = gateway->run();
int ret = 0;
delete gateway;
do {
m_signal = 0;
m_killed = false;
CYSFGateway* gateway = new CYSFGateway(std::string(iniFile));
ret = gateway->run();
delete gateway;
switch (m_signal) {
case 2:
::LogInfo("YSFGateway-%s exited on receipt of SIGINT", VERSION);
break;
case 15:
::LogInfo("YSFGateway-%s exited on receipt of SIGTERM", VERSION);
break;
case 1:
::LogInfo("YSFGateway-%s is restarting on receipt of SIGHUP", VERSION);
break;
default:
::LogInfo("YSFGateway-%s exited on receipt of an unknown signal", VERSION);
break;
}
} while (m_signal == 1);
return ret;
}
@ -270,7 +308,7 @@ int CYSFGateway::run()
LogMessage("YSFGateway-%s is starting", VERSION);
LogMessage("Built %s %s (GitID #%.7s)", __TIME__, __DATE__, gitversion);
for (;;) {
while (!m_killed) {
unsigned char buffer[200U];
memset(buffer, 0U, 200U);