[asterisk-commits] file: branch file/bridge_native_rtp_poke r395242 - /team/file/bridge_native_r...

[SVN commits to the Asterisk project]

Author: file
Date: Wed Jul 24 09:03:55 2013
New Revision: 395242

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=395242
Log:
Muckings about.

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

Modified: team/file/bridge_native_rtp_poke/bridges/bridge_native_rtp.c
URL: http://svnview.digium.com/svn/asterisk/team/file/bridge_native_rtp_poke/bridges/bridge_native_rtp.c?view=diff&rev=395242&r1=395241&r2=395242
==============================================================================
--- team/file/bridge_native_rtp_poke/bridges/bridge_native_rtp.c (original)
+++ team/file/bridge_native_rtp_poke/bridges/bridge_native_rtp.c Wed Jul 24 09:03:55 2013
@@ -254,15 +254,7 @@
 		return -1;
 	}
 
-/*
- * BUGBUG The RTP native bridge technology should use tech_pvt not bridge_pvt.
- *
- * This technology needs to be reworked to not change the
- * tech_pvt of channels other than the one that is currently
- * entering/leaving before it can actually use the correct
- * pointer.
- */
-	bridge_channel->bridge_pvt = data;
+	bridge_channel->tech_pvt = data;
 
 	return 0;
 }
@@ -270,7 +262,7 @@
 /*! \brief Helper function which removes frame hook from bridge channel */
 static void native_rtp_bridge_framehook_detach(struct ast_bridge_channel *bridge_channel)
 {
-	RAII_VAR(struct native_rtp_bridge_data *, data, bridge_channel->bridge_pvt, ao2_cleanup);
+	RAII_VAR(struct native_rtp_bridge_data *, data, bridge_channel->tech_pvt, ao2_cleanup);
 
 	if (!data) {
 		return;
@@ -279,7 +271,7 @@
 	ast_channel_lock(bridge_channel->chan);
 	ast_framehook_detach(bridge_channel->chan, data->id);
 	ast_channel_unlock(bridge_channel->chan);
-	bridge_channel->bridge_pvt = NULL;
+	bridge_channel->tech_pvt = NULL;
 }
 
 static int native_rtp_bridge_join(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel)
@@ -298,12 +290,6 @@
 		return -1;
 	}
 
-	native_rtp_bridge_framehook_detach(c1);
-	if (native_rtp_bridge_framehook_attach(c1)) {
-		native_rtp_bridge_framehook_detach(c0);
-		return -1;
-	}
-
 	native_type = native_rtp_bridge_get(c0->chan, c1->chan, &glue0, &glue1, &instance0, &instance1, &vinstance0, &vinstance1);
 
 	if (glue0->get_codec) {
@@ -354,9 +340,6 @@
 	struct ast_rtp_instance *instance0 = NULL, *instance1 = NULL, *vinstance0 = NULL, *vinstance1 = NULL;
 
 	native_rtp_bridge_framehook_detach(c0);
-	if (c1) {
-		native_rtp_bridge_framehook_detach(c1);
-	}
 
 	native_type = native_rtp_bridge_get(c0->chan, c1 ? c1->chan : NULL, &glue0, &glue1, &instance0, &instance1, &vinstance0, &vinstance1);