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

Cosmetic cleanups to ifchd.c. No functional change.

Browse Source
This commit is contained in:
Nicholas J. Kain 2014-03-17 05:33:00 -04:00
parent 3e78ffd576
commit b0a5132d72
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ndhc/ifchd.c
View File

@ -245,15 +245,6 @@ void perform_wins(const char *str, size_t len)
(void)len; (void)len;
} }
static void ifchd_client_init(void)
{
cl.state = STATE_NOTHING;
memset(cl.ibuf, 0, sizeof cl.ibuf);
memset(cl.namesvrs, 0, sizeof cl.namesvrs);
memset(cl.domains, 0, sizeof cl.domains);
}
static void setup_signals_ifch(void) static void setup_signals_ifch(void)
{ {
sigset_t mask; sigset_t mask;
@ -303,10 +294,9 @@ static void signal_dispatch(void)
} }
} }
static void inform_execute(int success) static void inform_execute(char c)
{ {
int r; int r;
char c = success ? '+' : '-';
retry: retry:
r = safe_write(pToNdhcW, &c, sizeof c); r = safe_write(pToNdhcW, &c, sizeof c);
if (r == 0) { if (r == 0) {
@ -341,10 +331,10 @@ static void process_client_pipe(void)
if (execute_buffer(buf) == -1) { if (execute_buffer(buf) == -1) {
log_line("%s: (%s) execute_buffer was passed invalid commands: '%s'", log_line("%s: (%s) execute_buffer was passed invalid commands: '%s'",
client_config.interface, __func__, buf); client_config.interface, __func__, buf);
inform_execute(0); inform_execute('-');
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} else } else
inform_execute(1); inform_execute('+');
} }
void do_ifch_work(void) void do_ifch_work(void)
@ -356,7 +346,10 @@ void do_ifch_work(void)
if (enforce_seccomp_ifch()) if (enforce_seccomp_ifch())
log_line("ifch seccomp filter cannot be installed"); log_line("ifch seccomp filter cannot be installed");
ifchd_client_init(); cl.state = STATE_NOTHING;
memset(cl.ibuf, 0, sizeof cl.ibuf);
memset(cl.namesvrs, 0, sizeof cl.namesvrs);
memset(cl.domains, 0, sizeof cl.domains);
epoll_add(epollfd, pToIfchR); epoll_add(epollfd, pToIfchR);
epoll_add(epollfd, signalFd); epoll_add(epollfd, signalFd);