diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-13 19:08:24 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-13 19:08:24 +0000 |
| commit | ff8f82a0e137247704068e4bc76adf41086573b2 (patch) | |
| tree | c18f9a8b2db7106581dacdc9af2fabe33f83625a /apps/app_meetme.c | |
| parent | 9b47fe09c049ac5f686da439bca4adb2b38e83aa (diff) | |
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/branches/1.4@69144 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 5cf3f4047..555f6d217 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2121,12 +2121,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) { |