From: Jeff Peeler <jpeeler@digium.com>
Date: Thu, 1 Jul 2010 15:05:43 +0000 (+0000)
Subject: Ensure channel placed in meetme in ringing state is properly hung up.
X-Git-Tag: 1.4.35-rc1~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5310e3bc7dfb10de67a339355d4d3e3b1fd9bb1;p=thirdparty%2Fasterisk.git

Ensure channel placed in meetme in ringing state is properly hung up.

An outgoing channel placed in meetme while still ringing which was then hung up
would not exit meetme and the channel was not properly destroyed. Specifically
checking for this scenario by looking at the appropriate control frames resolves
the issue.

(closes issue #15871)
Reported by: Ivan
Patches:
      meetme_congestion_trunk_v2.patch uploaded by Ivan (license 229)


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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 5fed964d84..a13844e9a8 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -2322,6 +2322,20 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
 					}
 				} else if (f->frametype == AST_FRAME_NULL) {
 					/* Ignore NULL frames. It is perfectly normal to get these if the person is muted. */
+				} else if (f->frametype == AST_FRAME_CONTROL) {
+					switch (f->subclass) {
+					case AST_CONTROL_BUSY:
+					case AST_CONTROL_CONGESTION:
+						ast_frfree(f);
+						goto outrun;
+						break;
+					default:
+						if (option_debug) {
+							ast_log(LOG_DEBUG, 
+								"Got ignored control frame on channel %s, f->frametype=%d,f->subclass=%d\n",
+								chan->name, f->frametype, f->subclass);
+						}
+					}
 				} else if (option_debug) {
 					ast_log(LOG_DEBUG,
 						"Got unrecognized frame on channel %s, f->frametype=%d,f->subclass=%d\n",