[asterisk-commits] crichter: branch 1.4 r45026 - in /branches/1.4: ./ channels/ channels/misdn/

[asterisk-commits at lists.digium.com]

Author: crichter
Date: Fri Oct 13 09:45:39 2006
New Revision: 45026

URL: http://svn.digium.com/view/asterisk?rev=45026&view=rev
Log:
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
........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/channels/chan_misdn.c
    branches/1.4/channels/misdn/isdn_lib.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_misdn.c?rev=45026&r1=45025&r2=45026&view=diff
==============================================================================
--- branches/1.4/channels/chan_misdn.c (original)
+++ branches/1.4/channels/chan_misdn.c Fri Oct 13 09:45:39 2006
@@ -2658,7 +2658,6 @@
 	carr[0]=c0;
 	carr[1]=c1;
   
-  
 	if (ch1 && ch2 ) ;
 	else
 		return -1;
@@ -2682,7 +2681,6 @@
 			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 @@
 			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);
 		}

Modified: branches/1.4/channels/misdn/isdn_lib.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/misdn/isdn_lib.c?rev=45026&r1=45025&r2=45026&view=diff
==============================================================================
--- branches/1.4/channels/misdn/isdn_lib.c (original)
+++ branches/1.4/channels/misdn/isdn_lib.c Fri Oct 13 09:45:39 2006
@@ -4276,7 +4276,7 @@
 		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);
 	}