ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-01-30 08:03:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed bug when fork()ing to start DNA helper.

Browse Source 
added some debugging.
This commit is contained in:
gardners 2012-07-16 11:08:51 +09:30
parent c791ba94d0
commit 47dbb8cee5
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dna_helper.c
View File

@ -93,6 +93,8 @@ dna_helper_start(const char *command, const char *arg) {
int stdin_fds[2], stdout_fds[2]; int stdin_fds[2], stdout_fds[2];
pid_t pid; pid_t pid;
DEBUG("Starting DNA helper");
if (pipe(stdin_fds)) if (pipe(stdin_fds))
return WHY_perror("pipe"); return WHY_perror("pipe");
@ -102,7 +104,7 @@ dna_helper_start(const char *command, const char *arg) {
return WHY_perror("pipe"); return WHY_perror("pipe");
} }
if ((pid = fork()) != 0) { if ((pid = fork()) == 0) {
/* Child, should exec() to become helper after installing file descriptors. */ /* Child, should exec() to become helper after installing file descriptors. */
if (dup2(stdin_fds[1], 0)) /* replace stdin */ if (dup2(stdin_fds[1], 0)) /* replace stdin */
exit(-1); exit(-1);
@ -111,6 +113,7 @@ dna_helper_start(const char *command, const char *arg) {
if (dup2(stdout_fds[0], 2)) /* replace stderr */ if (dup2(stdout_fds[0], 2)) /* replace stderr */
exit(-1); exit(-1);
execl(command, command, arg, NULL); execl(command, command, arg, NULL);
DEBUG("execl() failed");
abort(); /* Can't get here */ abort(); /* Can't get here */
} else { } else {
if (pid == -1) { if (pid == -1) {
@ -145,6 +148,7 @@ dna_helper_enqueue(char *did, unsigned char *requestorSid) {
/* Check if we have a helper configured. If not, then set /* Check if we have a helper configured. If not, then set
dna_helper_stdin to magic value of -2 so that we don't waste time dna_helper_stdin to magic value of -2 so that we don't waste time
in future looking up the dna helper configuration value. */ in future looking up the dna helper configuration value. */
DEBUG("We have no DNA helper configured");
dna_helper_stdin = -2; dna_helper_stdin = -2;
return -1; return -1;
} }
@ -154,9 +158,11 @@ dna_helper_enqueue(char *did, unsigned char *requestorSid) {
/* Okay, so we have a helper configured. /* Okay, so we have a helper configured.
Run it */ Run it */
if (dna_helper_start(dna_helper, dna_helper_arg) < 0) if (dna_helper_start(dna_helper, dna_helper_arg) < 0) {
/* Something broke, bail out */ /* Something broke, bail out */
DEBUG("Failed to start dna helper");
return -1; return -1;
}
} }
/* Write request to dna helper. /* Write request to dna helper.
@ -186,6 +192,7 @@ dna_helper_enqueue(char *did, unsigned char *requestorSid) {
close(dna_helper_stdout); close(dna_helper_stdout);
dna_helper_stdin = -1; dna_helper_stdin = -1;
dna_helper_stdout = -1; dna_helper_stdout = -1;
DEBUG("Sigpipe encountered");
return -1; return -1;
} }