kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-18 18:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed some echocandisable issues when bridged. this caused a kernel panic sometimes..also some minor formatting fixes

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@45020 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Christian Richter
2006-10-13 13:11:13 +00:00
parent 4981d1c5dd
commit 0bd76b00b2
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
channels/chan_misdn.c
View File

@@ -2287,7 +2287,6 @@ enum ast_bridge_result misdn_bridge (struct ast_channel *c0,
carr[0]=c0; carr[0]=c0;
carr[1]=c1; carr[1]=c1;
if (ch1 && ch2 ) ; if (ch1 && ch2 ) ;
else else
return -1; return -1;
@@ -2309,10 +2308,9 @@ enum ast_bridge_result misdn_bridge (struct ast_channel *c0,
ch2->bc->ec_enable=0; ch2->bc->ec_enable=0;
manager_ec_disable(ch2->bc); manager_ec_disable(ch2->bc);
} }
/* trying to make a mISDN_dsp conference */ /* 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); 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); misdn_lib_bridge(ch1->bc,ch2->bc);
} }
@@ -2358,7 +2356,11 @@ enum ast_bridge_result misdn_bridge (struct ast_channel *c0,
break; break;
} }
if (f->frametype == AST_FRAME_VOICE) {
chan_misdn_log(1,0,"Got Voice frame in Bridged state..\n");
continue;
}
if (who == c0) { if (who == c0) {
ast_write(c1,f); ast_write(c1,f);
} }

2
channels/misdn/isdn_lib.c
View File

@@ -4231,7 +4231,7 @@ void manager_ec_disable(struct misdn_bchannel *bc)
return; return;
} }
if ( bc->ec_enable) { if ( ! bc->ec_enable) {
cb_log(1, stack?stack->port:0, "Sending Control ECHOCAN_OFF\n"); cb_log(1, stack?stack->port:0, "Sending Control ECHOCAN_OFF\n");
manager_ph_control(bc, ECHOCAN_OFF, 0); manager_ph_control(bc, ECHOCAN_OFF, 0);
} }