[asterisk-commits] twilson: branch 1.8 r282468 - in /branches/1.8: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Mon Aug 16 12:53:44 2010
New Revision: 282468

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

................
  r282467 | twilson | 2010-08-16 12:32:01 -0500 (Mon, 16 Aug 2010) | 23 lines
  
  Merged revisions 282430 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r282430 | twilson | 2010-08-16 12:06:37 -0500 (Mon, 16 Aug 2010) | 16 lines
    
    Send a SRCCHANGE indication when we masquerade
    
    Masquerading a channel means that the src of the audio is potentially
    changing, so send a SRCCHANGE so that RTP-based media streams can get
    a new SSRC generated to reflect the change. Original patch by addix
    (along with lots of testing--thanks!).
    
    (closes issue #17007)
    Reported by: addix
    Patches: 
          1001-reset-SSRC-original-channel.diff uploaded by addix (license 1006)
          srcchange.diff uploaded by twilson (license 396)
    Tested by: addix, twilson
    
    Review: https://reviewboard.asterisk.org/r/862/
  ........
................

Modified:
    branches/1.8/   (props changed)
    branches/1.8/main/channel.c

Propchange: branches/1.8/
------------------------------------------------------------------------------
--- branch-1.6.2-merged (original)
+++ branch-1.6.2-merged Mon Aug 16 12:53:44 2010
@@ -1,1 +1,1 @@
-/branches/1.6.2:1-279056,279207,279501,279561,279597,279609,279657,279784,279849,279946,280089,280160,280193,280229,280231,280306,280345,280449,280551,280671,280739,280983,281051,281391,281430,281567,281574,281722,281763,281873,281912,282130,282235
+/branches/1.6.2:1-279056,279207,279501,279561,279597,279609,279657,279784,279849,279946,280089,280160,280193,280229,280231,280306,280345,280449,280551,280671,280739,280983,281051,281391,281430,281567,281574,281722,281763,281873,281912,282130,282235,282467

Modified: branches/1.8/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/channel.c?view=diff&rev=282468&r1=282467&r2=282468
==============================================================================
--- branches/1.8/main/channel.c (original)
+++ branches/1.8/main/channel.c Mon Aug 16 12:53:44 2010
@@ -5863,6 +5863,7 @@
 		struct ast_party_redirecting redirecting;
 	} exchange;
 	struct ast_channel *clonechan, *chans[2];
+	struct ast_channel *bridged;
 	struct ast_cdr *cdr;
 	format_t rformat = original->readformat;
 	format_t wformat = original->writeformat;
@@ -6185,6 +6186,14 @@
 		pthread_kill(original->blocker, SIGURG);
 	ast_debug(1, "Done Masquerading %s (%d)\n", original->name, original->_state);
 
+	if ((bridged = ast_bridged_channel(original))) {
+		ast_channel_lock(bridged);
+		ast_indicate(bridged, AST_CONTROL_SRCCHANGE);
+		ast_channel_unlock(bridged);
+	}
+
+	ast_indicate(original, AST_CONTROL_SRCCHANGE);
+
 done:
 	/* it is possible for the clone channel to disappear during this */
 	if (clonechan) {
@@ -6196,6 +6205,7 @@
 		ast_channel_unlock(original);
 		ao2_link(channels, original);
 	}
+
 	return 0;
 }