[asterisk-commits] file: branch file/bridge_native r386133 - /team/file/bridge_native/bridges/

[SVN commits to the Asterisk project]

Author: file
Date: Fri Apr 19 11:37:19 2013
New Revision: 386133

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=386133
Log:
AST_CONTROL_UPDATE_RTP_PEER returns!

Modified:
    team/file/bridge_native/bridges/bridge_native_rtp.c

Modified: team/file/bridge_native/bridges/bridge_native_rtp.c
URL: http://svnview.digium.com/svn/asterisk/team/file/bridge_native/bridges/bridge_native_rtp.c?view=diff&rev=386133&r1=386132&r2=386133
==============================================================================
--- team/file/bridge_native/bridges/bridge_native_rtp.c (original)
+++ team/file/bridge_native/bridges/bridge_native_rtp.c Fri Apr 19 11:37:19 2013
@@ -66,7 +66,7 @@
 	/* It's safe for NULL to be passed to both of these, bridge_channel isn't used at all */
 	if (f->subclass.integer == AST_CONTROL_HOLD) {
 		native_rtp_bridge_leave(ast_channel_internal_bridge(chan), NULL);
-	} else if (f->subclass.integer == AST_CONTROL_UNHOLD) {
+	} else if ((f->subclass.integer == AST_CONTROL_UNHOLD) || (f->subclass.integer == AST_CONTROL_UPDATE_RTP_PEER)) {
 		native_rtp_bridge_join(ast_channel_internal_bridge(chan), NULL);
 	}
 
@@ -273,10 +273,12 @@
 	RAII_VAR(struct ast_format_cap *, cap0, ast_format_cap_alloc_nolock(), ast_format_cap_destroy);
 	RAII_VAR(struct ast_format_cap *, cap1, ast_format_cap_alloc_nolock(), ast_format_cap_destroy);
 
+	native_rtp_bridge_framehook_detach(c0);
 	if (native_rtp_bridge_framehook_attach(c0)) {
 		return -1;
 	}
 
+	native_rtp_bridge_framehook_detach(c1);
 	if (native_rtp_bridge_framehook_attach(c1)) {
 		native_rtp_bridge_framehook_detach(c0);
 		return -1;