diff options
| author | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-05 11:48:25 +0000 |
|---|---|---|
| committer | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-05 11:48:25 +0000 |
| commit | f096ddab24de25228e586e6de3e33b9ef70eccc6 (patch) | |
| tree | f2ee9d12a886081ec5d511e4f42b90e9ae6b744d /channels/chan_misdn.c | |
| parent | 29a53bd6a73fac0f959ff3f68917f4e67dda34e9 (diff) | |
Merged revisions 67210 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r67210 | crichter | 2007-06-05 12:25:32 +0200 (Di, 05 Jun 2007) | 9 lines
Merged revisions 67209 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r67209 | crichter | 2007-06-05 12:05:45 +0200 (Di, 05 Jun 2007) | 1 line
added possibility to deactivate bridging per port
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@67240 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_misdn.c')
| -rw-r--r-- | channels/chan_misdn.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index 14c241f70..4d936be66 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -2808,6 +2808,16 @@ static enum ast_bridge_result misdn_bridge (struct ast_channel *c0, else return -1; + int p1_b, p2_b; + + misdn_cfg_get(ch1->bc->port, MISDN_CFG_BRIDGING, &p1_b, sizeof(int)); + misdn_cfg_get(ch2->bc->port, MISDN_CFG_BRIDGING, &p2_b, sizeof(int)); + + if ( ! p1_b || ! p2_b) { + ast_log(LOG_NOTICE, "Falling back to Asterisk bridging\n"); + return AST_BRIDGE_FAILED; + } + int bridging; misdn_cfg_get( 0, MISDN_GEN_BRIDGING, &bridging, sizeof(int)); if (bridging) { @@ -3268,6 +3278,7 @@ static struct ast_channel *misdn_new(struct chan_list *chlist, int state, char int bridging; misdn_cfg_get( 0, MISDN_GEN_BRIDGING, &bridging, sizeof(int)); + if (bridging) tmp->tech = &misdn_tech; else |