kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

bridge_native_dahdi: Return channel join failure if could not make the channels compatible.

Browse Source 
........

Merged revisions 401030 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@401031 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2013-10-15 20:26:13 +00:00
parent 3208058831
commit 66e7dc041d
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
channels/dahdi/bridge_native_dahdi.c
View File

@@ -578,18 +578,17 @@ static int native_bridge_join(struct ast_bridge *bridge, struct ast_bridge_chann
bridge_channel->tech_pvt = tech_pvt; bridge_channel->tech_pvt = tech_pvt;
native_request_start(bridge); native_request_start(bridge);
/*
* Make the channels compatible in case the native bridge did
* not start for some reason and we need to fallback to 1-1
* bridging.
*/
c0 = AST_LIST_FIRST(&bridge->channels)->chan; c0 = AST_LIST_FIRST(&bridge->channels)->chan;
c1 = AST_LIST_LAST(&bridge->channels)->chan; c1 = AST_LIST_LAST(&bridge->channels)->chan;
if (c0 != c1) { if (c0 == c1) {
/* return 0;
* Make the channels compatible in case the native bridge did
* not start for some reason and we need to fallback to 1-1
* bridging.
*/
ast_channel_make_compatible(c0, c1);
} }
return ast_channel_make_compatible(c0, c1);
return 0;
} }
/*! /*!