From: Joshua Colp <jcolp@digium.com>
Date: Wed, 13 Jun 2007 19:08:24 +0000 (+0000)
Subject: Really ignore NULL frames and check whether the channel hungup or not. (issue #9912... 
X-Git-Tag: 1.4.5~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2a582ba2cf930dbecda14a9058d31f5703068b42;p=thirdparty%2Fasterisk.git

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@69144 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 5cf3f40474..555f6d2179 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) {