aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_misdn.c
diff options
context:
space:
mode:
authorcrichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b>2007-06-05 10:25:32 +0000
committercrichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b>2007-06-05 10:25:32 +0000
commitf326005db1b5cdbf6c1dcd9b4c07f019e249392e (patch)
tree0ba1dd346dc5e23e318c05eb4f8d3dd975c6ac49 /channels/chan_misdn.c
parent48f48566f221e72660be2010ef0bdcb05f4ece2b (diff)
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/branches/1.4@67210 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_misdn.c')
-rw-r--r--channels/chan_misdn.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 257425640..94d107605 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -2815,6 +2815,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) {
@@ -3275,6 +3285,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