kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-22 20:56:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various updates from PCadach's chan_h323-live branch

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43294 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Fredrickson
2006-09-19 21:07:49 +00:00
parent fc60c151d3
commit 33ddb53663
7 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/res_musiconhold.c
View File

@@ -525,7 +525,7 @@ static void *monmp3thread(void *data)
close(class->srcfd);
class->srcfd = -1;
pthread_testcancel();
if (class->pid) {
if (class->pid > 1) {
kill(class->pid, SIGHUP);
usleep(100000);
kill(class->pid, SIGTERM);
@@ -778,6 +778,10 @@ static int moh_scan_files(struct mohclass *class) {
if ((strlen(files_dirent->d_name) < 4))
continue;
/* Skip standard license file - it is not audio */
if (!strcmp(files_dirent->d_name, "LICENSE"))
continue;
snprintf(filepath, sizeof(filepath), "%s/%s", class->dir, files_dirent->d_name);
if (stat(filepath, &statbuf))
@@ -1095,7 +1099,7 @@ static void ast_moh_destroy(void)
AST_LIST_LOCK(&mohclasses);
while ((moh = AST_LIST_REMOVE_HEAD(&mohclasses, list))) {
if (moh->pid) {
if (moh->pid > 1) {
ast_log(LOG_DEBUG, "killing %d!\n", moh->pid);
stime = time(NULL) + 2;
pid = moh->pid;