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

Use a socketpair rather than a pair of pipes for communication between

Browse Source 
ndhc and ifch, similar to sockd.  A single pipe is also maintained so
that SIGPIPE can bound the lifetime of an orphaned ifch process.
This commit is contained in:
Nicholas J. Kain
2014-04-07 03:44:02 -04:00
parent e2ee728982
commit 5fa2030bab
4 changed files with 22 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ifchd.c
View File

@@ -307,7 +307,7 @@ static void signal_dispatch(void)
static void inform_execute(char c)
{
ssize_t r = safe_write(pToNdhcW, &c, sizeof c);
ssize_t r = safe_write(ifchSock[1], &c, sizeof c);
if (r == 0) {
// Remote end hung up.
exit(EXIT_SUCCESS);
@@ -321,7 +321,7 @@ static void process_client_pipe(void)
char buf[MAX_BUF];
memset(buf, '\0', sizeof buf);
ssize_t r = safe_read(pToIfchR, buf, sizeof buf - 1);
ssize_t r = safe_recv(ifchSock[1], buf, sizeof buf - 1, MSG_DONTWAIT);
if (r == 0) {
// Remote end hung up.
exit(EXIT_SUCCESS);
@@ -354,7 +354,7 @@ static void do_ifch_work(void)
memset(cl.namesvrs, 0, sizeof cl.namesvrs);
memset(cl.domains, 0, sizeof cl.domains);
epoll_add(epollfd, pToIfchR);
epoll_add(epollfd, ifchSock[1]);
epoll_add(epollfd, signalFd);
for (;;) {
@@ -367,7 +367,7 @@ static void do_ifch_work(void)
}
for (int i = 0; i < r; ++i) {
int fd = events[i].data.fd;
if (fd == pToIfchR)
if (fd == ifchSock[1])
process_client_pipe();
else if (fd == signalFd)
signal_dispatch();