X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=chan_lcr.c;h=3904c9ac16016dee16565b36460a8bcf76f02b8b;hp=3e3d7ce00c21a6c9cee6d575997d4949cc01e311;hb=042a9564c2891a20dc45aa92a78117912cd55f00;hpb=2b9a46d5420a97d2be72f226805037a7621c3652 diff --git a/chan_lcr.c b/chan_lcr.c index 3e3d7ce..3904c9a 100644 --- a/chan_lcr.c +++ b/chan_lcr.c @@ -106,6 +106,10 @@ it is called from ast_channel process which has already locked ast_channel. */ +/* Choose if you want to have chan_lcr for Asterisk 1.4.x or CallWeaver 1.2.x */ +#define LCR_FOR_ASTERISK +/* #define LCR_FOR_CALLWEAVER */ + #include #include #include @@ -129,7 +133,9 @@ it is called from ast_channel process which has already locked ast_channel. #define HAVE_INET_ATON 1 #include +#ifdef LCR_FOR_ASTERISK #include +#endif #include #include #include @@ -144,7 +150,13 @@ it is called from ast_channel process which has already locked ast_channel. #include #include #include +#ifdef LCR_FOR_ASTERISK #include +#endif +#ifdef LCR_FOR_CALLWEAVER +#include +#endif + #include #include #include @@ -163,13 +175,27 @@ it is called from ast_channel process which has already locked ast_channel. CHAN_LCR_STATE // state description structure MESSAGES // message text +#ifdef LCR_FOR_CALLWEAVER +AST_MUTEX_DEFINE_STATIC(rand_lock); +#endif + unsigned char flip_bits[256]; +#ifdef LCR_FOR_CALLWEAVER +static struct ast_frame nullframe = { AST_FRAME_NULL, }; +#endif + int lcr_debug=1; int mISDN_created=1; char lcr_type[]="lcr"; +#ifdef LCR_FOR_CALLWEAVER +static ast_mutex_t usecnt_lock; +static int usecnt=0; +static char *desc = "Channel driver for mISDN/LCR Support (Bri/Pri)"; +#endif + pthread_t chan_tid; ast_mutex_t chan_lock; /* global lock */ ast_mutex_t log_lock; /* logging log */ @@ -182,8 +208,6 @@ int wake_global = 0; int wake_pipe[2]; struct lcr_fd wake_fd; -int quit; - int glob_channel = 0; int lcr_sock = -1; @@ -221,7 +245,7 @@ void chan_lcr_log(int type, const char *file, int line, const char *function, st ast_text[sizeof(ast_text)-1] = '\0'; // ast_log(type, file, line, function, "[call=%s ast=%s] %s", call_text, ast_text, buffer); - printf("[call=%s ast=%s] %s", call_text, ast_text, buffer); + printf("[call=%s ast=%s line=%d] %s", call_text, ast_text, line, buffer); ast_mutex_unlock(&log_lock); } @@ -498,13 +522,24 @@ void apply_opt(struct chan_call *call, char *data) if (!call->dsp) call->dsp=ast_dsp_new(); if (call->dsp) { + #ifdef LCR_FOR_CALLWEAVER + ast_dsp_set_features(call->dsp, DSP_FEATURE_DTMF_DETECT| DSP_FEATURE_FAX_CNG_DETECT); + #endif + #ifdef LCR_FOR_ASTERISK #ifdef DSP_FEATURE_DTMF_DETECT ast_dsp_set_features(call->dsp, DSP_FEATURE_DTMF_DETECT| DSP_FEATURE_FAX_DETECT); #else ast_dsp_set_features(call->dsp, DSP_FEATURE_DIGIT_DETECT| DSP_FEATURE_FAX_DETECT); #endif + + #endif if (!call->trans) + #ifdef LCR_FOR_CALLWEAVER + call->trans=ast_translator_build_path(AST_FORMAT_SLINEAR, 8000, (options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW, 8000); + #endif + #ifdef LCR_FOR_ASTERISK call->trans=ast_translator_build_path(AST_FORMAT_SLINEAR, (options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW); + #endif } CDEBUG(call, call->ast, "Option 'f' (faxdetect) with config '%s'.\n", call->faxdetect); break; @@ -576,42 +611,47 @@ static void send_setup_to_lcr(struct chan_call *call) { union parameter newparam; struct ast_channel *ast = call->ast; +// const char *tmp; if (!call->ast || !call->ref) return; - CDEBUG(call, call->ast, "Sending setup to LCR. (interface=%s dialstring=%s, cid=%s)\n", call->interface, ast->exten, ast->caller.id.number.str); +#ifdef AST_1_8_OR_HIGHER + CDEBUG(call, call->ast, "Sending setup to LCR. (interface=%s dialstring=%s, cid=%s)\n", call->interface, call->dialstring, call->callerinfo.id); +#else + CDEBUG(call, call->ast, "Sending setup to LCR. (interface=%s dialstring=%s, cid=%s)\n", call->interface, call->dialstring, call->cid_num); +#endif /* send setup message to LCR */ memset(&newparam, 0, sizeof(union parameter)); - newparam.setup.dialinginfo.itype = INFO_ITYPE_ISDN; - newparam.setup.dialinginfo.ntype = INFO_NTYPE_UNKNOWN; + newparam.setup.dialinginfo.itype = INFO_ITYPE_ISDN; + newparam.setup.dialinginfo.ntype = INFO_NTYPE_UNKNOWN; if (call->keypad) strncpy(newparam.setup.dialinginfo.keypad, call->dialstring, sizeof(newparam.setup.dialinginfo.keypad)-1); else strncpy(newparam.setup.dialinginfo.id, call->dialstring, sizeof(newparam.setup.dialinginfo.id)-1); - strncpy(newparam.setup.dialinginfo.interfaces, call->interface, sizeof(newparam.setup.dialinginfo.interfaces)-1); + if (!!strcmp(call->interface, "pbx")) + 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'; - newparam.setup.callerinfo.id[0] = '\0'; - if (ast->caller.id.number.valid) - if (ast->caller.id.number.str) - if (ast->caller.id.number.str[0]) - strncpy(newparam.setup.callerinfo.id, ast->caller.id.number.str, sizeof(newparam.setup.callerinfo.id)-1); - if (ast->caller.id.name.valid) - if (ast->caller.id.name.str) - if (ast->caller.id.name.str[0]) - strncpy(newparam.setup.callerinfo.name, ast->caller.id.name.str, sizeof(newparam.setup.callerinfo.name)-1); - if (ast->redirecting.from.number.valid) - if (ast->redirecting.from.number.str) - if (ast->redirecting.from.number.str[0]) { - strncpy(newparam.setup.redirinfo.id, ast->redirecting.from.number.str, sizeof(newparam.setup.redirinfo.id)-1); + +#ifdef AST_1_8_OR_HIGHER + /* set stored call information */ + memcpy(&newparam.setup.callerinfo, &call->callerinfo, sizeof(struct caller_info)); + memcpy(&newparam.setup.redirinfo, &call->redirinfo, sizeof(struct redir_info)); +#else + if (call->cid_num[0]) + strncpy(newparam.setup.callerinfo.id, call->cid_num, sizeof(newparam.setup.callerinfo.id)-1); + if (call->cid_name[0]) + strncpy(newparam.setup.callerinfo.name, call->cid_name, sizeof(newparam.setup.callerinfo.name)-1); + if (call->cid_rdnis[0]) { + strncpy(newparam.setup.redirinfo.id, call->cid_rdnis, sizeof(newparam.setup.redirinfo.id)-1); newparam.setup.redirinfo.itype = INFO_ITYPE_CHAN; newparam.setup.redirinfo.ntype = INFO_NTYPE_UNKNOWN; - } - switch(ast->caller.id.number.presentation & AST_PRES_RESTRICTION) { + } + switch(ast->cid.cid_pres & AST_PRES_RESTRICTION) { case AST_PRES_RESTRICTED: newparam.setup.callerinfo.present = INFO_PRESENT_RESTRICTED; break; @@ -622,7 +662,7 @@ static void send_setup_to_lcr(struct chan_call *call) default: newparam.setup.callerinfo.present = INFO_PRESENT_ALLOWED; } - switch(ast->caller.id.number.plan) { + switch(ast->cid.cid_ton) { case 4: newparam.setup.callerinfo.ntype = INFO_NTYPE_SUBSCRIBER; break; @@ -635,6 +675,7 @@ static void send_setup_to_lcr(struct chan_call *call) default: newparam.setup.callerinfo.ntype = INFO_NTYPE_UNKNOWN; } +#endif #warning DISABLED DUE TO DOUBLE LOCKING PROBLEM // tmp = pbx_builtin_getvar_helper(ast, "LCR_TRANSFERCAPABILITY"); // if (tmp && *tmp) @@ -796,6 +837,11 @@ static void lcr_start_pbx(struct chan_call *call, struct ast_channel *ast, int c /* send setup to asterisk */ CDEBUG(call, ast, "Starting call to Asterisk due to matching extension.\n"); + #ifdef LCR_FOR_CALLWEAVER + ast->type = "LCR"; + snprintf(ast->name, sizeof(ast->name), "LCR/%s-%04x",ast->cid.cid_num, ast_random() & 0xffff); + #endif + ret = ast_pbx_start(ast); if (ret < 0) { cause = (ret==-2)?34:27; @@ -816,7 +862,17 @@ static void lcr_in_setup(struct chan_call *call, int message_type, union paramet /* create asterisk channel instrance */ + #ifdef LCR_FOR_CALLWEAVER + ast = ast_channel_alloc(1); + #endif + + #ifdef LCR_FOR_ASTERISK +#ifdef AST_1_8_OR_HIGHER ast = ast_channel_alloc(1, AST_STATE_RESERVED, NULL, NULL, "", NULL, "", "", 0, "%s/%d", lcr_type, ++glob_channel); +#else + ast = ast_channel_alloc(1, AST_STATE_RESERVED, NULL, NULL, "", NULL, "", 0, "%s/%d", lcr_type, ++glob_channel); +#endif + #endif if (!ast) { /* release */ @@ -839,47 +895,173 @@ static void lcr_in_setup(struct chan_call *call, int message_type, union paramet strncpy(ast->context, param->setup.context, AST_MAX_CONTEXT-1); else strncpy(ast->context, param->setup.callerinfo.interface, AST_MAX_CONTEXT-1); + + + +#ifdef AST_1_8_OR_HIGHER if (param->setup.callerinfo.id[0]) { + ast->caller.id.number.valid = 1; ast->caller.id.number.str = strdup(param->setup.callerinfo.id); - } else { - ast->caller.id.number.str = strdup(""); - ast->caller.id.number.presentation = AST_PRES_RESTRICTED; - ast->caller.id.number.plan = 0; + if (!param->setup.callerinfo.id[0]) { + ast->caller.id.number.presentation = AST_PRES_RESTRICTED; + ast->caller.id.number.plan = (0 << 4) | 1; + } + switch (param->setup.callerinfo.present) { + case INFO_PRESENT_ALLOWED: + ast->caller.id.number.presentation = AST_PRES_ALLOWED; + break; + case INFO_PRESENT_RESTRICTED: + ast->caller.id.number.presentation = AST_PRES_RESTRICTED; + break; + default: + ast->caller.id.number.presentation = AST_PRES_UNAVAILABLE; + } + switch (param->setup.callerinfo.screen) { + case INFO_SCREEN_USER: + ast->caller.id.number.presentation |= AST_PRES_USER_NUMBER_UNSCREENED; + break; + case INFO_SCREEN_USER_VERIFIED_PASSED: + ast->caller.id.number.presentation |= AST_PRES_USER_NUMBER_PASSED_SCREEN; + break; + case INFO_SCREEN_USER_VERIFIED_FAILED: + ast->caller.id.number.presentation |= AST_PRES_USER_NUMBER_FAILED_SCREEN; + break; + default: + ast->caller.id.number.presentation |= AST_PRES_NETWORK_NUMBER; + } + switch (param->setup.callerinfo.ntype) { + case INFO_NTYPE_SUBSCRIBER: + ast->caller.id.number.plan = (4 << 4) | 1; + break; + case INFO_NTYPE_NATIONAL: + ast->caller.id.number.plan = (2 << 4) | 1; + break; + case INFO_NTYPE_INTERNATIONAL: + ast->caller.id.number.plan = (1 << 4) | 1; + break; + default: + ast->caller.id.number.plan = (0 << 4) | 1; + } } - ast->caller.id.number.valid = 1; if (param->setup.callerinfo.id2[0]) { - ast->caller.ani.number.str = strdup(param->setup.callerinfo.id); ast->caller.ani.number.valid = 1; + ast->caller.ani.number.str = strdup(param->setup.callerinfo.id2); + switch (param->setup.callerinfo.present2) { + case INFO_PRESENT_ALLOWED: + ast->caller.ani.number.presentation = AST_PRES_ALLOWED; + break; + case INFO_PRESENT_RESTRICTED: + ast->caller.ani.number.presentation = AST_PRES_RESTRICTED; + break; + default: + ast->caller.ani.number.presentation = AST_PRES_UNAVAILABLE; + } + switch (param->setup.callerinfo.screen2) { + case INFO_SCREEN_USER: + ast->caller.ani.number.presentation |= AST_PRES_USER_NUMBER_UNSCREENED; + break; + case INFO_SCREEN_USER_VERIFIED_PASSED: + ast->caller.ani.number.presentation |= AST_PRES_USER_NUMBER_PASSED_SCREEN; + break; + case INFO_SCREEN_USER_VERIFIED_FAILED: + ast->caller.ani.number.presentation |= AST_PRES_USER_NUMBER_FAILED_SCREEN; + break; + default: + ast->caller.ani.number.presentation |= AST_PRES_NETWORK_NUMBER; + } + switch (param->setup.callerinfo.ntype2) { + case INFO_NTYPE_SUBSCRIBER: + ast->caller.ani.number.plan = (4 << 4) | 1; + break; + case INFO_NTYPE_NATIONAL: + ast->caller.ani.number.plan = (2 << 4) | 1; + break; + case INFO_NTYPE_INTERNATIONAL: + ast->caller.ani.number.plan = (1 << 4) | 1; + break; + default: + ast->caller.ani.number.plan = (0 << 4) | 1; + } } if (param->setup.callerinfo.name[0]) { - ast->caller.id.name.str = strdup(param->setup.callerinfo.name); ast->caller.id.name.valid = 1; + ast->caller.id.name.str = strdup(param->setup.callerinfo.name); + } + if (param->setup.redirinfo.id[0]) { + ast->redirecting.from.number.valid = 1; + ast->redirecting.from.number.str = strdup(param->setup.redirinfo.id); + switch (param->setup.redirinfo.present) { + case INFO_PRESENT_ALLOWED: + ast->redirecting.from.number.presentation = AST_PRES_ALLOWED; + break; + case INFO_PRESENT_RESTRICTED: + ast->redirecting.from.number.presentation = AST_PRES_RESTRICTED; + break; + default: + ast->redirecting.from.number.presentation = AST_PRES_UNAVAILABLE; + } + switch (param->setup.redirinfo.screen) { + case INFO_SCREEN_USER: + ast->redirecting.from.number.presentation |= AST_PRES_USER_NUMBER_UNSCREENED; + break; + case INFO_SCREEN_USER_VERIFIED_PASSED: + ast->redirecting.from.number.presentation |= AST_PRES_USER_NUMBER_PASSED_SCREEN; + break; + case INFO_SCREEN_USER_VERIFIED_FAILED: + ast->redirecting.from.number.presentation |= AST_PRES_USER_NUMBER_FAILED_SCREEN; + break; + default: + ast->redirecting.from.number.presentation |= AST_PRES_NETWORK_NUMBER; + } + switch (param->setup.redirinfo.ntype) { + case INFO_NTYPE_SUBSCRIBER: + ast->redirecting.from.number.plan = (4 << 4) | 1; + break; + case INFO_NTYPE_NATIONAL: + ast->redirecting.from.number.plan = (2 << 4) | 1; + break; + case INFO_NTYPE_INTERNATIONAL: + ast->redirecting.from.number.plan = (1 << 4) | 1; + break; + default: + ast->redirecting.from.number.plan = (0 << 4) | 1; + } } +#else + memset(&ast->cid, 0, sizeof(ast->cid)); + if (param->setup.callerinfo.id[0]) + ast->cid.cid_num = strdup(param->setup.callerinfo.id); + if (param->setup.callerinfo.id2[0]) + ast->cid.cid_ani = strdup(param->setup.callerinfo.id2); + if (param->setup.callerinfo.name[0]) + ast->cid.cid_name = strdup(param->setup.callerinfo.name); if (param->setup.redirinfo.id[0]) - ast->redirecting.from.number.str = strdup(numberrize_callerinfo(param->setup.redirinfo.id, param->setup.redirinfo.ntype, options.national, options.international)); + ast->cid.cid_rdnis = strdup(numberrize_callerinfo(param->setup.redirinfo.id, param->setup.redirinfo.ntype, options.national, options.international)); switch (param->setup.callerinfo.present) { case INFO_PRESENT_ALLOWED: - ast->caller.id.number.presentation = AST_PRES_ALLOWED; + ast->cid.cid_pres = AST_PRES_ALLOWED; break; case INFO_PRESENT_RESTRICTED: - ast->caller.id.number.presentation = AST_PRES_RESTRICTED; + ast->cid.cid_pres = AST_PRES_RESTRICTED; break; default: - ast->caller.id.number.presentation = AST_PRES_UNAVAILABLE; + ast->cid.cid_pres = AST_PRES_UNAVAILABLE; } switch (param->setup.callerinfo.ntype) { case INFO_NTYPE_SUBSCRIBER: - ast->caller.id.number.plan = 4; + ast->cid.cid_ton = 4; break; case INFO_NTYPE_NATIONAL: - ast->caller.id.number.plan = 2; + ast->cid.cid_ton = 2; break; case INFO_NTYPE_INTERNATIONAL: - ast->caller.id.number.plan = 1; + ast->cid.cid_ton = 1; break; default: - ast->caller.id.number.plan = 0; + ast->cid.cid_ton = 0; } +#endif + ast->transfercapability = param->setup.capainfo.bearer_capa; /* enable hdlc if transcap is data */ if (param->setup.capainfo.source_mode == B_MODE_HDLC) @@ -1047,8 +1229,8 @@ static void lcr_in_release(struct chan_call *call, int message_type, union param call->state = CHAN_LCR_STATE_RELEASE; /* copy release info */ if (!call->cause) { - call->cause = param->disconnectinfo.cause; - call->location = param->disconnectinfo.location; + call->cause = param->disconnectinfo.cause; + call->location = param->disconnectinfo.location; } /* if we have an asterisk instance, queue hangup, else we are done */ if (ast) { @@ -1270,6 +1452,10 @@ int receive_message(int message_type, unsigned int ref, union parameter *param) CDEBUG(call, call->ast, "Join bchannel, because call is already bridged.\n"); bchannel_join(bchannel, call->bridge_id); } + /* ignore all dsp features, if it is a loopback interface */ + if (param->bchannel.isloopback) + call->nodsp = 1; + /* create only, if call exists, othewhise it bchannel is freed below... */ if (bchannel_create(bchannel, ((call->nodsp || call->faxdetect > 0)?1:0) + ((call->hdlc)?2:0), call->nodsp_queue)) bchannel_activate(bchannel, 1); @@ -1311,7 +1497,7 @@ int receive_message(int message_type, unsigned int ref, union parameter *param) /* handle new ref */ if (message_type == MESSAGE_NEWREF) { - if (param->direction) { + if (param->newref.direction) { /* new ref from lcr */ CDEBUG(NULL, NULL, "Received new ref by LCR, due to incomming call. (ref=%ld)\n", ref); if (!ref || find_call_ref(ref)) { @@ -1334,8 +1520,7 @@ int receive_message(int message_type, unsigned int ref, union parameter *param) call = find_call_ref(0); if (!call) { /* send release, if ref does not exist */ - CDEBUG(NULL, NULL, "No call found, that requests a ref.\n"); - send_release_and_import(call, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL); + CERROR(NULL, NULL, "No call found, that requests a ref.\n"); return 0; } /* store new ref */ @@ -1494,7 +1679,7 @@ static int handle_socket(struct lcr_fd *fd, unsigned int what, void *instance, i /* read from socket */ len = read(lcr_sock, &msg, sizeof(msg)); if (len == 0) { - CERROR(NULL, NULL, "Socket closed.\n"); + CERROR(NULL, NULL, "Socket closed.(read)\n"); error: CERROR(NULL, NULL, "Handling of socket failed - closing for some seconds.\n"); close_socket(); @@ -1527,7 +1712,7 @@ static int handle_socket(struct lcr_fd *fd, unsigned int what, void *instance, i admin = admin_first; len = write(lcr_sock, &admin->msg, sizeof(msg)); if (len == 0) { - CERROR(NULL, NULL, "Socket closed.\n"); + CERROR(NULL, NULL, "Socket closed.(write)\n"); goto error; } if (len > 0) { @@ -1673,12 +1858,28 @@ again: CDEBUG(call, ast, "Sending queued digit '%c' to Asterisk.\n", *p); /* send digit to asterisk */ memset(&fr, 0, sizeof(fr)); + + #ifdef LCR_FOR_ASTERISK fr.frametype = AST_FRAME_DTMF_BEGIN; + #endif + + #ifdef LCR_FOR_CALLWEAVER + fr.frametype = AST_FRAME_DTMF; + #endif + +#ifdef AST_1_8_OR_HIGHER fr.subclass.integer = *p; +#else + fr.subclass = *p; +#endif fr.delivery = ast_tv(0, 0); ast_queue_frame(ast, &fr); + + #ifdef LCR_FOR_ASTERISK fr.frametype = AST_FRAME_DTMF_END; ast_queue_frame(ast, &fr); + #endif + break; default: CDEBUG(call, ast, "Ignoring queued digit 0x%02x.\n", *p); @@ -1732,23 +1933,11 @@ static void *chan_thread(void *arg) ast_mutex_lock(&chan_lock); - while(!quit) { + while(1) { handle_queue(); select_main(0, &global_change, lock_chan, unlock_chan); } - close_socket(); - - del_timer(&socket_retry); - - unregister_fd(&wake_fd); - close(wake_pipe[0]); - close(wake_pipe[1]); - - CERROR(NULL, NULL, "Thread exit.\n"); - - ast_mutex_unlock(&chan_lock); - return NULL; } @@ -1756,7 +1945,11 @@ static void *chan_thread(void *arg) * new asterisk instance */ static +#ifdef AST_1_8_OR_HIGHER struct ast_channel *lcr_request(const char *type, format_t format, const struct ast_channel *requestor, void *data, int *cause) +#else +struct ast_channel *lcr_request(const char *type, int format, void *data, int *cause) +#endif { char exten[256], *dial, *interface, *opt; struct ast_channel *ast; @@ -1781,7 +1974,18 @@ struct ast_channel *lcr_request(const char *type, format_t format, const struct } /* create asterisk channel instrance */ - ast = ast_channel_alloc(1, AST_STATE_RESERVED, NULL, NULL, NULL, NULL, NULL, NULL, 0, "%s/%d", lcr_type, ++glob_channel); + + #ifdef LCR_FOR_ASTERISK +#ifdef AST_1_8_OR_HIGHER + ast = ast_channel_alloc(1, AST_STATE_RESERVED, NULL, NULL, NULL, NULL, NULL, NULL, 0, "%s/%d", lcr_type, ++glob_channel); +#else + ast = ast_channel_alloc(1, AST_STATE_RESERVED, NULL, NULL, "", NULL, "", 0, "%s/%d", lcr_type, ++glob_channel); +#endif + #endif + + #ifdef LCR_FOR_CALLWEAVER + ast = ast_channel_alloc(1); + #endif if (!ast) { CERROR(NULL, NULL, "Failed to create Asterisk channel.\n"); @@ -1790,7 +1994,6 @@ struct ast_channel *lcr_request(const char *type, format_t format, const struct ast_mutex_unlock(&chan_lock); return NULL; } - ast->tech = &lcr_tech; ast->tech_pvt = (void *)1L; // set pointer or asterisk will not call /* configure channel */ @@ -1833,8 +2036,10 @@ struct ast_channel *lcr_request(const char *type, format_t format, const struct strncpy(call->dialstring, dial, sizeof(call->dialstring)-1); apply_opt(call, (char *)opt); +#ifdef AST_1_8_OR_HIGHER // clone_variables(requestor, ast); +#if 0 ast->caller.ani.number.valid= requestor->caller.ani.number.valid; if (requestor->caller.ani.number.valid) if (requestor->caller.ani.number.str) @@ -1910,6 +2115,147 @@ struct ast_channel *lcr_request(const char *type, format_t format, const struct ast->redirecting.to.number.str= strdup(requestor->redirecting.to.number.str); ast->redirecting.to.number.plan= requestor->redirecting.to.number.plan; ast->redirecting.to.number.presentation= requestor->redirecting.to.number.presentation; +#endif + /* store call information for setup */ + + /* caller ID */ + if (requestor->caller.id.number.valid) { + if (requestor->caller.id.number.str) + strncpy(call->callerinfo.id, requestor->caller.id.number.str, sizeof(call->callerinfo.id)-1); + switch(requestor->caller.id.number.presentation & AST_PRES_RESTRICTION) { + case AST_PRES_RESTRICTED: + call->callerinfo.present = INFO_PRESENT_RESTRICTED; + break; + case AST_PRES_UNAVAILABLE: + call->callerinfo.present = INFO_PRESENT_NOTAVAIL; + break; + case AST_PRES_ALLOWED: + default: + call->callerinfo.present = INFO_PRESENT_ALLOWED; + } + switch(requestor->caller.id.number.presentation & AST_PRES_NUMBER_TYPE) { + case AST_PRES_USER_NUMBER_UNSCREENED: + call->callerinfo.screen = INFO_SCREEN_USER; + break; + case AST_PRES_USER_NUMBER_PASSED_SCREEN: + call->callerinfo.screen = INFO_SCREEN_USER_VERIFIED_PASSED; + break; + case AST_PRES_USER_NUMBER_FAILED_SCREEN: + call->callerinfo.screen = INFO_SCREEN_USER_VERIFIED_FAILED; + break; + default: + call->callerinfo.screen = INFO_SCREEN_NETWORK; + } + switch((requestor->caller.id.number.plan >> 4) & 7) { + case 4: + call->callerinfo.ntype = INFO_NTYPE_SUBSCRIBER; + break; + case 2: + call->callerinfo.ntype = INFO_NTYPE_NATIONAL; + break; + case 1: + call->callerinfo.ntype = INFO_NTYPE_INTERNATIONAL; + break; + default: + call->callerinfo.ntype = INFO_NTYPE_UNKNOWN; + } + } else + call->callerinfo.present = INFO_PRESENT_NOTAVAIL; + + /* caller ID 2 */ + if (requestor->caller.ani.number.valid) { + if (requestor->caller.ani.number.str) + strncpy(call->callerinfo.id2, requestor->caller.ani.number.str, sizeof(call->callerinfo.id2)-1); + switch(requestor->caller.ani.number.presentation & AST_PRES_RESTRICTION) { + case AST_PRES_RESTRICTED: + call->callerinfo.present2 = INFO_PRESENT_RESTRICTED; + break; + case AST_PRES_UNAVAILABLE: + call->callerinfo.present2 = INFO_PRESENT_NOTAVAIL; + break; + case AST_PRES_ALLOWED: + default: + call->callerinfo.present2 = INFO_PRESENT_ALLOWED; + } + switch(requestor->caller.ani.number.presentation & AST_PRES_NUMBER_TYPE) { + case AST_PRES_USER_NUMBER_UNSCREENED: + call->callerinfo.screen2 = INFO_SCREEN_USER; + break; + case AST_PRES_USER_NUMBER_PASSED_SCREEN: + call->callerinfo.screen2 = INFO_SCREEN_USER_VERIFIED_PASSED; + break; + case AST_PRES_USER_NUMBER_FAILED_SCREEN: + call->callerinfo.screen2 = INFO_SCREEN_USER_VERIFIED_FAILED; + break; + default: + call->callerinfo.screen2 = INFO_SCREEN_NETWORK; + } + switch((requestor->caller.ani.number.plan >> 4) & 7) { + case 4: + call->callerinfo.ntype2 = INFO_NTYPE_SUBSCRIBER; + break; + case 2: + call->callerinfo.ntype2 = INFO_NTYPE_NATIONAL; + break; + case 1: + call->callerinfo.ntype2 = INFO_NTYPE_INTERNATIONAL; + break; + default: + call->callerinfo.ntype2 = INFO_NTYPE_UNKNOWN; + } + } else + call->callerinfo.present2 = INFO_PRESENT_NOTAVAIL; + + /* caller name */ + if (requestor->caller.id.name.valid) { + if (requestor->caller.id.name.str) + strncpy(call->callerinfo.name, requestor->caller.id.name.str, sizeof(call->callerinfo.name)-1); + } + + /* redir number */ + if (requestor->redirecting.from.number.valid) { + call->redirinfo.itype = INFO_ITYPE_CHAN; + if (requestor->redirecting.from.number.str) + strncpy(call->redirinfo.id, requestor->redirecting.from.number.str, sizeof(call->redirinfo.id)-1); + switch(requestor->redirecting.from.number.presentation & AST_PRES_RESTRICTION) { + case AST_PRES_RESTRICTED: + call->redirinfo.present = INFO_PRESENT_RESTRICTED; + break; + case AST_PRES_UNAVAILABLE: + call->redirinfo.present = INFO_PRESENT_NOTAVAIL; + break; + case AST_PRES_ALLOWED: + default: + call->redirinfo.present = INFO_PRESENT_ALLOWED; + } + switch(requestor->redirecting.from.number.presentation & AST_PRES_NUMBER_TYPE) { + case AST_PRES_USER_NUMBER_UNSCREENED: + call->redirinfo.screen = INFO_SCREEN_USER; + break; + case AST_PRES_USER_NUMBER_PASSED_SCREEN: + call->redirinfo.screen = INFO_SCREEN_USER_VERIFIED_PASSED; + break; + case AST_PRES_USER_NUMBER_FAILED_SCREEN: + call->redirinfo.screen = INFO_SCREEN_USER_VERIFIED_FAILED; + break; + default: + call->redirinfo.screen = INFO_SCREEN_NETWORK; + } + switch((requestor->redirecting.from.number.plan >> 4) & 7) { + case 4: + call->redirinfo.ntype = INFO_NTYPE_SUBSCRIBER; + break; + case 2: + call->redirinfo.ntype = INFO_NTYPE_NATIONAL; + break; + case 1: + call->redirinfo.ntype = INFO_NTYPE_INTERNATIONAL; + break; + default: + call->redirinfo.ntype = INFO_NTYPE_UNKNOWN; + } + } +#endif ast_mutex_unlock(&chan_lock); return ast; @@ -1926,6 +2272,11 @@ static int lcr_call(struct ast_channel *ast, char *dest, int timeout) ast_mutex_lock(&chan_lock); call = ast->tech_pvt; + #ifdef LCR_FOR_CALLWEAVER + ast->type = "LCR"; + snprintf(ast->name, sizeof(ast->name), "LCR/%s-%04x",call->dialstring, ast_random() & 0xffff); + #endif + if (!call) { CERROR(NULL, ast, "Received call from Asterisk, but call instance does not exist.\n"); ast_mutex_unlock(&chan_lock); @@ -1938,7 +2289,9 @@ static int lcr_call(struct ast_channel *ast, char *dest, int timeout) call->pbx_started = 1; /* send MESSAGE_NEWREF */ memset(&newparam, 0, sizeof(union parameter)); - newparam.direction = 0; /* request from app */ + newparam.newref.direction = 0; /* request from app */ + if (!strcmp(call->interface, "pbx")) + newparam.newref.mode = 1; send_message(MESSAGE_NEWREF, 0, &newparam); /* set hdlc if capability requires hdlc */ @@ -1953,6 +2306,22 @@ static int lcr_call(struct ast_channel *ast, char *dest, int timeout) && ast->transfercapability != INFO_BC_VIDEO) ast->transfercapability = INFO_BC_DATAUNRESTRICTED; +#ifndef AST_1_8_OR_HIGHER + call->cid_num[0] = 0; + call->cid_name[0] = 0; + call->cid_rdnis[0] = 0; + + if (ast->cid.cid_num) if (ast->cid.cid_num[0]) + strncpy(call->cid_num, ast->cid.cid_num, + sizeof(call->cid_num)-1); + if (ast->cid.cid_name) if (ast->cid.cid_name[0]) + strncpy(call->cid_name, ast->cid.cid_name, + sizeof(call->cid_name)-1); + if (ast->cid.cid_rdnis) if (ast->cid.cid_rdnis[0]) + strncpy(call->cid_rdnis, ast->cid.cid_rdnis, + sizeof(call->cid_rdnis)-1); +#endif + ast_mutex_unlock(&chan_lock); return 0; } @@ -1989,21 +2358,30 @@ static void send_digit_to_chan(struct ast_channel * ast, char digit ) /* not handled */ CDEBUG(NULL, ast, "Unable to handle DTMF tone " "'%c' for '%s'\n", digit, ast->name); - } + } } +#ifdef LCR_FOR_ASTERISK static int lcr_digit_begin(struct ast_channel *ast, char digit) +#endif +#ifdef LCR_FOR_CALLWEAVER +static int lcr_digit(struct ast_channel *ast, char digit) +#endif { struct chan_call *call; union parameter newparam; char buf[]="x"; +#ifdef LCR_FOR_CALLWEAVER + int inband_dtmf = 0; +#endif + /* only pass IA5 number space */ if (digit > 126 || digit < 32) return 0; ast_mutex_lock(&chan_lock); - call = ast->tech_pvt; + call = ast->tech_pvt; if (!call) { CERROR(NULL, ast, "Received digit from Asterisk, but no call instance exists.\n"); ast_mutex_unlock(&chan_lock); @@ -2033,6 +2411,8 @@ static int lcr_digit_begin(struct ast_channel *ast, char digit) } ast_mutex_unlock(&chan_lock); + +#ifdef LCR_FOR_ASTERISK return 0; } @@ -2040,6 +2420,7 @@ static int lcr_digit_end(struct ast_channel *ast, char digit, unsigned int durat { int inband_dtmf = 0; struct chan_call *call; +#endif ast_mutex_lock(&chan_lock); @@ -2047,8 +2428,8 @@ static int lcr_digit_end(struct ast_channel *ast, char digit, unsigned int durat if (!call) { CERROR(NULL, ast, - "Received digit from Asterisk, " - "but no call instance exists.\n"); + "Received digit from Asterisk, " + "but no call instance exists.\n"); ast_mutex_unlock(&chan_lock); return -1; } @@ -2106,7 +2487,7 @@ static int lcr_answer(struct ast_channel *ast) // memset(&newparam, 0, sizeof(union parameter)); // send_message(MESSAGE_ENABLEKEYPAD, call->ref, &newparam); - ast_mutex_unlock(&chan_lock); + ast_mutex_unlock(&chan_lock); return 0; } @@ -2167,24 +2548,50 @@ static int lcr_hangup(struct ast_channel *ast) return 0; } -static int lcr_write(struct ast_channel *ast, struct ast_frame *f) +static int lcr_write(struct ast_channel *ast, struct ast_frame *fr) { struct chan_call *call; + struct ast_frame * f = fr; +#ifdef AST_1_8_OR_HIGHER if (!f->subclass.integer) +#else + if (!f->subclass) +#endif CDEBUG(NULL, ast, "No subclass\n"); - if (!(f->subclass.integer & ast->nativeformats)) - CDEBUG(NULL, ast, "Unexpected format.\n"); +#ifdef AST_1_8_OR_HIGHER + if (!(f->subclass.integer & ast->nativeformats)) { +#else + if (!(f->subclass & ast->nativeformats)) { +#endif + CDEBUG(NULL, ast, + "Unexpected format. " + "Activating emergency conversion...\n"); +#ifdef AST_1_8_OR_HIGHER + ast_set_write_format(ast, f->subclass.integer); +#else + ast_set_write_format(ast, f->subclass); +#endif + f = (ast->writetrans) ? ast_translate( + ast->writetrans, fr, 0) : fr; + } + ast_mutex_lock(&chan_lock); call = ast->tech_pvt; if (!call) { ast_mutex_unlock(&chan_lock); + if (f != fr) { + ast_frfree(f); + } return -1; } if (call->bchannel && f->samples) bchannel_transmit(call->bchannel, *((unsigned char **)&(f->data)), f->samples); ast_mutex_unlock(&chan_lock); + if (f != fr) { + ast_frfree(f); + } return 0; } @@ -2192,7 +2599,7 @@ static int lcr_write(struct ast_channel *ast, struct ast_frame *f) static struct ast_frame *lcr_read(struct ast_channel *ast) { struct chan_call *call; - int len=0; + int len = 0; ast_mutex_lock(&chan_lock); call = ast->tech_pvt; @@ -2212,7 +2619,15 @@ static struct ast_frame *lcr_read(struct ast_channel *ast) } if (len < 0 && errno == EAGAIN) { ast_mutex_unlock(&chan_lock); + + #ifdef LCR_FOR_ASTERISK return &ast_null_frame; + #endif + + #ifdef LCR_FOR_CALLWEAVER + return &nullframe; + #endif + } if (len <= 0) { close(call->pipe[0]); @@ -2228,7 +2643,11 @@ static struct ast_frame *lcr_read(struct ast_channel *ast) } call->read_fr.frametype = AST_FRAME_VOICE; +#ifdef AST_1_8_OR_HIGHER call->read_fr.subclass.integer = ast->nativeformats; +#else + call->read_fr.subclass = ast->nativeformats; +#endif if (call->rebuffer) { call->read_fr.datalen = call->framepos; call->read_fr.samples = call->framepos; @@ -2331,7 +2750,7 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz case -1: CDEBUG(call, ast, "Received indicate -1.\n"); ast_playtones_stop(ast); - res = -1; + res = -1; break; case AST_CONTROL_VIDUPDATE: @@ -2346,10 +2765,17 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz send_message(MESSAGE_NOTIFY, call->ref, &newparam); /*start music onhold*/ + #ifdef LCR_FOR_ASTERISK ast_moh_start(ast,data,ast->musicclass); + #endif + + #ifdef LCR_FOR_CALLWEAVER + ast_moh_start(ast, NULL); + #endif + call->on_hold = 1; - break; - case AST_CONTROL_UNHOLD: + break; + case AST_CONTROL_UNHOLD: CDEBUG(call, ast, "Received indicate AST_CONTROL_UNHOLD from Asterisk.\n"); /* send message to lcr */ memset(&newparam, 0, sizeof(union parameter)); @@ -2366,12 +2792,12 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz case 20: #endif CDEBUG(call, ast, "Received AST_CONTROL_SRCUPDATE from Asterisk.\n"); - break; + break; default: CERROR(call, ast, "Received indicate from Asterisk with unknown condition %d.\n", cond); - res = -1; + res = -1; break; - } + } if (ts && ts->data[0]) { ast_playtones_start(ast, 0, ts->data, 1); @@ -2379,7 +2805,7 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz /* return */ ast_mutex_unlock(&chan_lock); - return res; + return res; } /* @@ -2595,8 +3021,16 @@ static struct ast_channel_tech lcr_tech = { .description = "Channel driver for connecting to Linux-Call-Router", .capabilities = AST_FORMAT_ALAW, .requester = lcr_request, + + #ifdef LCR_FOR_ASTERISK .send_digit_begin = lcr_digit_begin, .send_digit_end = lcr_digit_end, + #endif + + #ifdef LCR_FOR_CALLWEAVER + .send_digit = lcr_digit, + #endif + .call = lcr_call, .bridge = lcr_bridge, .hangup = lcr_hangup, @@ -2700,13 +3134,29 @@ static struct ast_cli_entry cli_port_unload = #endif +#ifdef LCR_FOR_ASTERISK +#ifdef AST_1_8_OR_HIGHER +static int lcr_config_exec(struct ast_channel *ast, const char *data) +#else static int lcr_config_exec(struct ast_channel *ast, void *data) +#endif +#endif + +#ifdef LCR_FOR_CALLWEAVER +static int lcr_config_exec(struct ast_channel *ast, void *data, char **argv) +#endif { struct chan_call *call; ast_mutex_lock(&chan_lock); + #ifdef LCR_FOR_ASTERISK CDEBUG(NULL, ast, "Received lcr_config (data=%s)\n", (char *)data); + #endif + + #ifdef LCR_FOR_CALLWEAVER + CDEBUG(NULL, ast, "Received lcr_config (data=%s)\n", argv[0]); + #endif /* find channel */ call = call_first; @@ -2716,7 +3166,15 @@ static int lcr_config_exec(struct ast_channel *ast, void *data) call = call->next; } if (call) + + #ifdef LCR_FOR_ASTERISK apply_opt(call, (char *)data); + #endif + + #ifdef LCR_FOR_CALLWEAVER + apply_opt(call, (char *)argv[0]); + #endif + else CERROR(NULL, ast, "lcr_config app not called by chan_lcr channel.\n"); @@ -2739,7 +3197,15 @@ int load_module(void) if (read_options(options_error) == 0) { CERROR(NULL, NULL, "%s", options_error); + + #ifdef LCR_FOR_ASTERISK return AST_MODULE_LOAD_DECLINE; + #endif + + #ifdef LCR_FOR_CALLWEAVER + return 0; + #endif + } ast_mutex_init(&chan_lock); @@ -2748,7 +3214,14 @@ int load_module(void) if (bchannel_initialize()) { CERROR(NULL, NULL, "Unable to open mISDN device\n"); close_socket(); + + #ifdef LCR_FOR_ASTERISK return AST_MODULE_LOAD_DECLINE; + #endif + + #ifdef LCR_FOR_CALLWEAVER + return 0; + #endif } mISDN_created = 1; @@ -2757,11 +3230,26 @@ int load_module(void) CERROR(NULL, NULL, "Unable to register channel class\n"); bchannel_deinitialize(); close_socket(); + + #ifdef LCR_FOR_ASTERISK return AST_MODULE_LOAD_DECLINE; + #endif + + #ifdef LCR_FOR_CALLWEAVER + return 0; + #endif } ast_register_application("lcr_config", lcr_config_exec, "lcr_config", + + #ifdef LCR_FOR_ASTERISK "lcr_config(::...)\n" + #endif + + #ifdef LCR_FOR_CALLWEAVER + "lcr_config(::...)\n", + #endif + "Sets LCR opts. and optargs\n" "\n" "The available options are:\n" @@ -2801,13 +3289,20 @@ int load_module(void) ast_cli_register(&cli_port_unload); #endif - quit = 0; if ((pthread_create(&chan_tid, NULL, chan_thread, NULL)<0)) { /* failed to create thread */ bchannel_deinitialize(); close_socket(); ast_channel_unregister(&lcr_tech); + + #ifdef LCR_FOR_ASTERISK return AST_MODULE_LOAD_DECLINE; + #endif + + #ifdef LCR_FOR_CALLWEAVER + return 0; + #endif + } return 0; } @@ -2815,16 +3310,24 @@ int load_module(void) int unload_module(void) { /* First, take us out of the channel loop */ - CDEBUG(NULL, NULL, "-- Unregistering mISDN Channel Driver --\n"); + CDEBUG(NULL, NULL, "-- Unregistering Linux-Call-Router Channel Driver --\n"); - quit = 1; - pthread_join(chan_tid, NULL); + pthread_cancel(chan_tid); + + close_socket(); + + del_timer(&socket_retry); + + unregister_fd(&wake_fd); + close(wake_pipe[0]); + close(wake_pipe[1]); + +// ast_mutex_unlock(&chan_lock); ast_channel_unregister(&lcr_tech); ast_unregister_application("lcr_config"); - if (mISDN_created) { bchannel_deinitialize(); mISDN_created = 0; @@ -2844,9 +3347,33 @@ int reload_module(void) return 0; } +#ifdef LCR_FOR_ASTERISK #define AST_MODULE "chan_lcr" +#endif + +#ifdef LCR_FOR_CALLWEAVER +int usecount(void) +hae +{ + int res; + ast_mutex_lock(&usecnt_lock); + res = usecnt; + ast_mutex_unlock(&usecnt_lock); + return res; +} +#endif + +#ifdef LCR_FOR_ASTERISK AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Channel driver for Linux-Call-Router Support (ISDN BRI/PRI)", .load = load_module, .unload = unload_module, .reload = reload_module, ); +#endif + +#ifdef LCR_FOR_CALLWEAVER +char *description(void) +{ + return desc; +} +#endif