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/branches/1.4@45026 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index c4f49c8bfffab1d96b95748d33c0fb2c573c81bb..2dd5ebbe58e5c10a7d296b1d4635c09fa23c6f78 100644 (file)
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -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,7 +2730,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 7b87807b800136e017c488e5b0ad220361d6e122..6776eab9c360e69d41288b2b09a8688cb077f480 100644 (file)
--- a/channels/misdn/isdn_lib.c
+++ b/channels/misdn/isdn_lib.c
@@ -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);
        }