kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 45020 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.4@45026 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Christian Richter
2006-10-13 14:45:39 +00:00
parent 887395b103
commit 3a602aa1d7
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
channels/chan_misdn.c
View File

@@ -2658,7 +2658,6 @@ static enum ast_bridge_result misdn_bridge (struct ast_channel *c0,
carr[0]=c0;
carr[1]=c1;
if (ch1 && ch2 ) ;
else
return -1;
@@ -2682,7 +2681,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);
@@ -2732,6 +2730,10 @@ 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);

2
channels/misdn/isdn_lib.c
View File

@@ -4276,7 +4276,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);
}