diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-13 14:01:03 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-13 14:01:03 +0000 |
| commit | 2423e838767a040d39e7e2a034e7c25913881567 (patch) | |
| tree | 7fcf50554c60670b11316cfb4dfa7c7b7ea4cf89 | |
| parent | 00abe55dd3c08fcb8382d61013c845e605421e2c (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@45025 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_misdn.c | 10 | ||||
| -rw-r--r-- | channels/misdn/isdn_lib.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index 2fddfe3d5..6c1de400f 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -2287,7 +2287,6 @@ enum ast_bridge_result misdn_bridge (struct ast_channel *c0, carr[0]=c0; carr[1]=c1; - if (ch1 && ch2 ) ; else return -1; @@ -2309,10 +2308,9 @@ enum ast_bridge_result misdn_bridge (struct ast_channel *c0, ch2->bc->ec_enable=0; manager_ec_disable(ch2->bc); } - /* trying to make a mISDN_dsp conference */ chan_misdn_log(1, ch1->bc->port, "I SEND: Making conference with Number:%d\n", ch1->bc->pid +1); - + misdn_lib_bridge(ch1->bc,ch2->bc); } @@ -2358,7 +2356,11 @@ enum ast_bridge_result misdn_bridge (struct ast_channel *c0, break; } - + if (f->frametype == AST_FRAME_VOICE) { + chan_misdn_log(1,0,"Got Voice frame in Bridged state..\n"); + continue; + } + if (who == c0) { ast_write(c1,f); } diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c index ce25791a4..93be09956 100644 --- a/channels/misdn/isdn_lib.c +++ b/channels/misdn/isdn_lib.c @@ -4231,7 +4231,7 @@ void manager_ec_disable(struct misdn_bchannel *bc) return; } - if ( bc->ec_enable) { + if ( ! bc->ec_enable) { cb_log(1, stack?stack->port:0, "Sending Control ECHOCAN_OFF\n"); manager_ph_control(bc, ECHOCAN_OFF, 0); } |