[svn-commits] mjordan: tag 1.8.8.1 r349390 - in /tags/1.8.8.1: ./ main/

[SVN commits to the Digium repositories]

Author: mjordan
Date: Thu Dec 29 10:31:00 2011
New Revision: 349390

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=349390
Log:
Merged 349339; updated .version and ChangeLog

Modified:
    tags/1.8.8.1/   (props changed)
    tags/1.8.8.1/.version
    tags/1.8.8.1/ChangeLog
    tags/1.8.8.1/main/rtp_engine.c

Propchange: tags/1.8.8.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 29 10:31:00 2011
@@ -1,1 +1,1 @@
-/branches/1.8:339719,339779,340878,341088,343621,345063,345828-345829,347058,347531
+/branches/1.8:339719,339779,340878,341088,343621,345063,345828-345829,347058,347531,349339

Modified: tags/1.8.8.1/.version
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.8.1/.version?view=diff&rev=349390&r1=349389&r2=349390
==============================================================================
--- tags/1.8.8.1/.version (original)
+++ tags/1.8.8.1/.version Thu Dec 29 10:31:00 2011
@@ -1,1 +1,1 @@
-1.8.8.0
+1.8.8.1

Modified: tags/1.8.8.1/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.8.1/ChangeLog?view=diff&rev=349390&r1=349389&r2=349390
==============================================================================
--- tags/1.8.8.1/ChangeLog (original)
+++ tags/1.8.8.1/ChangeLog Thu Dec 29 10:31:00 2011
@@ -1,3 +1,22 @@
+2011-12-29  Asterisk Development Team <asteriskteam at digium.com>
+
+	* Asterisk 1.8.8.1 Released.
+
+	* Handle AST_CONTROL_UPDATE_RTP_PEER frames in local bridge loop
+
+	  Failing to handle AST_CONTROL_UPDATE_RTP_PEER frames in the local bridge loop
+ 	  causes the loop to exit prematurely.  This causes a variety of negative side
+	  effects, depending on when the loop exits.  This patch handles the frame by
+	  essentially swallowing the frame in the local loop, as the current channel
+	  drivers expect the RTP bridge to handle the frame, and, in the case of the
+	  local bridge loop, no additional action is necessary.
+
+	  (closes issue ASTERISK-19095)
+	  Reported by: Stefan Schmidt
+	  Tested by: Matt Jordan
+
+	  Review: https://reviewboard.asterisk.org/r/1640/
+
 2011-12-15  Asterisk Development Team <asteriskteam at digium.com>
 
 	* Asterisk 1.8.8.0 Released.

Modified: tags/1.8.8.1/main/rtp_engine.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.8.1/main/rtp_engine.c?view=diff&rev=349390&r1=349389&r2=349390
==============================================================================
--- tags/1.8.8.1/main/rtp_engine.c (original)
+++ tags/1.8.8.1/main/rtp_engine.c Thu Dec 29 10:31:00 2011
@@ -889,7 +889,8 @@
 			    (fr->subclass.integer == AST_CONTROL_UNHOLD) ||
 			    (fr->subclass.integer == AST_CONTROL_VIDUPDATE) ||
 			    (fr->subclass.integer == AST_CONTROL_SRCUPDATE) ||
-			    (fr->subclass.integer == AST_CONTROL_T38_PARAMETERS)) {
+			    (fr->subclass.integer == AST_CONTROL_T38_PARAMETERS) ||
+			    (fr->subclass.integer == AST_CONTROL_UPDATE_RTP_PEER)) {
 				/* If we are going on hold, then break callback mode and P2P bridging */
 				if (fr->subclass.integer == AST_CONTROL_HOLD) {
 					if (instance0->engine->local_bridge) {
@@ -910,7 +911,10 @@
 					instance0->bridged = instance1;
 					instance1->bridged = instance0;
 				}
-				ast_indicate_data(other, fr->subclass.integer, fr->data.ptr, fr->datalen);
+				/* Since UPDATE_BRIDGE_PEER is only used by the bridging code, don't forward it */
+				if (fr->subclass.integer != AST_CONTROL_UPDATE_RTP_PEER) {
+					ast_indicate_data(other, fr->subclass.integer, fr->data.ptr, fr->datalen);
+				}
 				ast_frfree(fr);
 			} else if (fr->subclass.integer == AST_CONTROL_CONNECTED_LINE) {
 				if (ast_channel_connected_line_macro(who, other, fr, other == c0, 1)) {