kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-08 19:08:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 195320 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@195357 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-05-18 19:27:24 +00:00
parent e759722828
commit 8d65e37144
1 changed files with 52 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
main/asterisk.c
View File

@@ -3122,57 +3122,6 @@ int main(int argc, char *argv[])
if (isroot) { if (isroot) {
ast_set_priority(ast_opt_high_priority); 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) { if (isroot && rungroup) {
@@ -3349,6 +3298,58 @@ int main(int argc, char *argv[])
} }
#endif #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_event_init();
ast_makesocket(); ast_makesocket();