kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set the process group ID on the MOH process so that all children will get killed

Browse Source 
(closes issue #14099)
Reported by: caspy
Patches:
      res_musiconhold.c.patch.killpg.try2 uploaded by caspy (license 645)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@165661 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-12-18 18:52:18 +00:00
parent 3a354c3500
commit 0d24c2ed92
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
res/res_musiconhold.c
View File

@@ -485,6 +485,7 @@ static int spawn_mp3(struct mohclass *class)
ast_log(LOG_WARNING, "chdir() failed: %s\n", strerror(errno));
_exit(1);
}
setpgid(0, getpid());
if (ast_test_flag(class, MOH_CUSTOM)) {
execv(argv[0], argv);
} else {
@@ -566,11 +567,11 @@ static void *monmp3thread(void *data)
class->srcfd = -1;
pthread_testcancel();
if (class->pid > 1) {
kill(class->pid, SIGHUP);
killpg(class->pid, SIGHUP);
usleep(100000);
kill(class->pid, SIGTERM);
killpg(class->pid, SIGTERM);
usleep(100000);
kill(class->pid, SIGKILL);
killpg(class->pid, SIGKILL);
class->pid = 0;
}
} else
@@ -1178,11 +1179,11 @@ static int ast_moh_destroy_one(struct mohclass *moh)
/* Back when this was just mpg123, SIGKILL was fine. Now we need
* to give the process a reason and time enough to kill off its
* children. */
kill(pid, SIGHUP);
killpg(pid, SIGHUP);
usleep(100000);
kill(pid, SIGTERM);
killpg(pid, SIGTERM);
usleep(100000);
kill(pid, SIGKILL);
killpg(pid, SIGKILL);
while ((ast_wait_for_input(moh->srcfd, 100) > 0) && (bytes = read(moh->srcfd, buff, 8192)) && time(NULL) < stime)
tbytes = tbytes + bytes;
ast_log(LOG_DEBUG, "mpg123 pid %d and child died after %d bytes read\n", pid, tbytes);