[asterisk-commits] mmichelson: branch mmichelson/bridged_channel r395721 - /team/mmichelson/brid...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Jul 29 17:58:27 2013
New Revision: 395721

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=395721
Log:
Get rid of ast_bridged_call in chan_iax2.c


Modified:
    team/mmichelson/bridged_channel/channels/chan_iax2.c

Modified: team/mmichelson/bridged_channel/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/bridged_channel/channels/chan_iax2.c?view=diff&rev=395721&r1=395720&r2=395721
==============================================================================
--- team/mmichelson/bridged_channel/channels/chan_iax2.c (original)
+++ team/mmichelson/bridged_channel/channels/chan_iax2.c Mon Jul 29 17:58:27 2013
@@ -4049,7 +4049,7 @@
 	int ret;
 	int needfree = 0;
 	struct ast_channel *owner = NULL;
-	struct ast_channel *bridge = NULL;
+	RAII_VAR(struct ast_channel *, bridge, NULL, ast_channel_cleanup);
 
 	/*
 	 * Clear fr->af.data if there is no data in the buffer.  Things
@@ -4096,8 +4096,9 @@
 		iax2_frame_free(fr);
 		return -1;
 	}
-	if ((owner = iaxs[fr->callno]->owner))
-		bridge = ast_bridged_channel(owner);
+	if ((owner = iaxs[fr->callno]->owner)) {
+		bridge = ast_channel_bridge_peer(owner);
+	}
 
 	/* if the user hasn't requested we force the use of the jitterbuffer, and we're bridged to
 	 * a channel that can accept jitter, then flush and suspend the jb, and send this frame straight through */