Author: mmichelson
Date: Mon Jul 29 18:17:38 2013
New Revision: 395724
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=395724
Log:
Remove ast_bridged_call() from chan_misdn.c
Modified:
team/mmichelson/bridged_channel/channels/chan_misdn.c
Modified: team/mmichelson/bridged_channel/channels/chan_misdn.c
URL:
http://svnview.digium.com/svn/asterisk/team/mmichelson/bridged_channel/channels/chan_misdn.c?view=diff&rev=395724&r1=395723&r2=395724
==============================================================================
--- team/mmichelson/bridged_channel/channels/chan_misdn.c (original)
+++ team/mmichelson/bridged_channel/channels/chan_misdn.c Mon Jul 29 18:17:38
2013
@@ -3442,6 +3442,7 @@
static void export_aoc_vars(int originator, struct ast_channel *ast, struct
misdn_bchannel *bc)
{
+ RAII_VAR(struct ast_channel *, chan, NULL, ast_channel_cleanup);
char buf[128];
if (!bc->AOCD_need_export || !ast) {
@@ -3449,10 +3450,12 @@
}
if (originator == ORG_AST) {
- ast = ast_bridged_channel(ast);
- if (!ast) {
+ chan = ast_channel_bridge_peer(ast);
+ if (!chan) {
return;
}
+ } else {
+ chan = ast_channel_ref(ast);
}
switch (bc->AOCDtype) {
@@ -10943,7 +10946,7 @@
case EVENT_HOLD:
{
int hold_allowed;
- struct ast_channel *bridged;
+ RAII_VAR(struct ast_channel *, bridged, NULL,
ast_channel_cleanup);
misdn_cfg_get(bc->port, MISDN_CFG_HOLD_ALLOWED, &hold_allowed,
sizeof(hold_allowed));
if (!hold_allowed) {
@@ -10952,7 +10955,7 @@
break;
}
- bridged = ast_bridged_channel(ch->ast);
+ bridged = ast_channel_bridge_peer(ch->ast);
if (bridged) {
chan_misdn_log(2, bc->port, "Bridge Partner is of type:
%s\n", ast_channel_tech(bridged)->type);
ch->l3id = bc->l3_id;
--
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --
svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits
