[asterisk-commits] jpeeler: trunk r273355 - in /trunk: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Thu Jul  1 10:12:31 2010
New Revision: 273355

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=273355
Log:
Merged revisions 273354 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r273354 | jpeeler | 2010-07-01 10:05:43 -0500 (Thu, 01 Jul 2010) | 12 lines
  
  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)
........

Modified:
    trunk/   (props changed)
    trunk/apps/app_meetme.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_meetme.c?view=diff&rev=273355&r1=273354&r2=273355
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Thu Jul  1 10:12:31 2010
@@ -3439,6 +3439,18 @@
 					}
 				} 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.integer) {
+					case AST_CONTROL_BUSY:
+					case AST_CONTROL_CONGESTION:
+						ast_frfree(f);
+						goto outrun;
+						break;
+					default:
+						ast_debug(1, 
+							"Got ignored control frame on channel %s, f->frametype=%d,f->subclass=%d\n",
+							chan->name, f->frametype, f->subclass.integer);
+					}
 				} else {
 					ast_debug(1, 
 						"Got unrecognized frame on channel %s, f->frametype=%d,f->subclass=%d\n",