mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-22 20:56:39 +00:00
Merge in the bridge_construction branch to make the system use the Bridging API.
Breaks many things until they can be reworked. A partial list: chan_agent chan_dahdi, chan_misdn, chan_iax2 native bridging app_queue COLP updates DTMF attended transfers Protocol attended transfers git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -2267,13 +2267,7 @@ static void *do_chanreads(void *pvt)
|
||||
else
|
||||
bridgerec = 0;
|
||||
} else {
|
||||
ast_verb(5, "%s: chanreads: No native bridge.\n", p->dev);
|
||||
if (ast_channel_internal_bridged_channel(p->owner)) {
|
||||
ast_verb(5, "%s: chanreads: Got Asterisk bridge with [%s].\n", p->dev, ast_channel_name(ast_channel_internal_bridged_channel(p->owner)));
|
||||
bridgerec = 1;
|
||||
} else {
|
||||
bridgerec = 0;
|
||||
}
|
||||
bridgerec = ast_channel_is_bridged(p->owner) ? 1 : 0;
|
||||
}
|
||||
|
||||
/* if ((p->owner->_state != AST_STATE_UP) || !bridgerec) */
|
||||
|
Reference in New Issue
Block a user