diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-18 19:27:24 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-18 19:27:24 +0000 |
commit | 4eb4f638b631e12d3a69cdfe72a9f5bd962c03af (patch) | |
tree | 25bbec3eeadc3b1b7e559a1e06609e095a899d30 /main/asterisk.c | |
parent | f1677870ccc59fb049843dfc7a7ee63ea86c0d53 (diff) |
Merged revisions 195320 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r195320 | tilghman | 2009-05-18 14:17:15 -0500 (Mon, 18 May 2009) | 9 lines
Move the spawn of astcanary down, until after the call to daemon(3).
This avoids possible conflicts with the internal implementation of
daemon(3).
(closes issue #15093)
Reported by: tzafrir
Patches:
20090513__issue15093__2.diff.txt uploaded by tilghman (license 14)
Tested by: tzafrir
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@195357 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/asterisk.c')
-rw-r--r-- | main/asterisk.c | 103 |
1 files changed, 52 insertions, 51 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 6d1537032..a48940075 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -3122,57 +3122,6 @@ int main(int argc, char *argv[]) if (isroot) { ast_set_priority(ast_opt_high_priority); - if (ast_opt_high_priority) { - int cpipe[2]; - - /* PIPE signal ensures that astcanary dies when Asterisk dies */ - if (pipe(cpipe)) { - fprintf(stderr, "Unable to open pipe for canary process: %s\n", strerror(errno)); - exit(1); - } - canary_pipe = cpipe[0]; - - snprintf(canary_filename, sizeof(canary_filename), "%s/alt.asterisk.canary.tweet.tweet.tweet", ast_config_AST_RUN_DIR); - - /* Don't let the canary child kill Asterisk, if it dies immediately */ - signal(SIGPIPE, SIG_IGN); - - canary_pid = fork(); - if (canary_pid == 0) { - char canary_binary[128], *lastslash; - int fd; - - /* Reset signal handler */ - signal(SIGCHLD, SIG_DFL); - signal(SIGPIPE, SIG_DFL); - - dup2(cpipe[1], 100); - close(cpipe[1]); - - for (fd = 0; fd < 100; fd++) { - close(fd); - } - - execlp("astcanary", "astcanary", canary_filename, (char *)NULL); - - /* If not found, try the same path as used to execute asterisk */ - ast_copy_string(canary_binary, argv[0], sizeof(canary_binary)); - if ((lastslash = strrchr(canary_binary, '/'))) { - ast_copy_string(lastslash + 1, "astcanary", sizeof(canary_binary) + canary_binary - (lastslash + 1)); - execl(canary_binary, "astcanary", canary_filename, (char *)NULL); - } - - /* Should never happen */ - _exit(1); - } else if (canary_pid > 0) { - pthread_t dont_care; - close(cpipe[1]); - ast_pthread_create_detached(&dont_care, NULL, canary_thread, NULL); - } - - /* Kill the canary when we exit */ - atexit(canary_exit); - } } if (isroot && rungroup) { @@ -3349,6 +3298,58 @@ int main(int argc, char *argv[]) } #endif + /* Spawning of astcanary must happen AFTER the call to daemon(3) */ + if (isroot && ast_opt_high_priority) { + int cpipe[2]; + + /* PIPE signal ensures that astcanary dies when Asterisk dies */ + if (pipe(cpipe)) { + fprintf(stderr, "Unable to open pipe for canary process: %s\n", strerror(errno)); + exit(1); + } + canary_pipe = cpipe[0]; + + snprintf(canary_filename, sizeof(canary_filename), "%s/alt.asterisk.canary.tweet.tweet.tweet", ast_config_AST_RUN_DIR); + + /* Don't let the canary child kill Asterisk, if it dies immediately */ + signal(SIGPIPE, SIG_IGN); + + canary_pid = fork(); + if (canary_pid == 0) { + char canary_binary[128], *lastslash; + int fd; + + /* Reset signal handler */ + signal(SIGCHLD, SIG_DFL); + signal(SIGPIPE, SIG_DFL); + + dup2(cpipe[1], 0); + close(cpipe[1]); + for (fd = 1; fd < 100; fd++) { + close(fd); + } + + execlp("astcanary", "astcanary", canary_filename, (char *)NULL); + + /* If not found, try the same path as used to execute asterisk */ + ast_copy_string(canary_binary, argv[0], sizeof(canary_binary)); + if ((lastslash = strrchr(canary_binary, '/'))) { + ast_copy_string(lastslash + 1, "astcanary", sizeof(canary_binary) + canary_binary - (lastslash + 1)); + execl(canary_binary, "astcanary", canary_filename, (char *)NULL); + } + + /* Should never happen */ + _exit(1); + } else if (canary_pid > 0) { + pthread_t dont_care; + close(cpipe[1]); + ast_pthread_create_detached(&dont_care, NULL, canary_thread, NULL); + } + + /* Kill the canary when we exit */ + atexit(canary_exit); + } + ast_event_init(); ast_makesocket(); |