emo/ndhc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle SIGPIPE and SIGCHLD.

Browse Source
This commit is contained in:
Nicholas J. Kain 2014-03-12 12:47:39 -04:00
parent be456ddeee
commit fac6794b6c
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ndhc/ifchd.c
View File

@ -285,7 +285,6 @@ static void setup_signals_ifch(void)
{
sigset_t mask;
sigemptyset(&mask);
// XXX: Do we need to change SIGPIPE?
sigaddset(&mask, SIGPIPE);
sigaddset(&mask, SIGUSR1);
sigaddset(&mask, SIGUSR2);
@ -323,7 +322,8 @@ static void signal_dispatch(void)
exit(EXIT_SUCCESS);
break;
case SIGPIPE:
// XXX: Handle SIGPIPE.
log_line("ndhc-ifch: IPC pipe closed. Exiting.");
exit(EXIT_SUCCESS);
break;
default:
break;

9
ndhc/ndhc.c
View File

@ -145,9 +145,18 @@ static void signal_dispatch(void)
case SIGUSR2:
force_release_action(&cs);
break;
case SIGPIPE:
log_line("ndhc-master: IPC pipe closed. Exiting.");
exit(EXIT_SUCCESS);
break;
case SIGCHLD:
log_line("ndhc-master: Subprocess terminated unexpectedly. Exiting.");
exit(EXIT_FAILURE);
break;
case SIGTERM:
log_line("Received SIGTERM. Exiting gracefully.");
exit(EXIT_SUCCESS);
break;
default:
break;
}

2
ndhc/sys.c
View File

@ -47,6 +47,8 @@ void setup_signals_ndhc(struct client_state_t *cs)
sigemptyset(&mask);
sigaddset(&mask, SIGUSR1);
sigaddset(&mask, SIGUSR2);
sigaddset(&mask, SIGCHLD);
sigaddset(&mask, SIGPIPE);
sigaddset(&mask, SIGTERM);
if (sigprocmask(SIG_BLOCK, &mask, NULL) < 0)
suicide("sigprocmask failed");