From 82e0281d1d50ebb4d2ff9e383d2db61df38f72c2 Mon Sep 17 00:00:00 2001 From: Super User Date: Sat, 7 Jun 2008 11:49:28 +0200 Subject: [PATCH] *** CHAN_LCR is complete! *** (not every detail tested yet) modified: bchannel.c modified: bchannel.h modified: chan_lcr.c modified: chan_lcr.h modified: mISDN.cpp --- bchannel.c | 218 +++++++++++++++++++++++++++++++++++------------------- bchannel.h | 12 ++- chan_lcr.c | 246 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------- chan_lcr.h | 13 ++++ mISDN.cpp | 2 +- 5 files changed, 384 insertions(+), 107 deletions(-) diff --git a/bchannel.c b/bchannel.c index 9d7db44..b6cb00d 100644 --- a/bchannel.c +++ b/bchannel.c @@ -63,13 +63,16 @@ void bchannel_deinitialize(void) /* * send control information to the channel (dsp-module) */ -static void ph_control(unsigned long handle, unsigned long c1, unsigned long c2, char *trace_name, int trace_value) +static void ph_control(unsigned long handle, unsigned long c1, unsigned long c2, char *trace_name, int trace_value, int b_mode) { unsigned char buffer[MISDN_HEADER_LEN+sizeof(int)+sizeof(int)]; struct mISDNhead *ctrl = (struct mISDNhead *)buffer; unsigned long *d = (unsigned long *)(buffer+MISDN_HEADER_LEN); int ret; + if (b_mode != 0 && b_mode != 2) + return; + CDEBUG(NULL, NULL, "Sending PH_CONTROL %s %x,%x\n", trace_name, c1, c2); ctrl->prim = PH_CONTROL_REQ; ctrl->id = 0; @@ -80,13 +83,16 @@ static void ph_control(unsigned long handle, unsigned long c1, unsigned long c2, CERROR(NULL, NULL, "Failed to send to socket %d\n", handle); } -static void ph_control_block(unsigned long handle, unsigned long c1, void *c2, int c2_len, char *trace_name, int trace_value) +static void ph_control_block(unsigned long handle, unsigned long c1, void *c2, int c2_len, char *trace_name, int trace_value, int b_mode) { unsigned char buffer[MISDN_HEADER_LEN+sizeof(int)+c2_len]; struct mISDNhead *ctrl = (struct mISDNhead *)buffer; unsigned long *d = (unsigned long *)(buffer+MISDN_HEADER_LEN); int ret; + if (b_mode != 0 && b_mode != 2) + return; + CDEBUG(NULL, NULL, "Sending PH_CONTROL (block) %s %x\n", trace_name, c1); ctrl->prim = PH_CONTROL_REQ; ctrl->id = 0; @@ -101,7 +107,7 @@ static void ph_control_block(unsigned long handle, unsigned long c1, void *c2, i /* * create stack */ -int bchannel_create(struct bchannel *bchannel) +int bchannel_create(struct bchannel *bchannel, int mode) { int ret; unsigned long on = 1; @@ -114,7 +120,22 @@ int bchannel_create(struct bchannel *bchannel) } /* open socket */ - bchannel->b_sock = socket(PF_ISDN, SOCK_DGRAM, ISDN_P_B_L2DSP); + bchannel->b_mode = mode; + switch(bchannel->b_mode) + { + case 0: + bchannel->b_sock = socket(PF_ISDN, SOCK_DGRAM, ISDN_P_B_L2DSP); + break; + case 1: + bchannel->b_sock = socket(PF_ISDN, SOCK_DGRAM, ISDN_P_B_RAW); + break; + case 2: + bchannel->b_sock = socket(PF_ISDN, SOCK_DGRAM, ISDN_P_B_L2DSPHDLC); + break; + case 3: + bchannel->b_sock = socket(PF_ISDN, SOCK_DGRAM, ISDN_P_B_HDLC); + break; + } if (bchannel->b_sock < 0) { CERROR(NULL, NULL, "Failed to open bchannel-socket for handle 0x%x with mISDN-DSP layer. Did you load mISDNdsp.ko?\n", bchannel->handle); @@ -143,13 +164,6 @@ int bchannel_create(struct bchannel *bchannel) bchannel->b_sock = -1; return(0); } - -#if 0 - chan_trace_header(mISDNport, mISDNport->b_port[i], "BCHANNEL create socket", DIRECTION_OUT); - add_trace("channel", NULL, "%d", i+1+(i>=15)); - add_trace("socket", NULL, "%d", mISDNport->b_socket[i]); - end_trace(); -#endif return(1); } @@ -164,19 +178,23 @@ void bchannel_activate(struct bchannel *bchannel, int activate) /* activate bchannel */ CDEBUG(NULL, NULL, "%sActivating B-channel.\n", activate?"":"De-"); - act.prim = (activate)?DL_ESTABLISH_REQ:DL_RELEASE_REQ; + switch(bchannel->b_mode) + { + case 0: + case 2: + act.prim = (activate)?DL_ESTABLISH_REQ:DL_RELEASE_REQ; + break; + case 1: + case 3: + act.prim = (activate)?PH_ACTIVATE_REQ:PH_DEACTIVATE_REQ; + break; + } act.id = 0; ret = sendto(bchannel->b_sock, &act, MISDN_HEADER_LEN, 0, NULL, 0); if (ret < 0) CERROR(NULL, NULL, "Failed to send to socket %d\n", bchannel->b_sock); bchannel->b_state = (activate)?BSTATE_ACTIVATING:BSTATE_DEACTIVATING; -#if 0 - /* trace */ - chan_trace_header(mISDNport, mISDNport->b_port[i], activate?(char*)"BCHANNEL activate":(char*)"BCHANNEL deactivate", DIRECTION_OUT); - add_trace("channel", NULL, "%d", i+1+(i>=15)); - end_trace(); -#endif } @@ -191,33 +209,33 @@ static void bchannel_activated(struct bchannel *bchannel) /* set dsp features */ if (bchannel->b_txdata) - ph_control(handle, (bchannel->b_txdata)?DSP_TXDATA_ON:DSP_TXDATA_OFF, 0, "DSP-TXDATA", bchannel->b_txdata); + ph_control(handle, (bchannel->b_txdata)?DSP_TXDATA_ON:DSP_TXDATA_OFF, 0, "DSP-TXDATA", bchannel->b_txdata, bchannel->b_mode); if (bchannel->b_delay) - ph_control(handle, DSP_DELAY, bchannel->b_delay, "DSP-DELAY", bchannel->b_delay); + ph_control(handle, DSP_DELAY, bchannel->b_delay, "DSP-DELAY", bchannel->b_delay, bchannel->b_mode); if (bchannel->b_tx_dejitter) - ph_control(handle, (bchannel->b_tx_dejitter)?DSP_TX_DEJITTER:DSP_TX_DEJ_OFF, 0, "DSP-TX_DEJITTER", bchannel->b_tx_dejitter); + ph_control(handle, (bchannel->b_tx_dejitter)?DSP_TX_DEJITTER:DSP_TX_DEJ_OFF, 0, "DSP-TX_DEJITTER", bchannel->b_tx_dejitter, bchannel->b_mode); if (bchannel->b_tx_gain) - ph_control(handle, DSP_VOL_CHANGE_TX, bchannel->b_tx_gain, "DSP-TX_GAIN", bchannel->b_tx_gain); + ph_control(handle, DSP_VOL_CHANGE_TX, bchannel->b_tx_gain, "DSP-TX_GAIN", bchannel->b_tx_gain, bchannel->b_mode); if (bchannel->b_rx_gain) - ph_control(handle, DSP_VOL_CHANGE_RX, bchannel->b_rx_gain, "DSP-RX_GAIN", bchannel->b_rx_gain); + ph_control(handle, DSP_VOL_CHANGE_RX, bchannel->b_rx_gain, "DSP-RX_GAIN", bchannel->b_rx_gain, bchannel->b_mode); if (bchannel->b_pipeline[0]) - ph_control_block(handle, DSP_PIPELINE_CFG, bchannel->b_pipeline, strlen(bchannel->b_pipeline)+1, "DSP-PIPELINE", 0); + ph_control_block(handle, DSP_PIPELINE_CFG, bchannel->b_pipeline, strlen(bchannel->b_pipeline)+1, "DSP-PIPELINE", 0, bchannel->b_mode); if (bchannel->b_conf) - ph_control(handle, DSP_CONF_JOIN, bchannel->b_conf, "DSP-CONF", bchannel->b_conf); + ph_control(handle, DSP_CONF_JOIN, bchannel->b_conf, "DSP-CONF", bchannel->b_conf, bchannel->b_mode); if (bchannel->b_echo) - ph_control(handle, DSP_ECHO_ON, 0, "DSP-ECHO", 1); + ph_control(handle, DSP_ECHO_ON, 0, "DSP-ECHO", 1, bchannel->b_mode); if (bchannel->b_tone) - ph_control(handle, DSP_TONE_PATT_ON, bchannel->b_tone, "DSP-TONE", bchannel->b_tone); + ph_control(handle, DSP_TONE_PATT_ON, bchannel->b_tone, "DSP-TONE", bchannel->b_tone, bchannel->b_mode); if (bchannel->b_rxoff) - ph_control(handle, DSP_RECEIVE_OFF, 0, "DSP-RXOFF", 1); + ph_control(handle, DSP_RECEIVE_OFF, 0, "DSP-RXOFF", 1, bchannel->b_mode); // if (bchannel->b_txmix) -// ph_control(handle, DSP_MIX_ON, 0, "DSP-MIX", 1); +// ph_control(handle, DSP_MIX_ON, 0, "DSP-MIX", 1, bchannel->b_mode); if (bchannel->b_dtmf) - ph_control(handle, DTMF_TONE_START, 0, "DSP-DTMF", 1); - if (bchannel->b_crypt_len) - ph_control_block(handle, DSP_BF_ENABLE_KEY, bchannel->b_crypt_key, bchannel->b_crypt_len, "DSP-CRYPT", bchannel->b_crypt_len); + ph_control(handle, DTMF_TONE_START, 0, "DSP-DTMF", 1, bchannel->b_mode); + if (bchannel->b_bf_len) + ph_control_block(handle, DSP_BF_ENABLE_KEY, bchannel->b_bf_key, bchannel->b_bf_len, "DSP-CRYPT", bchannel->b_bf_len, bchannel->b_mode); if (bchannel->b_conf) - ph_control(handle, DSP_CONF_JOIN, bchannel->b_conf, "DSP-CONF", bchannel->b_conf); + ph_control(handle, DSP_CONF_JOIN, bchannel->b_conf, "DSP-CONF", bchannel->b_conf, bchannel->b_mode); bchannel->b_state = BSTATE_ACTIVE; } @@ -225,14 +243,8 @@ static void bchannel_activated(struct bchannel *bchannel) /* * destroy stack */ -static void bchannel_destroy(struct bchannel *bchannel) +void bchannel_destroy(struct bchannel *bchannel) { -#if 0 - chan_trace_header(mISDNport, mISDNport->b_port[i], "BCHANNEL remove socket", DIRECTION_OUT); - add_trace("channel", NULL, "%d", i+1+(i>=15)); - add_trace("socket", NULL, "%d", mISDNport->b_socket[i]); - end_trace(); -#endif if (bchannel->b_sock > -1) { close(bchannel->b_sock); @@ -245,15 +257,15 @@ static void bchannel_destroy(struct bchannel *bchannel) /* * whenever we get audio data from bchannel, we process it here */ -static void bchannel_receive(struct bchannel *bchannel, unsigned long prim, unsigned long dinfo, unsigned char *data, int len) +static void bchannel_receive(struct bchannel *bchannel, unsigned char *buffer, int len) { + struct mISDNhead *hh = (struct mISDNhead *)buffer; + unsigned char *data = buffer + MISDN_HEADER_LEN; unsigned long cont = *((unsigned long *)data); -// unsigned char *data_temp; -// unsigned long length_temp; -// unsigned char *p; -// int l; + struct bchannel *remote_bchannel; + int ret; - if (prim == PH_CONTROL_IND) + if (hh->prim == PH_CONTROL_IND) { if (len < 4) { @@ -262,11 +274,6 @@ static void bchannel_receive(struct bchannel *bchannel, unsigned long prim, unsi } if ((cont&(~DTMF_TONE_MASK)) == DTMF_TONE_VAL) { -#if 0 - chan_trace_header(p_m_mISDNport, this, "BCHANNEL control", DIRECTION_IN); - add_trace("DTMF", NULL, "%c", cont & DTMF_TONE_MASK); - end_trace(); -#endif if (bchannel->call) lcr_in_dtmf(bchannel->call, cont & DTMF_TONE_MASK); return; @@ -274,33 +281,19 @@ static void bchannel_receive(struct bchannel *bchannel, unsigned long prim, unsi switch(cont) { case DSP_BF_REJECT: -#if 0 - chan_trace_header(p_m_mISDNport, this, "BCHANNEL control", DIRECTION_IN); - add_trace("DSP-CRYPT", NULL, "error"); - end_trace(); -#endif + CERROR(NULL, NULL, "Blowfish crypt rejected.\n"); break; case DSP_BF_ACCEPT: -#if 0 - chan_trace_header(p_m_mISDNport, this, "BCHANNEL control", DIRECTION_IN); - add_trace("DSP-CRYPT", NULL, "ok"); - end_trace(); -#endif + CDEBUG(NULL, NULL, "Blowfish crypt enabled.\n"); break; default: -#if 0 - chan_trace_header(p_m_mISDNport, this, "BCHANNEL control", DIRECTION_IN); - add_trace("unknown", NULL, "0x%x", cont); - end_trace(); -#else - ; -#endif + CDEBUG(NULL, NULL, "Unhandled bchannel control 0x%x.\n", cont); } return; } - if (prim == PH_DATA_REQ) + if (hh->prim == PH_DATA_REQ) { if (!bchannel->b_txdata) { @@ -310,11 +303,28 @@ static void bchannel_receive(struct bchannel *bchannel, unsigned long prim, unsi } return; } - if (prim != PH_DATA_IND && prim != DL_DATA_IND) + if (hh->prim != PH_DATA_IND && hh->prim != DL_DATA_IND) { - CERROR(NULL, NULL, "Bchannel received unknown primitve: 0x%lx\n", prim); + CERROR(NULL, NULL, "Bchannel received unknown primitve: 0x%lx\n", hh->prim); return; } + /* if call is bridged and in non-dsp mode */ + if (bchannel->b_conf + && (bchannel->b_mode == 1 || bchannel->b_mode == 3) + && bchannel->call + && bchannel->call->bridge_call + && bchannel->call->bridge_call->bchannel) + { + remote_bchannel = bchannel->call->bridge_call->bchannel; + if (remote_bchannel->b_mode == 1 || remote_bchannel->b_mode == 3) + { + hh->prim = PH_DATA_REQ; + ret = sendto(remote_bchannel->b_sock, buffer, MISDN_HEADER_LEN+len, 0, NULL, 0); + if (ret < 0) + CERROR(NULL, NULL, "Failed to send to socket %d\n", bchannel->b_sock); + return; + } + } /* calls will not process any audio data unless * the call is connected OR interface features audio during call setup. */ @@ -366,7 +376,17 @@ void bchannel_transmit(struct bchannel *bchannel, unsigned char *data, int len) return; for (i = 0; i < len; i++) *p++ = flip_bits[*data++]; - frm->prim = DL_DATA_REQ; + switch(bchannel->b_mode) + { + case 0: + case 2: + frm->prim = DL_DATA_REQ; + break; + case 1: + case 3: + frm->prim = PH_DATA_REQ; + break; + } frm->id = 0; ret = sendto(bchannel->b_sock, buff, MISDN_HEADER_LEN+len, 0, NULL, 0); if (ret < 0) @@ -391,8 +411,8 @@ void bchannel_join(struct bchannel *bchannel, unsigned short id) } if (bchannel->b_state == BSTATE_ACTIVE) { - ph_control(handle, DSP_RECEIVE_OFF, bchannel->b_rxoff, "DSP-RX_OFF", bchannel->b_conf); - ph_control(handle, DSP_CONF_JOIN, bchannel->b_conf, "DSP-CONF", bchannel->b_conf); + ph_control(handle, DSP_RECEIVE_OFF, bchannel->b_rxoff, "DSP-RX_OFF", bchannel->b_conf, bchannel->b_mode); + ph_control(handle, DSP_CONF_JOIN, bchannel->b_conf, "DSP-CONF", bchannel->b_conf, bchannel->b_mode); } } @@ -407,7 +427,53 @@ void bchannel_dtmf(struct bchannel *bchannel, int on) handle = bchannel->b_sock; bchannel->b_dtmf = 1; if (bchannel->b_state == BSTATE_ACTIVE) - ph_control(handle, on?DTMF_TONE_START:DTMF_TONE_STOP, 0, "DSP-DTMF", 1); + ph_control(handle, on?DTMF_TONE_START:DTMF_TONE_STOP, 0, "DSP-DTMF", 1, bchannel->b_mode); +} + + +/* + * blowfish bchannel + */ +void bchannel_blowfish(struct bchannel *bchannel, unsigned char *key, int len) +{ + int handle; + + handle = bchannel->b_sock; + memcpy(bchannel->b_bf_key, key, len); + bchannel->b_bf_len = len; + if (bchannel->b_state == BSTATE_ACTIVE) + ph_control_block(handle, DSP_BF_ENABLE_KEY, bchannel->b_bf_key, bchannel->b_bf_len, "DSP-CRYPT", bchannel->b_bf_len, bchannel->b_mode); +} + + +/* + * pipeline bchannel + */ +void bchannel_pipeline(struct bchannel *bchannel, char *pipeline) +{ + int handle; + + handle = bchannel->b_sock; + strncpy(bchannel->b_pipeline, pipeline, sizeof(bchannel->b_pipeline)-1); + if (bchannel->b_state == BSTATE_ACTIVE) + ph_control_block(handle, DSP_PIPELINE_CFG, bchannel->b_pipeline, strlen(bchannel->b_pipeline)+1, "DSP-PIPELINE", 0, bchannel->b_mode); +} + + +/* + * gain bchannel + */ +void bchannel_gain(struct bchannel *bchannel, int gain, int tx) +{ + int handle; + + handle = bchannel->b_sock; + if (tx) + bchannel->b_tx_gain = gain; + else + bchannel->b_rx_gain = gain; + if (bchannel->b_state == BSTATE_ACTIVE) + ph_control(handle, (tx)?DSP_VOL_CHANGE_TX:DSP_VOL_CHANGE_RX, gain, (tx)?"DSP-TX_GAIN":"DSP-RX_GAIN", gain, bchannel->b_mode); } @@ -443,7 +509,7 @@ int bchannel_handle(void) case PH_DATA_REQ: case DL_DATA_IND: case PH_CONTROL_IND: - bchannel_receive(bchannel, hh->prim, hh->id, buffer+MISDN_HEADER_LEN, ret-MISDN_HEADER_LEN); + bchannel_receive(bchannel, buffer, ret-MISDN_HEADER_LEN); break; case PH_ACTIVATE_IND: diff --git a/bchannel.h b/bchannel.h index bcd5241..faf0602 100644 --- a/bchannel.h +++ b/bchannel.h @@ -15,6 +15,7 @@ struct bchannel { struct chan_call *call; /* link to call process */ unsigned long handle; /* handle for stack id */ int b_sock; /* socket for b-channel */ + int b_mode; /* dsp, raw, dsphdlc */ int b_state; int b_txdata; int b_delay; @@ -27,9 +28,8 @@ struct bchannel { int b_rxoff; // int b_txmix; int b_dtmf; - int b_crypt_len; - int b_crypt_type; - unsigned char b_crypt_key[128]; + int b_bf_len; + unsigned char b_bf_key[128]; }; @@ -38,11 +38,15 @@ extern pid_t bchannel_pid; int bchannel_initialize(void); void bchannel_deinitialize(void); -int bchannel_create(struct bchannel *channel); +void bchannel_destroy(struct bchannel *bchannel); +int bchannel_create(struct bchannel *channel, int mode); void bchannel_activate(struct bchannel *channel, int activate); void bchannel_transmit(struct bchannel *channel, unsigned char *data, int len); void bchannel_join(struct bchannel *channel, unsigned short id); void bchannel_dtmf(struct bchannel *channel, int on); +void bchannel_blowfish(struct bchannel *bchannel, unsigned char *key, int len); +void bchannel_pipeline(struct bchannel *bchannel, char *pipeline); +void bchannel_gain(struct bchannel *bchannel, int gain, int tx); int bchannel_handle(void); struct bchannel *find_bchannel_handle(unsigned long handle); //struct bchannel *find_bchannel_ref(unsigned long ref); diff --git a/chan_lcr.c b/chan_lcr.c index a1ba8ae..5c68e47 100644 --- a/chan_lcr.c +++ b/chan_lcr.c @@ -303,13 +303,6 @@ unsigned short new_bridge_id(void) } /* - * apply options (in locked state) - */ -void apply_opt(struct chan_call *call, char *opt) -{ -} - -/* * enque message to LCR */ int send_message(int message_type, unsigned long ref, union parameter *param) @@ -341,6 +334,169 @@ int send_message(int message_type, unsigned long ref, union parameter *param) } /* + * apply options (in locked state) + */ +void apply_opt(struct chan_call *call, char *data) +{ + union parameter newparam; + char string[1024], *p = string, *opt, *key; + int gain, i, newmode = 0; + + strncpy(string, data, sizeof(string)-1); + string[sizeof(string)-1] = '\0'; + + /* parse options */ + while((opt = strsep(&p, ":"))) + { + switch(opt[0]) { + case 'd': + if (opt[1] == '\0') { + CERROR(call, call->ast, "Option 'd' (display) expects parameter.\n", opt); + break; + } + CDEBUG(call, call->ast, "Option 'd' (display) with text '%s'.\n", opt+1); + if (call->state == CHAN_LCR_STATE_OUT_PREPARE) + strncpy(call->display, opt+1, sizeof(call->display)-1); + else { + memset(&newparam, 0, sizeof(union parameter)); + strncpy(newparam.notifyinfo.display, opt+1, sizeof(newparam.notifyinfo.display)-1); + send_message(MESSAGE_NOTIFY, call->ref, &newparam); + } + break; + case 'n': + if (opt[1] != '\0') { + CERROR(call, call->ast, "Option 'n' (no DTMF) expects no parameter.\n", opt); + break; + } + CDEBUG(call, call->ast, "Option 'n' (no DTMF).\n"); + call->no_dtmf = 1; + break; + case 'c': + if (opt[1] == '\0') { + CERROR(call, call->ast, "Option 'c' (encrypt) expects key parameter.\n", opt); + break; + } + key = opt+1; + /* check for 0xXXXX... type of key */ + if (!!strncmp((char *)key, "0x", 2)) { + CERROR(call, call->ast, "Option 'c' (encrypt) expects key parameter starting with '0x'.\n", opt); + break; + } + key+=2; + if (strlen(key) > 56*2 || (strlen(key) % 1)) { + CERROR(call, call->ast, "Option 'c' (encrypt) expects key parameter with max 56 bytes ('0x' + 112 characters)\n", opt); + break; + } + i = 0; + while(*key) + { + if (*key>='0' && *key<='9') + call->bf_key[i] = (*key-'0') << 8; + else if (*key>='a' && *key<='f') + call->bf_key[i] = (*key-'a'+10) << 8; + else if (*key>='A' && *key<='F') + call->bf_key[i] = (*key-'A'+10) << 8; + else + break; + key++; + if (*key>='0' && *key<='9') + call->bf_key[i] += (*key - '0'); + else if (*key>='a' && *key<='f') + call->bf_key[i] += (*key - 'a' + 10); + else if (*key>='A' && *key<='F') + call->bf_key[i] += (*key - 'A' + 10); + else + break; + key++; + i++; + } + if (*key) { + CERROR(call, call->ast, "Option 'c' (encrypt) expects key parameter with hex values 0-9,a-f.\n"); + break; + } + call->bf_len = i; + CDEBUG(call, call->ast, "Option 'c' (encrypt) blowfish key '%s' (len=%d).\n", opt+1, i); + if (call->bchannel) + bchannel_blowfish(call->bchannel, call->bf_key, call->bf_len); + break; + case 'h': + if (opt[1] != '\0') { + CERROR(call, call->ast, "Option 'h' (HDLC) expects no parameter.\n", opt); + break; + } + CDEBUG(call, call->ast, "Option 'h' (HDLC).\n"); + if (!call->hdlc) { + call->hdlc = 1; + newmode = 1; + } + break; + case 't': + if (opt[1] != '\0') { + CERROR(call, call->ast, "Option 't' (transparent) expects no parameter.\n", opt); + break; + } + CDEBUG(call, call->ast, "Option 't' (transparent).\n"); + if (!call->transparent) { + call->transparent = 1; + newmode = 1; + } + break; + case 'e': + if (opt[1] == '\0') { + CERROR(call, call->ast, "Option 'e' (echo cancel) expects parameter.\n", opt); + break; + } + CDEBUG(call, call->ast, "Option 'e' (echo cancel) with config '%s'.\n", opt+1); + strncpy(call->pipeline, opt+1, sizeof(call->pipeline)-1); + if (call->bchannel) + bchannel_pipeline(call->bchannel, call->pipeline); + break; +#if 0 + case 's': + if (opt[1] != '\0') { + CERROR(call, call->ast, "Option 's' (inband DTMF) expects no parameter.\n", opt); + break; + } + CDEBUG(call, call->ast, "Option 's' (inband DTMF).\n"); + call->inband_dtmf = 1; +todo + break; +#endif + case 'v': + if (opt[1] != 'r' && opt[1] != 't') { + CERROR(call, call->ast, "Option 'v' (volume) expects parameter.\n", opt); + break; + } + gain = atoi(opt+2); + if (gain < -8 || gain >8) { + CERROR(call, call->ast, "Option 'v' (volume) expects parameter in range of -8 through 8.\n"); + break; + } + CDEBUG(call, call->ast, "Option 'v' (volume) with gain 2^%d.\n", gain); + if (opt[1] == 'r') { + call->rx_gain = gain; + if (call->bchannel) + bchannel_gain(call->bchannel, call->rx_gain, 0); + } else { + call->tx_gain = gain; + if (call->bchannel) + bchannel_gain(call->bchannel, call->tx_gain, 1); + } + break; + default: + CERROR(call, call->ast, "Option '%s' unknown.\n", opt); + } + } + + /* re-open, if bchannel is created */ + if (call->bchannel && call->bchannel->b_sock > -1) { + bchannel_destroy(call->bchannel); + if (bchannel_create(call->bchannel, ((call->transparent)?1:0) + ((call->hdlc)?2:0))) + bchannel_activate(call->bchannel, 1); + } +} + +/* * send setup info to LCR * this function is called, when asterisk call is received and ref is received */ @@ -362,6 +518,8 @@ static void send_setup_to_lcr(struct chan_call *call) strncpy(newparam.setup.dialinginfo.interfaces, call->interface, sizeof(newparam.setup.dialinginfo.interfaces)-1); newparam.setup.callerinfo.itype = INFO_ITYPE_CHAN; newparam.setup.callerinfo.ntype = INFO_NTYPE_UNKNOWN; + strncpy(newparam.setup.callerinfo.display, call->display, sizeof(newparam.setup.callerinfo.display)-1); + call->display[0] = '\0'; if (ast->cid.cid_num) if (ast->cid.cid_num[0]) strncpy(newparam.setup.callerinfo.id, ast->cid.cid_num, sizeof(newparam.setup.callerinfo.id)-1); if (ast->cid.cid_name) if (ast->cid.cid_name[0]) @@ -618,6 +776,11 @@ static void lcr_in_setup(struct chan_call *call, int message_type, union paramet ast->cid.cid_ton = 0; } ast->transfercapability = param->setup.capainfo.bearer_capa; + /* enable hdlc if transcap is data */ + if (ast->transfercapability == INFO_BC_DATAUNRESTRICTED + || ast->transfercapability == INFO_BC_DATARESTRICTED + || ast->transfercapability == INFO_BC_VIDEO) + call->hdlc = 1; strncpy(call->oad, numberrize_callerinfo(param->setup.callerinfo.id, param->setup.callerinfo.ntype, options.national, options.international), sizeof(call->oad)-1); /* configure channel */ @@ -828,8 +991,18 @@ static void lcr_in_information(struct chan_call *call, int message_type, union p */ static void lcr_in_notify(struct chan_call *call, int message_type, union parameter *param) { + union parameter newparam; + CDEBUG(call, call->ast, "Incomming notify from LCR. (notify=%d)\n", param->notifyinfo.notify); + /* request bchannel, if call is resumed and we don't have it */ + if (param->notifyinfo.notify == INFO_NOTIFY_USER_RESUMED && !call->bchannel && call->ref) { + CDEBUG(call, call->ast, "Reqesting bchannel at resume.\n"); + memset(&newparam, 0, sizeof(union parameter)); + newparam.bchannel.type = BCHANNEL_REQUEST; + send_message(MESSAGE_BCHANNEL, call->ref, &newparam); + } + if (!call->ast) return; /* use bridge to forware message not supported by asterisk */ @@ -907,11 +1080,10 @@ int receive_message(int message_type, unsigned long ref, union parameter *param) bchannel->b_tx_gain = param->bchannel.tx_gain; bchannel->b_rx_gain = param->bchannel.rx_gain; strncpy(bchannel->b_pipeline, param->bchannel.pipeline, sizeof(bchannel->b_pipeline)-1); - if (param->bchannel.crypt_len) + if (param->bchannel.crypt_len && param->bchannel.crypt_len <= sizeof(bchannel->b_bf_key)) { - bchannel->b_crypt_len = param->bchannel.crypt_len; - bchannel->b_crypt_type = param->bchannel.crypt_type; - memcpy(bchannel->b_crypt_key, param->bchannel.crypt, param->bchannel.crypt_len); + bchannel->b_bf_len = param->bchannel.crypt_len; + memcpy(bchannel->b_bf_key, param->bchannel.crypt, param->bchannel.crypt_len); } bchannel->b_txdata = 0; bchannel->b_dtmf = 1; @@ -927,15 +1099,20 @@ int receive_message(int message_type, unsigned long ref, union parameter *param) call->bchannel = bchannel; if (call->dtmf) bchannel_dtmf(bchannel, 1); -#ifdef TODO -hier muesen alle bchannel-features gesetzt werden (pipeline...) falls sie vor dem b-kanal verfügbar waren -#endif + if (call->bf_len) + bchannel_blowfish(bchannel, call->bf_key, call->bf_len); + if (call->pipeline[0]) + bchannel_pipeline(bchannel, call->pipeline); + if (call->rx_gain) + bchannel_gain(bchannel, call->rx_gain, 0); + if (call->tx_gain) + bchannel_gain(bchannel, call->tx_gain, 1); if (call->bridge_id) { CDEBUG(call, call->ast, "Join bchannel, because call is already bridged.\n"); bchannel_join(bchannel, call->bridge_id); } } - if (bchannel_create(bchannel)) + if (bchannel_create(bchannel, ((call->transparent)?1:0) + ((call->hdlc)?2:0))) bchannel_activate(bchannel, 1); /* acknowledge */ newparam.bchannel.type = BCHANNEL_ASSIGN_ACK; @@ -1433,6 +1610,13 @@ struct ast_channel *lcr_request(const char *type, int format, void *data, int *c strncpy(call->dialstring, dial, sizeof(call->dialstring)-1); apply_opt(call, (char *)opt); + /* if hdlc is forced by option, we change transcap to data */ + if (call->hdlc + && ast->transfercapability != INFO_BC_DATAUNRESTRICTED + && ast->transfercapability != INFO_BC_DATARESTRICTED + && ast->transfercapability != INFO_BC_VIDEO) + ast->transfercapability = INFO_BC_DATAUNRESTRICTED; + ast_mutex_unlock(&chan_lock); return ast; } @@ -1462,6 +1646,12 @@ static int lcr_call(struct ast_channel *ast, char *dest, int timeout) newparam.direction = 0; /* request from app */ send_message(MESSAGE_NEWREF, 0, &newparam); + /* set hdlc if capability requires hdlc */ + if (ast->transfercapability == INFO_BC_DATAUNRESTRICTED + || ast->transfercapability == INFO_BC_DATARESTRICTED + || ast->transfercapability == INFO_BC_VIDEO) + call->hdlc = 1; + ast_mutex_unlock(&chan_lock); return 0; } @@ -1541,7 +1731,11 @@ static int lcr_answer(struct ast_channel *ast) /* enable keypad */ // memset(&newparam, 0, sizeof(union parameter)); // send_message(MESSAGE_ENABLEKEYPAD, call->ref, &newparam); - call->dtmf = 1; + /* enable dtmf */ + if (call->no_dtmf) + CDEBUG(call, ast, "DTMF is disabled by option.\n"); + else + call->dtmf = 1; ast_mutex_unlock(&chan_lock); return 0; @@ -2091,21 +2285,21 @@ int load_module(void) } ast_register_application("lcr_config", lcr_config_exec, "lcr_config", - "lcr_config(:=::...):\n" + "lcr_config(::...)\n" "Sets LCR opts. and optargs\n" "\n" "The available options are:\n" - " d - Send display text on called phone, text is the optparam\n" - " n - Don't detect dtmf tones on called channel\n" - " h - Make digital outgoing call\n" - " c - Make crypted outgoing call, optarg is keyindex\n" - " e - Perform echo cancelation on this channel,\n" - " Takes taps as arguments (32,64,128,256)\n" - " s - Send Non Inband DTMF as inband\n" + " d - Send display text on called phone, text is the optarg.\n" + " n - Don't detect dtmf tones on called channel.\n" + " h - Force data call (HDLC).\n" + " t - Disable all audio features (required for fax application).\n" + " c - Make crypted outgoing call, optarg is keyindex.\n" + " e - Perform echo cancelation on this channel.\n" + " Takes mISDN pipeline option as optarg.\n" +// " s - Send Non Inband DTMF as inband.\n" " vr - rxgain control\n" " vt - txgain control\n" - " Volume changes at factor 2 ^ optarg\n" - " pt - Disable all audio features (required for fax application)\n" + " Volume changes at factor 2 ^ optarg.\n" ); diff --git a/chan_lcr.h b/chan_lcr.h index 29d9e7d..0ca58d5 100644 --- a/chan_lcr.h +++ b/chan_lcr.h @@ -43,8 +43,21 @@ struct chan_call { /* LCR interface name for setup */ char dialstring[64]; /* cached dial string for setup */ + char display[128]; + /* display for setup */ int dtmf; /* shall dtmf be enabled */ + int no_dtmf; + /* dtmf disabled by option */ + char pipeline[256]; + /* echo cancel pipeline by option */ + int tx_gain, rx_gain; + /* gain by option */ + unsigned char bf_key[56]; + int bf_len; /* blowfish crypt key */ + int transparent, hdlc; + /* flags for bchannel mode */ + }; enum { diff --git a/mISDN.cpp b/mISDN.cpp index c909bec..71389b5 100644 --- a/mISDN.cpp +++ b/mISDN.cpp @@ -114,7 +114,7 @@ PmISDN::PmISDN(int type, mISDNport *mISDNport, char *portname, struct port_setti p_m_timeout = 0; p_m_timer = 0; p_m_remote_ref = 0; /* channel shall be exported to given remote */ - p_m_remote_id = 0; /* channel shall be exported to given remote */ + p_m_remote_id = 0; /* remote admin socket */ SCPY(p_m_pipeline, mISDNport->ifport->interface->pipeline); /* audio */ -- 2.13.6