Merged revisions 69144 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Wed, 13 Jun 2007 19:10:16 +0000 (19:10 +0000)
committerJoshua Colp <jcolp@digium.com>
Wed, 13 Jun 2007 19:10:16 +0000 (19:10 +0000)
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: https://origsvn.digium.com/svn/asterisk/trunk@69147 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_meetme.c

index 9851066..934a8d4 100644 (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) {