retronetworking
/
mISDNuser
13
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #8 from christian-intra2net/signal-handlers 

Signal handlers
This commit is contained in:
Karsten Keil 2018-06-28 07:39:14 +02:00 committed by GitHub
parent 0f8548b3d2 a28cb6bc53
commit e5088699fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 59 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
capi20/daemon.c
View File

@ -340,13 +340,24 @@ Signal handler for clean shutdown
static void
termHandler(int sig)
{
iprint("Terminating on signal %d -- request shutdown mISDNcapid\n", sig);
send_master_control(MICD_CTRL_SHUTDOWN, 0, NULL);
return;
}
/**********************************************************************
Signal handler for re-opening log file
***********************************************************************/
static void
hupHandler(int sig)
{
send_master_control(MICD_CTRL_REOPEN_LOG, 0, NULL);
return;
}
/**********************************************************************
Signal handler for dumping state info
***********************************************************************/
@ -408,6 +419,15 @@ const char *BItype2str(enum BType bt)
static void
dumpHandler(int sig)
{
if (sig == SIGUSR1)
send_master_control(MICD_CTRL_DUMP_1, 0, NULL); // master control will call do_dump
else
send_master_control(MICD_CTRL_DUMP_2, 0, NULL); // master control will call do_dump
return;
}
static void do_dump(const int sig)
{
if (sig == SIGUSR1) {
iprint("Received signal %d -- start dumping\n", sig);
@ -583,7 +603,34 @@ static int main_control(int idx)
}
switch (event & MICD_EV_MASK) {
case MICD_CTRL_SHUTDOWN:
iprint("Terminating on signal -- request shutdown mISDNcapid\n");
break;
case MICD_CTRL_REOPEN_LOG:
iprint("Re-opening log on signal\n");
if (DebugFileName)
{
iprint("Received SIGHUP, closing this file for immediate re-open\n");
fflush(DebugFile);
fclose(DebugFile);
DebugFile = fopen(DebugFileName, "a");
if (!DebugFile)
{
fprintf(stderr, "Cannot re-open %s - %s\n", DebugFileName, strerror(errno));
break;
}
iprint("Re-opened debug log file after SIGHUP\n");
fflush(DebugFile);
}
else
iprint("Nothing to do for SIGHUP since no debug file configured\n");
break;
case MICD_CTRL_DUMP_1:
do_dump(SIGUSR1);
break;
case MICD_CTRL_DUMP_2:
do_dump(SIGUSR2);
break;
case MICD_CTRL_DISABLE_POLL:
case MICD_CTRL_ENABLE_POLL:
len /= sizeof(int);
@ -2201,7 +2248,7 @@ static struct mi_ext_fn_s l3dbg = {
.prt_debug = my_lib_debug,
};
static struct sigaction mysig_term, mysig_dump;
static struct sigaction mysig_term, mysig_dump, mysig_hup;
int main(int argc, char *argv[])
{
@ -2454,10 +2501,6 @@ retry_Csock:
if (ret) {
wprint("Error to setup signal handler for SIGTERM - %s\n", strerror(errno));
}
ret = sigaction(SIGHUP, &mysig_term, NULL);
if (ret) {
wprint("Error to setup signal handler for SIGHUP - %s\n", strerror(errno));
}
ret = sigaction(SIGINT, &mysig_term, NULL);
if (ret) {
wprint("Error to setup signal handler for SIGINT - %s\n", strerror(errno));
@ -2473,6 +2516,13 @@ retry_Csock:
if (ret) {
wprint("Error to setup signal handler for SIGUSR2 - %s\n", strerror(errno));
}
memset(&mysig_hup, 0, sizeof(mysig_hup));
mysig_hup.sa_handler = hupHandler;
ret = sigaction(SIGHUP, &mysig_hup, NULL);
if (ret) {
wprint("Error to setup signal handler for SIGHUP - %s\n", strerror(errno));
}
exitcode = main_loop();
free_ncci_fsm();
free_lPLCI_fsm();

3
capi20/m_capi.h
View File

@ -57,6 +57,9 @@ extern pid_t gettid(void);
#define MICD_CTRL_SHUTDOWN 0x42010000
#define MICD_CTRL_DISABLE_POLL 0x42020000
#define MICD_CTRL_ENABLE_POLL 0x42030000
#define MICD_CTRL_REOPEN_LOG 0x42040000
#define MICD_CTRL_DUMP_1 0x42050000
#define MICD_CTRL_DUMP_2 0x42060000
int send_master_control(int, int, void *);