automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@73296 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c
index c4be7e55f1839c78a3cdc7bcb2c44723ebef253d..f51736f640e6eee6c4fb66062699ae91a821ba6c 100644 (file)
--- a/channels/misdn/isdn_lib.c
+++ b/channels/misdn/isdn_lib.c
@@ -1524,6 +1524,26 @@ int handle_event ( struct misdn_bchannel *bc, enum event_e event, iframe_t *frm)
 
                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: