Merged revisions 45026 via svnmerge from
authorChristian Richter <christian.richter@beronet.com>
Fri, 13 Oct 2006 15:42:09 +0000 (15:42 +0000)
committerChristian Richter <christian.richter@beronet.com>
Fri, 13 Oct 2006 15:42:09 +0000 (15:42 +0000)
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: https://origsvn.digium.com/svn/asterisk/trunk@45028 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_misdn.c
channels/misdn/isdn_lib.c

index a9c05ba..60834a7 100644 (file)
@@ -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);
                }
index 11bab18..8c94c5a 100644 (file)
@@ -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);
        }