dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 69144 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r69144 | file | 2007-06-13 15:08:24 -0400 (Wed, 13 Jun 2007) | 2 lines

Really ignore NULL frames and check whether the channel hungup or not. (issue #9912 reported by junky)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@69147 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
file 2007-06-13 19:10:16 +00:00
parent 531f38e736
commit 40a5f66841
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/app_meetme.c
View File

@ -2136,12 +2136,16 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
default:
break;
}
} else if (f->frametype == AST_FRAME_NULL) {
/* Ignore NULL frames. It is perfectly normal to get these if the person is muted. */
} else if (option_debug) {
ast_log(LOG_DEBUG,
"Got unrecognized frame on channel %s, f->frametype=%d,f->subclass=%d\n",
chan->name, f->frametype, f->subclass);
}
ast_frfree(f);
if (ast_check_hangup(chan))
break;
} else if (outfd > -1) {
res = read(outfd, buf, CONF_SIZE);
if (res > 0) {