From: Christian Richter <christian.richter@beronet.com>
Date: Wed, 4 Jul 2007 14:58:58 +0000 (+0000)
Subject: Merged revisions 73253 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2158
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=515f29f8d68be84334f2549acf11533ee2738859;p=thirdparty%2Fasterisk.git

Merged revisions 73253 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r73253 | crichter | 2007-07-04 16:53:48 +0200 (Mi, 04 Jul 2007) | 9 lines

Merged revisions 73252 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r73252 | crichter | 2007-07-04 16:50:58 +0200 (Mi, 04 Jul 2007) | 1 line

bchannel configurations like echocancel and volume control, need to be setuped on inbound calls too.
........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@73254 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c
index 981b6b2a8d..2f4ee221d0 100644
--- a/channels/misdn/isdn_lib.c
+++ b/channels/misdn/isdn_lib.c
@@ -1533,6 +1533,26 @@ static int handle_event ( struct misdn_bchannel *bc, enum event_e event, iframe_
 
 		case EVENT_CONNECT_ACKNOWLEDGE:
 			setup_bc(bc);
+
+			if ( *bc->crypt_key ) {
+				cb_log(4, stack->port, "ENABLING BLOWFISH channel:%d oad%d:%s dad%d:%s\n", bc->channel, bc->onumplan,bc->oad, bc->dnumplan,bc->dad);
+				manager_ph_control_block(bc,  BF_ENABLE_KEY, bc->crypt_key, strlen(bc->crypt_key) );
+			}
+
+			if (misdn_cap_is_speech(bc->capability)) {
+				if (  !bc->nodsp) manager_ph_control(bc,  DTMF_TONE_START, 0);
+				manager_ec_enable(bc);
+
+				if ( bc->txgain != 0 ) {
+					cb_log(4, stack->port, "--> Changing txgain to %d\n", bc->txgain);
+					manager_ph_control(bc, VOL_CHANGE_TX, bc->txgain);
+				}
+				if ( bc->rxgain != 0 ) {
+					cb_log(4, stack->port, "--> Changing rxgain to %d\n", bc->rxgain);
+					manager_ph_control(bc, VOL_CHANGE_RX, bc->rxgain);
+				}
+			}
+
 			break;
 		case EVENT_CONNECT: