diff options
| author | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-13 15:42:09 +0000 |
|---|---|---|
| committer | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-13 15:42:09 +0000 |
| commit | 80c6281f0f0666e20edf84d8733b2dfd2e594bf8 (patch) | |
| tree | 33529c10f552cf8a63c01ea80e83814aa37c2b8d /channels | |
| parent | 0292c5caad4328ac362bb9451f7f3f37481cc091 (diff) | |
Merged revisions 45026 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r45026 | crichter | 2006-10-13 16:45:39 +0200 (Fr, 13 Okt 2006) | 9 lines
Merged revisions 45020 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r45020 | crichter | 2006-10-13 15:11:13 +0200 (Fr, 13 Okt 2006) | 1 line
fixed some echocandisable issues when bridged. this caused a kernel panic sometimes..also some minor formatting fixes
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45028 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_misdn.c | 8 | ||||
| -rw-r--r-- | channels/misdn/isdn_lib.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index a9c05babd..60834a777 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -2664,7 +2664,6 @@ static enum ast_bridge_result misdn_bridge (struct ast_channel *c0, carr[0]=c0; carr[1]=c1; - if (ch1 && ch2 ) ; else return -1; @@ -2688,7 +2687,6 @@ static 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); @@ -2738,7 +2736,11 @@ static 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 11bab18c7..8c94c5a2e 100644 --- a/channels/misdn/isdn_lib.c +++ b/channels/misdn/isdn_lib.c @@ -4278,7 +4278,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); } |