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

Make the signal handling code use safe_read() and unify ifchd and sockd

Browse Source 
signals code.
This commit is contained in:
Nicholas J. Kain
2014-04-15 20:55:13 -04:00
parent baa394af9a
commit e526adce19
5 changed files with 70 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/ndhc.c
View File

@@ -184,26 +184,21 @@ static void setup_signals_ndhc(void)
static void signal_dispatch(void)
{
int t;
size_t off = 0;
struct signalfd_siginfo si = {0};
again:
t = read(cs.signalFd, (char *)&si + off, sizeof si - off);
if (t < 0) {
if (t == EAGAIN || t == EWOULDBLOCK || t == EINTR)
goto again;
else
suicide("signalfd read error");
ssize_t r = safe_read(cs.signalFd, (char *)&si, sizeof si);
if (r < 0) {
log_error("%s: ndhc: error reading from signalfd: %s",
client_config.interface, strerror(errno));
return;
}
if ((size_t)r < sizeof si) {
log_error("%s: ndhc: short read from signalfd: %zd < %zu",
client_config.interface, r, sizeof si);
return;
}
if (off + (unsigned)t < sizeof si)
off += t;
switch (si.ssi_signo) {
case SIGUSR1:
force_renew_action(&cs);
break;
case SIGUSR2:
force_release_action(&cs);
break;
case SIGUSR1: force_renew_action(&cs); break;
case SIGUSR2: force_release_action(&cs); break;
case SIGCHLD:
suicide("ndhc-master: Subprocess terminated unexpectedly. Exiting.");
break;
@@ -211,8 +206,7 @@ static void signal_dispatch(void)
log_line("Received SIGTERM. Exiting gracefully.");
exit(EXIT_SUCCESS);
break;
default:
break;
default: break;
}
}