X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=apppbx.cpp;h=e491a5731e5de115611882ea7d0c5803bafa77c2;hp=8729b41d4050d7d385589dd3e65d61e9f97a06b5;hb=d2b113f2c4f11acfaee1b2e0fd2f03744a89f6d4;hpb=fe5641b200b00283e9d9f4552446229dff510deb diff --git a/apppbx.cpp b/apppbx.cpp index 8729b41..e491a57 100644 --- a/apppbx.cpp +++ b/apppbx.cpp @@ -10,14 +10,6 @@ \*****************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include #include "main.h" class EndpointAppPBX *apppbx_first = NULL; @@ -25,7 +17,7 @@ class EndpointAppPBX *apppbx_first = NULL; /* * EndpointAppPBX constructor */ -EndpointAppPBX::EndpointAppPBX(class Endpoint *epoint) : EndpointApp(epoint) +EndpointAppPBX::EndpointAppPBX(class Endpoint *epoint, int origin) : EndpointApp(epoint, origin) { class EndpointAppPBX **apppointer; @@ -38,8 +30,9 @@ EndpointAppPBX::EndpointAppPBX(class Endpoint *epoint) : EndpointApp(epoint) /* initialize */ memset(&e_ext, 0, sizeof(struct extension)); + // *************** NOTE: also change value in read_extension() ************** e_ext.rights = 4; /* international */ - e_ext.rxvol = e_ext.txvol = 256; + e_ext.rx_gain = e_ext.tx_gain = 0; e_state = EPOINT_STATE_IDLE; e_ext.number[0] = '\0'; e_extension_interface[0] = '\0'; @@ -49,7 +42,7 @@ EndpointAppPBX::EndpointAppPBX(class Endpoint *epoint) : EndpointApp(epoint) memset(&e_redirinfo, 0, sizeof(struct redir_info)); memset(&e_capainfo, 0, sizeof(struct capa_info)); e_start = e_stop = 0; -// e_origin = 0; + e_origin = origin; e_ruleset = ruleset_main; if (e_ruleset) e_rule = e_ruleset->rule_first; @@ -80,6 +73,7 @@ EndpointAppPBX::EndpointAppPBX(class Endpoint *epoint) : EndpointApp(epoint) e_dtmf = 0; e_dtmf_time = 0; e_dtmf_last = 0; + e_enablekeypad = 0; e_cfnr_release = 0; e_cfnr_call = 0; e_password_timeout = 0; @@ -145,7 +139,7 @@ void EndpointAppPBX::trace_header(char *name, int direction) /* init trace with given values */ start_trace(0, NULL, - numberrize_callerinfo(e_callerinfo.id, e_callerinfo.ntype), + numberrize_callerinfo(e_callerinfo.id, e_callerinfo.ntype, options.national, options.international), e_dialinginfo.id, direction, CATEGORY_EP, @@ -173,164 +167,12 @@ void EndpointAppPBX::new_state(int state) } -/* screen caller id - * out==0: incomming caller id, out==1: outgoing caller id - */ -void EndpointAppPBX::screen(int out, char *id, int idsize, int *type, int *present, struct interface *interface) -{ - char *msn1; - struct interface_msn *ifmsn; - struct interface_screen *ifscreen; - char suffix[64]; - - /* screen incoming caller id */ - if (!out) - { - /* check for MSN numbers, use first MSN if no match */ - msn1 = NULL; - ifmsn = interface->ifmsn; - while(ifmsn) - { - if (!msn1) - msn1 = ifmsn->msn; - if (!strcmp(ifmsn->msn, id)) - { - break; - } - ifmsn = ifmsn->next; - } - if (ifmsn) - { - trace_header("SCREEN (found in MSN list)", DIRECTION_IN); - add_trace("msn", NULL, "%s", id); - end_trace(); - } - if (!ifmsn && msn1) // not in list, first msn given - { - trace_header("SCREEN (not found MSN in list)", DIRECTION_IN); - add_trace("msn", "given", "%s", id); - add_trace("msn", "used", "%s", msn1); - end_trace(); - UNCPY(id, msn1, idsize); - id[idsize-1] = '\0'; - } - } - - /* check screen list */ - if (out) - ifscreen = interface->ifscreen_out; - else - ifscreen = interface->ifscreen_in; - while (ifscreen) - { - if (ifscreen->match_type==-1 || ifscreen->match_type==*type) - if (ifscreen->match_present==-1 || ifscreen->match_present==*present) - { - if (strchr(ifscreen->match,'%')) - { - if (!strncmp(ifscreen->match, id, strchr(ifscreen->match,'%')-ifscreen->match)) - break; - } else - { - if (!strcmp(ifscreen->match, id)) - break; - } - } - ifscreen = ifscreen->next; - } - if (ifscreen) // match - { - trace_header("SCREEN (found in screen list)", out?DIRECTION_OUT:DIRECTION_IN); - switch(*type) - { - case INFO_NTYPE_UNKNOWN: - add_trace("given", "type", "unknown"); - break; - case INFO_NTYPE_SUBSCRIBER: - add_trace("given", "type", "subscriber"); - break; - case INFO_NTYPE_NATIONAL: - add_trace("given", "type", "national"); - break; - case INFO_NTYPE_INTERNATIONAL: - add_trace("given", "type", "international"); - break; - } - switch(*present) - { - case INFO_PRESENT_ALLOWED: - add_trace("given", "present", "allowed"); - break; - case INFO_PRESENT_RESTRICTED: - add_trace("given", "present", "restricted"); - break; - case INFO_PRESENT_NOTAVAIL: - add_trace("given", "present", "not available"); - break; - } - add_trace("given", "id", "%s", id[0]?id:""); - if (ifscreen->result_type != -1) - { - *type = ifscreen->result_type; - switch(*type) - { - case INFO_NTYPE_UNKNOWN: - add_trace("used", "type", "unknown"); - break; - case INFO_NTYPE_SUBSCRIBER: - add_trace("used", "type", "subscriber"); - break; - case INFO_NTYPE_NATIONAL: - add_trace("used", "type", "national"); - break; - case INFO_NTYPE_INTERNATIONAL: - add_trace("used", "type", "international"); - break; - } - } - if (ifscreen->result_present != -1) - { - *present = ifscreen->result_present; - switch(*present) - { - case INFO_PRESENT_ALLOWED: - add_trace("used", "present", "allowed"); - break; - case INFO_PRESENT_RESTRICTED: - add_trace("used", "present", "restricted"); - break; - case INFO_PRESENT_NOTAVAIL: - add_trace("used", "present", "not available"); - break; - } - } - if (strchr(ifscreen->match,'%')) - { - SCPY(suffix, strchr(ifscreen->match,'%') - ifscreen->match + id); - UNCPY(id, ifscreen->result, idsize); - id[idsize-1] = '\0'; - if (strchr(id,'%')) - { - *strchr(id,'%') = '\0'; - UNCAT(id, suffix, idsize); - id[idsize-1] = '\0'; - } - } else - { - UNCPY(id, ifscreen->result, idsize); - id[idsize-1] = '\0'; - } - add_trace("used", "id", "%s", id[0]?id:""); - end_trace(); - } -} - /* release join and port (as specified) */ void EndpointAppPBX::release(int release, int joinlocation, int joincause, int portlocation, int portcause) { struct port_list *portlist; - struct message *message; + struct lcr_msg *message; char cause[16]; /* message to test call */ @@ -397,6 +239,7 @@ void EndpointAppPBX::release(int release, int joinlocation, int joincause, int p e_dtmf = 0; e_dtmf_time = 0; e_dtmf_last = 0; + e_enablekeypad = 0; e_cfnr_release = 0; e_cfnr_call = 0; e_multipoint_cause = 0; @@ -433,7 +276,7 @@ void EndpointAppPBX::release(int release, int joinlocation, int joincause, int p } else { /* numberrize caller id and use it to dial to the callback */ - SCPY(e_dialinginfo.id, numberrize_callerinfo(e_callerinfo.id,e_callerinfo.ntype)); + SCPY(e_dialinginfo.id, numberrize_callerinfo(e_callerinfo.id,e_callerinfo.ntype, options.national, options.international)); } e_dialinginfo.itype = INFO_ITYPE_ISDN; e_dialinginfo.ntype = INFO_NTYPE_UNKNOWN; @@ -450,7 +293,7 @@ void EndpointAppPBX::release(int release, int joinlocation, int joincause, int p /* cancel callerid if restricted, unless anon-ignore is enabled at extension or port is of type external (so called police gets caller id :)*/ -void apply_callerid_restriction(int anon_ignore, char *id, int *ntype, int *present, int *screen, char *extension, char *name) +void apply_callerid_restriction(struct extension *ext, char *id, int *ntype, int *present, int *screen, char *extension, char *name) { PDEBUG(DEBUG_EPOINT, "id='%s' ntype=%d present=%d screen=%d extension='%s' name='%s'\n", (id)?id:"NULL", (ntype)?*ntype:-1, (present)?*present:-1, (screen)?*screen:-1, (extension)?extension:"NULL", (name)?name:"NULL"); @@ -459,13 +302,11 @@ void apply_callerid_restriction(int anon_ignore, char *id, int *ntype, int *pres return; /* only extensions are restricted */ - if (!extension) - return; - if (!extension[0]) + if (!ext->number[0]) return; /* if we enabled anonymouse ignore */ - if (anon_ignore) + if (ext->anon_ignore) return; /* else we remove the caller id */ @@ -491,7 +332,7 @@ char *EndpointAppPBX::apply_callerid_display(char *id, int itype, int ntype, int static char display[81]; display[0] = '\0'; - char *cid = numberrize_callerinfo(id, ntype); + char *cid = numberrize_callerinfo(id, ntype, options.national, options.international); PDEBUG(DEBUG_EPOINT, "EPOINT(%d) id='%s' itype=%d ntype=%d present=%d screen=%d extension='%s' name='%s'\n", ea_endpoint->ep_serial, (id)?id:"NULL", itype, ntype, present, screen, (extension)?extension:"NULL", (name)?name:"NULL"); @@ -581,7 +422,7 @@ char *EndpointAppPBX::apply_callerid_display(char *id, int itype, int ntype, int void EndpointAppPBX::notify_active(void) { struct port_list *portlist = ea_endpoint->ep_portlist; - struct message *message; + struct lcr_msg *message; int notify = 0; switch(e_tx_state) @@ -689,7 +530,7 @@ void EndpointAppPBX::keypad_function(char digit) /* set tone pattern for port */ void EndpointAppPBX::set_tone(struct port_list *portlist, char *tone) { - struct message *message; + struct lcr_msg *message; if (!tone) tone = ""; @@ -782,7 +623,7 @@ foundif: if (!interface->ifport) { /* no ports */ - trace_header("CHANNEL SELECTION (interface has no active ports, skipping)", DIRECTION_NONE); + trace_header("CHANNEL SELECTION (active ports, skipping)", DIRECTION_NONE); add_trace("interface", NULL, "%s", interface->name); end_trace(); interface = interface->next; @@ -831,9 +672,9 @@ foundif: } /* see if link is up on PTP*/ - if (mISDNport->ptp && !mISDNport->l2link) + if (mISDNport->l2hold && !mISDNport->l2link) { - trace_header("CHANNEL SELECTION (port is ptp with layer 2 down, skipping)", DIRECTION_NONE); + trace_header("CHANNEL SELECTION (port's layer 2 is down, skipping)", DIRECTION_NONE); add_trace("port", NULL, "%d", ifport->portnum); add_trace("position", NULL, "%d", index); end_trace(); @@ -866,6 +707,8 @@ foundif: } i++; } + if (*channel) + break; trace_header("CHANNEL SELECTION (no channel is 'free')", DIRECTION_NONE); add_trace("port", NULL, "%d", ifport->portnum); add_trace("position", NULL, "%d", index); @@ -968,6 +811,11 @@ foundif: if (ifport != ifport_start) goto nextport; + if (!ifname) { + interface = interface->next; + goto checknext; + } + return(NULL); /* no port found */ } @@ -981,7 +829,7 @@ void EndpointAppPBX::out_setup(void) class Port *port; // class pdss1 *pdss1; struct port_list *portlist; - struct message *message; + struct lcr_msg *message; int anycall = 0; int cause = CAUSE_RESSOURCEUNAVAIL; char *p; @@ -1004,13 +852,6 @@ void EndpointAppPBX::out_setup(void) SCPY(port_settings.tones_dir, e_ext.tones_dir); else SCPY(port_settings.tones_dir, options.tones_dir); - port_settings.tout_setup = e_ext.tout_setup; - port_settings.tout_dialing = e_ext.tout_dialing; - port_settings.tout_proceeding = e_ext.tout_proceeding; - port_settings.tout_alerting = e_ext.tout_alerting; - port_settings.tout_disconnect = e_ext.tout_disconnect; -// port_settings.tout_hold = e_ext.tout_hold; -// port_settings.tout_park = e_ext.tout_park; port_settings.no_seconds = e_ext.no_seconds; /* NOTE: currently the try_card feature is not supported. it should be used later to try another card, if the outgoing call fails on one port */ @@ -1159,7 +1000,7 @@ void EndpointAppPBX::out_setup(void) goto check_anycall_intern; } /* directory.list */ - if (e_callerinfo.id[0] && (e_ext.centrex || e_ext.display_name)) + if (e_callerinfo.id[0] && e_ext.display_name) { dirname = parse_directory(e_callerinfo.id, e_callerinfo.ntype); if (dirname) @@ -1177,19 +1018,19 @@ void EndpointAppPBX::out_setup(void) //terminal if (e_dialinginfo.id) //terminal SCPY(message->param.setup.to_terminal, e_dialinginfo.id); /* handle restricted caller ids */ - apply_callerid_restriction(e_ext.anon_ignore, message->param.setup.callerinfo.id, &message->param.setup.callerinfo.ntype, &message->param.setup.callerinfo.present, &message->param.setup.callerinfo.screen, message->param.setup.callerinfo.extension, message->param.setup.callerinfo.name); - apply_callerid_restriction(e_ext.anon_ignore, message->param.setup.redirinfo.id, &message->param.setup.redirinfo.ntype, &message->param.setup.redirinfo.present, 0, message->param.setup.redirinfo.extension, NULL); + apply_callerid_restriction(&e_ext, message->param.setup.callerinfo.id, &message->param.setup.callerinfo.ntype, &message->param.setup.callerinfo.present, &message->param.setup.callerinfo.screen, message->param.setup.callerinfo.extension, message->param.setup.callerinfo.name); + apply_callerid_restriction(&e_ext, message->param.setup.redirinfo.id, &message->param.setup.redirinfo.ntype, &message->param.setup.redirinfo.present, 0, message->param.setup.redirinfo.extension, NULL); /* display callerid if desired for extension */ SCPY(message->param.setup.callerinfo.display, apply_callerid_display(message->param.setup.callerinfo.id, message->param.setup.callerinfo.itype, message->param.setup.callerinfo.ntype, message->param.setup.callerinfo.present, message->param.setup.callerinfo.screen, message->param.setup.callerinfo.extension, message->param.setup.callerinfo.name)); //printf("\n\ndisplay = %s\n\n\n",message->param.setup.callerinfo.display); /* use cnip, if enabld */ - if (!e_ext.centrex) - message->param.setup.callerinfo.name[0] = '\0'; + // if (!e_ext.centrex) + // message->param.setup.callerinfo.name[0] = '\0'; /* screen clip if prefix is required */ if (message->param.setup.callerinfo.id[0] && e_ext.clip_prefix[0]) { SCPY(message->param.setup.callerinfo.id, e_ext.clip_prefix); - SCAT(message->param.setup.callerinfo.id, numberrize_callerinfo(e_callerinfo.id,e_callerinfo.ntype)); + SCAT(message->param.setup.callerinfo.id, numberrize_callerinfo(e_callerinfo.id,e_callerinfo.ntype, options.national, options.international)); message->param.setup.callerinfo.ntype = INFO_NTYPE_UNKNOWN; } /* use internal caller id */ @@ -1296,8 +1137,8 @@ void EndpointAppPBX::out_setup(void) //terminal if (e_dialinginfo.id) //terminal SCPY(message->param.setup.to_terminal, e_dialinginfo.id); /* handle restricted caller ids */ - apply_callerid_restriction(e_ext.anon_ignore, message->param.setup.callerinfo.id, &message->param.setup.callerinfo.ntype, &message->param.setup.callerinfo.present, &message->param.setup.callerinfo.screen, message->param.setup.callerinfo.extension, message->param.setup.callerinfo.name); - apply_callerid_restriction(e_ext.anon_ignore, message->param.setup.redirinfo.id, &message->param.setup.redirinfo.ntype, &message->param.setup.redirinfo.present, 0, message->param.setup.redirinfo.extension, NULL); + apply_callerid_restriction(&e_ext, message->param.setup.callerinfo.id, &message->param.setup.callerinfo.ntype, &message->param.setup.callerinfo.present, &message->param.setup.callerinfo.screen, message->param.setup.callerinfo.extension, message->param.setup.callerinfo.name); + apply_callerid_restriction(&e_ext, message->param.setup.redirinfo.id, &message->param.setup.redirinfo.ntype, &message->param.setup.redirinfo.present, 0, message->param.setup.redirinfo.extension, NULL); /* display callerid if desired for extension */ SCPY(message->param.setup.callerinfo.display, apply_callerid_display(message->param.setup.callerinfo.id, message->param.setup.callerinfo.itype, message->param.setup.callerinfo.ntype, message->param.setup.callerinfo.present, message->param.setup.callerinfo.screen, message->param.setup.callerinfo.extension, message->param.setup.callerinfo.name)); message_put(message); @@ -1371,8 +1212,8 @@ void EndpointAppPBX::out_setup(void) //terminal if (e_dialinginfo.id) //terminal SCPY(message->param.setup.to_terminal, e_dialinginfo.id); /* handle restricted caller ids */ - apply_callerid_restriction(e_ext.anon_ignore, message->param.setup.callerinfo.id, &message->param.setup.callerinfo.ntype, &message->param.setup.callerinfo.present, &message->param.setup.callerinfo.screen, message->param.setup.callerinfo.extension, message->param.setup.callerinfo.name); - apply_callerid_restriction(e_ext.anon_ignore, message->param.setup.redirinfo.id, &message->param.setup.redirinfo.ntype, &message->param.setup.redirinfo.present, 0, message->param.setup.redirinfo.extension, NULL); + apply_callerid_restriction(&e_ext, message->param.setup.callerinfo.id, &message->param.setup.callerinfo.ntype, &message->param.setup.callerinfo.present, &message->param.setup.callerinfo.screen, message->param.setup.callerinfo.extension, message->param.setup.callerinfo.name); + apply_callerid_restriction(&e_ext, message->param.setup.redirinfo.id, &message->param.setup.redirinfo.ntype, &message->param.setup.redirinfo.present, 0, message->param.setup.redirinfo.extension, NULL); /* display callerid if desired for extension */ SCPY(message->param.setup.callerinfo.display, apply_callerid_display(message->param.setup.callerinfo.id, message->param.setup.callerinfo.itype, message->param.setup.callerinfo.ntype, message->param.setup.callerinfo.present, message->param.setup.callerinfo.screen, message->param.setup.callerinfo.extension, message->param.setup.callerinfo.name)); message_put(message); @@ -1483,7 +1324,7 @@ int EndpointAppPBX::handler(void) if (e_cfnr_release) { struct port_list *portlist; - struct message *message; + struct lcr_msg *message; if (now >= e_cfnr_release) { @@ -1502,7 +1343,7 @@ int EndpointAppPBX::handler(void) } /* put on hold */ message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH); - message->param.audiopath = CHANNEL_STATE_HOLD; + message->param.audiopath = 0; message_put(message); /* indicate no patterns */ message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_NOPATTERN); @@ -1624,7 +1465,7 @@ void EndpointAppPBX::hookflash(void) /* port MESSAGE_SETUP */ void EndpointAppPBX::port_setup(struct port_list *portlist, int message_type, union parameter *param) { - struct message *message; + struct lcr_msg *message; char buffer[256]; int writeext; /* flags need to write extension after modification */ class Port *port; @@ -1637,7 +1478,7 @@ void EndpointAppPBX::port_setup(struct port_list *portlist, int message_type, un memcpy(&e_dialinginfo, ¶m->setup.dialinginfo, sizeof(e_dialinginfo)); memcpy(&e_redirinfo, ¶m->setup.redirinfo, sizeof(e_redirinfo)); memcpy(&e_capainfo, ¶m->setup.capainfo, sizeof(e_capainfo)); - e_dtmf = param->setup.dtmf; +// e_dtmf = param->setup.dtmf; /* screen incoming caller id */ interface = interface_first; while(interface) @@ -1649,7 +1490,7 @@ void EndpointAppPBX::port_setup(struct port_list *portlist, int message_type, un interface = interface->next; } if (interface) - screen(0, e_callerinfo.id, sizeof(e_callerinfo.id), &e_callerinfo.ntype, &e_callerinfo.present, interface); + do_screen(0, e_callerinfo.id, sizeof(e_callerinfo.id), &e_callerinfo.ntype, &e_callerinfo.present, interface); /* process extension */ if (e_callerinfo.itype == INFO_ITYPE_ISDN_EXTENSION) @@ -1727,12 +1568,12 @@ void EndpointAppPBX::port_setup(struct port_list *portlist, int message_type, un /* set volume of rx and tx */ if (param->setup.callerinfo.itype == INFO_ITYPE_ISDN_EXTENSION) - if (e_ext.txvol!=256 || e_ext.rxvol!=256) + if (e_ext.tx_gain!=0 || e_ext.rx_gain!=0) { message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_mISDNSIGNAL); message->param.mISDNsignal.message = mISDNSIGNAL_VOLUME; - message->param.mISDNsignal.rxvol = e_ext.txvol; - message->param.mISDNsignal.txvol = e_ext.rxvol; + message->param.mISDNsignal.rx_gain = e_ext.tx_gain; + message->param.mISDNsignal.tx_gain = e_ext.rx_gain; message_put(message); } @@ -1827,7 +1668,7 @@ void EndpointAppPBX::port_information(struct port_list *portlist, int message_ty /* keypad when connected */ if (e_state == EPOINT_STATE_CONNECT) { - if (e_ext.keypad) + if (e_ext.keypad || e_enablekeypad) { PDEBUG(DEBUG_EPOINT, "EPOINT(%d) keypad information received during connect: %s.\n", ea_endpoint->ep_serial, param->information.id); /* processing keypad function */ @@ -2007,7 +1848,7 @@ void EndpointAppPBX::port_crypt(struct port_list *portlist, int message_type, un /* port MESSAGE_OVERLAP */ void EndpointAppPBX::port_overlap(struct port_list *portlist, int message_type, union parameter *param) { - struct message *message; + struct lcr_msg *message; logmessage(message_type, param, portlist->port_id, DIRECTION_IN); @@ -2034,7 +1875,7 @@ void EndpointAppPBX::port_overlap(struct port_list *portlist, int message_type, /* connect audio, if not already */ message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH); - message->param.audiopath = CHANNEL_STATE_CONNECT; + message->param.audiopath = 1; message_put(message); } else { @@ -2044,7 +1885,7 @@ void EndpointAppPBX::port_overlap(struct port_list *portlist, int message_type, /* disconnect audio, if not already */ message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH); - message->param.audiopath = CHANNEL_STATE_HOLD; + message->param.audiopath = 0; message_put(message); } new_state(EPOINT_STATE_OUT_OVERLAP); @@ -2060,7 +1901,7 @@ void EndpointAppPBX::port_overlap(struct port_list *portlist, int message_type, /* port MESSAGE_PROCEEDING */ void EndpointAppPBX::port_proceeding(struct port_list *portlist, int message_type, union parameter *param) { - struct message *message; + struct lcr_msg *message; logmessage(message_type, param, portlist->port_id, DIRECTION_IN); @@ -2077,7 +1918,7 @@ void EndpointAppPBX::port_proceeding(struct port_list *portlist, int message_typ /* connect audio, if not already */ message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH); - message->param.audiopath = CHANNEL_STATE_CONNECT; + message->param.audiopath = 1; message_put(message); } else { @@ -2087,7 +1928,7 @@ void EndpointAppPBX::port_proceeding(struct port_list *portlist, int message_typ /* disconnect audio, if not already */ message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH); - message->param.audiopath = CHANNEL_STATE_HOLD; + message->param.audiopath = 0; message_put(message); } /* if we are in a call */ @@ -2102,12 +1943,15 @@ void EndpointAppPBX::port_proceeding(struct port_list *portlist, int message_typ /* port MESSAGE_ALERTING */ void EndpointAppPBX::port_alerting(struct port_list *portlist, int message_type, union parameter *param) { - struct message *message; + struct lcr_msg *message; logmessage(message_type, param, portlist->port_id, DIRECTION_IN); /* signal to call tool */ admin_call_response(e_adminid, ADMIN_CALL_ALERTING, "", 0, 0, 0); +//#warning hack!! +// if (e_adminid) +// set_tone(portlist, "hold"); new_state(EPOINT_STATE_OUT_ALERTING); /* check if pattern is available */ @@ -2119,7 +1963,7 @@ void EndpointAppPBX::port_alerting(struct port_list *portlist, int message_type, /* connect audio, if not already */ message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH); - message->param.audiopath = CHANNEL_STATE_CONNECT; + message->param.audiopath = 1; message_put(message); } else { @@ -2129,7 +1973,7 @@ void EndpointAppPBX::port_alerting(struct port_list *portlist, int message_type, /* disconnect audio, if not already */ message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH); - message->param.audiopath = CHANNEL_STATE_HOLD; + message->param.audiopath = 0; message_put(message); } /* if we are in a call */ @@ -2144,9 +1988,9 @@ void EndpointAppPBX::port_alerting(struct port_list *portlist, int message_type, /* port MESSAGE_CONNECT */ void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type, union parameter *param) { - struct message *message; + struct lcr_msg *message; char buffer[256]; - unsigned long port_id = portlist->port_id; + unsigned int port_id = portlist->port_id; struct port_list *tportlist; class Port *port; struct interface *interface; @@ -2154,7 +1998,7 @@ void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type, logmessage(message_type, param, portlist->port_id, DIRECTION_IN); /* signal to call tool */ - admin_call_response(e_adminid, ADMIN_CALL_CONNECT, numberrize_callerinfo(param->connectinfo.id,param->connectinfo.ntype), 0, 0, 0); + admin_call_response(e_adminid, ADMIN_CALL_CONNECT, numberrize_callerinfo(param->connectinfo.id,param->connectinfo.ntype, options.national, options.international), 0, 0, 0); memcpy(&e_connectinfo, ¶m->connectinfo, sizeof(e_connectinfo)); PDEBUG(DEBUG_EPOINT, "EPOINT(%d) removing all other ports (start)\n", ea_endpoint->ep_serial); @@ -2187,7 +2031,7 @@ void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type, interface = interface->next; } if (interface) - screen(0, e_connectinfo.id, sizeof(e_connectinfo.id), &e_connectinfo.ntype, &e_connectinfo.present, interface); + do_screen(0, e_connectinfo.id, sizeof(e_connectinfo.id), &e_connectinfo.ntype, &e_connectinfo.present, interface); /* screen connected name */ if (e_ext.name[0]) @@ -2217,12 +2061,12 @@ void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type, new_state(EPOINT_STATE_CONNECT); /* set volume of rx and tx */ - if (e_ext.txvol!=256 || e_ext.rxvol!=256) + if (e_ext.tx_gain!=0 || e_ext.rx_gain!=0) { message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_mISDNSIGNAL); message->param.mISDNsignal.message = mISDNSIGNAL_VOLUME; - message->param.mISDNsignal.rxvol = e_ext.txvol; - message->param.mISDNsignal.txvol = e_ext.rxvol; + message->param.mISDNsignal.rx_gain = e_ext.tx_gain; + message->param.mISDNsignal.tx_gain = e_ext.rx_gain; message_put(message); } @@ -2240,7 +2084,7 @@ void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type, port = find_port_id(portlist->port_id); if (port) { - SCPY(e_connectinfo.id, nationalize_callerinfo(port->p_dialinginfo.id, &e_connectinfo.ntype)); + SCPY(e_connectinfo.id, nationalize_callerinfo(port->p_dialinginfo.id, &e_connectinfo.ntype, options.national, options.international)); e_connectinfo.present = INFO_PRESENT_ALLOWED; } } @@ -2254,7 +2098,7 @@ void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type, message_put(message); message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH); - message->param.audiopath = CHANNEL_STATE_CONNECT; + message->param.audiopath = 1; message_put(message); } else if (!e_adminid) { @@ -2354,9 +2198,9 @@ void EndpointAppPBX::port_connect(struct port_list *portlist, int message_type, /* port MESSAGE_DISCONNECT MESSAGE_RELEASE */ void EndpointAppPBX::port_disconnect_release(struct port_list *portlist, int message_type, union parameter *param) { - struct message *message; + struct lcr_msg *message; char buffer[256]; - unsigned long port_id = portlist->port_id; + unsigned int port_id = portlist->port_id; int cause, location; @@ -2454,7 +2298,7 @@ void EndpointAppPBX::port_disconnect_release(struct port_list *portlist, int mes message_put(message); /* connect audio, if not already */ message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH); - message->param.audiopath = CHANNEL_STATE_CONNECT; + message->param.audiopath = 1; message_put(message); /* send disconnect */ message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, message_type); @@ -2568,12 +2412,12 @@ void EndpointAppPBX::port_notify(struct port_list *portlist, int message_type, u { logmessage(message_type, param, portlist->port_id, DIRECTION_IN); - struct message *message; + struct lcr_msg *message; char *logtext = ""; char buffer[64]; /* signal to call tool */ - admin_call_response(e_adminid, ADMIN_CALL_NOTIFY, numberrize_callerinfo(param->notifyinfo.id,param->notifyinfo.ntype), 0, 0, param->notifyinfo.notify); + admin_call_response(e_adminid, ADMIN_CALL_NOTIFY, numberrize_callerinfo(param->notifyinfo.id,param->notifyinfo.ntype, options.national, options.international), 0, 0, param->notifyinfo.notify); if (param->notifyinfo.notify) { e_rx_state = track_notify(e_rx_state, param->notifyinfo.notify); @@ -2588,7 +2432,7 @@ void EndpointAppPBX::port_notify(struct port_list *portlist, int message_type, u if (ea_endpoint->ep_join_id) { message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH); - message->param.audiopath = CHANNEL_STATE_HOLD; + message->param.audiopath = 0; message_put(message); } break; @@ -2597,13 +2441,13 @@ void EndpointAppPBX::port_notify(struct port_list *portlist, int message_type, u case INFO_NOTIFY_USER_RESUMED: /* set volume of rx and tx */ if (param->setup.callerinfo.itype == INFO_ITYPE_ISDN_EXTENSION) - if (e_ext.txvol!=256 || e_ext.rxvol!=256) + if (e_ext.tx_gain!=0 || e_ext.rx_gain!=0) if (portlist) { message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_mISDNSIGNAL); message->param.mISDNsignal.message = mISDNSIGNAL_VOLUME; - message->param.mISDNsignal.rxvol = e_ext.txvol; - message->param.mISDNsignal.txvol = e_ext.rxvol; + message->param.mISDNsignal.rx_gain = e_ext.tx_gain; + message->param.mISDNsignal.tx_gain = e_ext.rx_gain; message_put(message); } /* set current tone */ @@ -2613,7 +2457,7 @@ void EndpointAppPBX::port_notify(struct port_list *portlist, int message_type, u if (ea_endpoint->ep_join_id) { message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH); - message->param.audiopath = CHANNEL_STATE_CONNECT; + message->param.audiopath = 1; message_put(message); } break; @@ -2715,7 +2559,7 @@ void EndpointAppPBX::port_facility(struct port_list *portlist, int message_type, { logmessage(message_type, param, portlist->port_id, DIRECTION_IN); - struct message *message; + struct lcr_msg *message; message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_FACILITY); memcpy(&message->param.facilityinfo, ¶m->facilityinfo, sizeof(struct facility_info)); @@ -2751,10 +2595,10 @@ void EndpointAppPBX::port_resume(struct port_list *portlist, int message_type, u /* port sends message to the endpoint */ -void EndpointAppPBX::ea_message_port(unsigned long port_id, int message_type, union parameter *param) +void EndpointAppPBX::ea_message_port(unsigned int port_id, int message_type, union parameter *param) { struct port_list *portlist; - struct message *message; + struct lcr_msg *message; portlist = ea_endpoint->ep_portlist; while(portlist) @@ -2932,6 +2776,7 @@ void EndpointAppPBX::ea_message_port(unsigned long port_id, int message_type, un break; #if 0 + kann nach dem test gelöscht werden, da eine direkte funktion im join und im mISDN zum austausch der message existiert /* port assigns bchannel */ case MESSAGE_BCHANNEL: /* bchannel assignment messafe */ PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received bchannel message %d from port.\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id, param->bchannel.type); @@ -2984,7 +2829,7 @@ void EndpointAppPBX::join_crypt(struct port_list *portlist, int message_type, un /* join MESSAGE_INFORMATION */ void EndpointAppPBX::join_information(struct port_list *portlist, int message_type, union parameter *param) { - struct message *message; + struct lcr_msg *message; e_overlap = 1; @@ -3001,9 +2846,9 @@ void EndpointAppPBX::join_information(struct port_list *portlist, int message_ty /* join MESSAGE_FACILITY */ void EndpointAppPBX::join_facility(struct port_list *portlist, int message_type, union parameter *param) { - struct message *message; + struct lcr_msg *message; - if (!e_ext.facility) + if (!e_ext.facility && e_ext.number[0]) { return; } @@ -3021,7 +2866,7 @@ void EndpointAppPBX::join_facility(struct port_list *portlist, int message_type, /* join MESSAGE_MORE */ void EndpointAppPBX::join_overlap(struct port_list *portlist, int message_type, union parameter *param) { - struct message *message; + struct lcr_msg *message; new_state(EPOINT_STATE_IN_OVERLAP); @@ -3030,12 +2875,15 @@ void EndpointAppPBX::join_overlap(struct port_list *portlist, int message_type, { /* disconnect audio */ message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH); - message->param.audiopath = CHANNEL_STATE_HOLD; + message->param.audiopath = 0; message_put(message); } if (e_action) if (e_action->index == ACTION_OUTDIAL || e_action->index == ACTION_EXTERNAL) { - set_tone(portlist, "dialtone"); + if (e_dialinginfo.id[0]) + set_tone(portlist, "dialing"); + else + set_tone(portlist, "dialtone"); return; } if (e_ext.number[0]) @@ -3047,7 +2895,7 @@ void EndpointAppPBX::join_overlap(struct port_list *portlist, int message_type, /* join MESSAGE_PROCEEDING */ void EndpointAppPBX::join_proceeding(struct port_list *portlist, int message_type, union parameter *param) { - struct message *message; + struct lcr_msg *message; new_state(EPOINT_STATE_IN_PROCEEDING); @@ -3057,9 +2905,9 @@ void EndpointAppPBX::join_proceeding(struct port_list *portlist, int message_typ /* connect / disconnect audio */ message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH); if (e_ext.own_proceeding) - message->param.audiopath = CHANNEL_STATE_HOLD; + message->param.audiopath = 0; else - message->param.audiopath = CHANNEL_STATE_CONNECT; + message->param.audiopath = 1; message_put(message); } // UCPY(e_join_tone, "proceeding"); @@ -3075,7 +2923,7 @@ void EndpointAppPBX::join_proceeding(struct port_list *portlist, int message_typ /* join MESSAGE_ALERTING */ void EndpointAppPBX::join_alerting(struct port_list *portlist, int message_type, union parameter *param) { - struct message *message; + struct lcr_msg *message; new_state(EPOINT_STATE_IN_ALERTING); @@ -3085,9 +2933,9 @@ void EndpointAppPBX::join_alerting(struct port_list *portlist, int message_type, /* connect / disconnect audio */ message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH); if (e_ext.own_alerting) - message->param.audiopath = CHANNEL_STATE_HOLD; + message->param.audiopath = 0; else - message->param.audiopath = CHANNEL_STATE_CONNECT; + message->param.audiopath = 1; message_put(message); } if (portlist) @@ -3110,38 +2958,26 @@ void EndpointAppPBX::join_alerting(struct port_list *portlist, int message_type, /* join MESSAGE_CONNECT */ void EndpointAppPBX::join_connect(struct port_list *portlist, int message_type, union parameter *param) { - struct message *message; - struct interface *interface; + struct lcr_msg *message; new_state(EPOINT_STATE_CONNECT); // UCPY(e_join_tone, ""); +// if (e_ext.number[0]) e_dtmf = 1; /* allow dtmf */ + e_powerdialing = 0; memcpy(&e_connectinfo, ¶m->connectinfo, sizeof(e_callerinfo)); if(portlist) { message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_CONNECT); memcpy(&message->param, param, sizeof(union parameter)); - /* screen incoming caller id */ - interface = interface_first; - while(interface) - { - if (!strcmp(e_connectinfo.interface, interface->name)) - { - break; - } - interface = interface->next; - } - if (interface) - screen(1, e_connectinfo.id, sizeof(e_connectinfo.id), &e_connectinfo.ntype, &e_connectinfo.present, interface); - memcpy(&message->param.connectinfo, &e_connectinfo, sizeof(e_connectinfo)); /* screen clip if prefix is required */ if (e_ext.number[0] && message->param.connectinfo.id[0] && e_ext.clip_prefix[0]) { SCPY(message->param.connectinfo.id, e_ext.clip_prefix); - SCAT(message->param.connectinfo.id, numberrize_callerinfo(e_connectinfo.id,e_connectinfo.ntype)); + SCAT(message->param.connectinfo.id, numberrize_callerinfo(e_connectinfo.id,e_connectinfo.ntype, options.national, options.international)); message->param.connectinfo.ntype = INFO_NTYPE_UNKNOWN; } @@ -3153,13 +2989,13 @@ void EndpointAppPBX::join_connect(struct port_list *portlist, int message_type, } /* handle restricted caller ids */ - apply_callerid_restriction(e_ext.anon_ignore, message->param.connectinfo.id, &message->param.connectinfo.ntype, &message->param.connectinfo.present, &message->param.connectinfo.screen, message->param.connectinfo.extension, message->param.connectinfo.name); + apply_callerid_restriction(&e_ext, message->param.connectinfo.id, &message->param.connectinfo.ntype, &message->param.connectinfo.present, &message->param.connectinfo.screen, message->param.connectinfo.extension, message->param.connectinfo.name); /* display callerid if desired for extension */ SCPY(message->param.connectinfo.display, apply_callerid_display(message->param.connectinfo.id, message->param.connectinfo.itype, message->param.connectinfo.ntype, message->param.connectinfo.present, message->param.connectinfo.screen, message->param.connectinfo.extension, message->param.connectinfo.name)); /* use conp, if enabld */ - if (!e_ext.centrex) - message->param.connectinfo.name[0] = '\0'; +// if (!e_ext.centrex) +// message->param.connectinfo.name[0] = '\0'; /* send connect */ message_put(message); @@ -3168,7 +3004,7 @@ void EndpointAppPBX::join_connect(struct port_list *portlist, int message_type, set_tone(portlist, NULL); e_join_pattern = 0; message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH); - message->param.audiopath = CHANNEL_STATE_CONNECT; + message->param.audiopath = 1; message_put(message); e_start = now; } @@ -3177,7 +3013,7 @@ void EndpointAppPBX::join_connect(struct port_list *portlist, int message_type, void EndpointAppPBX::join_disconnect_release(int message_type, union parameter *param) { char cause[16]; - struct message *message; + struct lcr_msg *message; struct port_list *portlist = NULL; @@ -3274,7 +3110,7 @@ void EndpointAppPBX::join_disconnect_release(int message_type, union parameter * } else /* else we enable audio */ { message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH); - message->param.audiopath = CHANNEL_STATE_CONNECT; + message->param.audiopath = 1; message_put(message); } /* send disconnect message */ @@ -3291,8 +3127,8 @@ void EndpointAppPBX::join_disconnect_release(int message_type, union parameter * /* join MESSAGE_SETUP */ void EndpointAppPBX::join_setup(struct port_list *portlist, int message_type, union parameter *param) { - struct message *message; - struct interface *interface; + struct lcr_msg *message; +// struct interface *interface; /* if we already in setup state, we just update the dialing with new digits */ if (e_state == EPOINT_STATE_OUT_SETUP @@ -3316,7 +3152,7 @@ void EndpointAppPBX::join_setup(struct port_list *portlist, int message_type, un /* disconnect audio */ message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH); - message->param.audiopath = CHANNEL_STATE_HOLD; + message->param.audiopath = 0; message_put(message); /* get dialing info */ @@ -3389,19 +3225,6 @@ void EndpointAppPBX::join_setup(struct port_list *portlist, int message_type, un memcpy(&e_redirinfo, ¶m->setup.redirinfo, sizeof(e_redirinfo)); memcpy(&e_capainfo, ¶m->setup.capainfo, sizeof(e_capainfo)); - /* screen incoming caller id */ - interface = interface_first; - while(interface) - { - if (!strcmp(e_callerinfo.interface, interface->name)) - { - break; - } - interface = interface->next; - } - if (interface) - screen(1, e_callerinfo.id, sizeof(e_callerinfo.id), &e_callerinfo.ntype, &e_callerinfo.present, interface); - /* process (voice over) data calls */ if (e_ext.datacall && e_capainfo.bearer_capa!=INFO_BC_SPEECH && e_capainfo.bearer_capa!=INFO_BC_AUDIO) { @@ -3420,7 +3243,7 @@ void EndpointAppPBX::join_setup(struct port_list *portlist, int message_type, un /* join MESSAGE_mISDNSIGNAL */ void EndpointAppPBX::join_mISDNsignal(struct port_list *portlist, int message_type, union parameter *param) { - struct message *message; + struct lcr_msg *message; while(portlist) { @@ -3434,7 +3257,7 @@ void EndpointAppPBX::join_mISDNsignal(struct port_list *portlist, int message_ty /* join MESSAGE_NOTIFY */ void EndpointAppPBX::join_notify(struct port_list *portlist, int message_type, union parameter *param) { - struct message *message; + struct lcr_msg *message; int new_state; if (param->notifyinfo.notify) @@ -3484,7 +3307,7 @@ void EndpointAppPBX::join_notify(struct port_list *portlist, int message_type, u message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_NOTIFY); memcpy(&message->param.notifyinfo, ¶m->notifyinfo, sizeof(struct notify_info)); /* handle restricted caller ids */ - apply_callerid_restriction(e_ext.anon_ignore, message->param.notifyinfo.id, &message->param.notifyinfo.ntype, &message->param.notifyinfo.present, 0, message->param.notifyinfo.extension, NULL); + apply_callerid_restriction(&e_ext, message->param.notifyinfo.id, &message->param.notifyinfo.ntype, &message->param.notifyinfo.present, 0, message->param.notifyinfo.extension, NULL); /* display callerid if desired for extension */ SCPY(message->param.notifyinfo.display, apply_callerid_display(message->param.notifyinfo.id, message->param.notifyinfo.itype, message->param.notifyinfo.ntype, message->param.notifyinfo.present, 0, message->param.notifyinfo.extension, NULL)); message_put(message); @@ -3495,10 +3318,10 @@ void EndpointAppPBX::join_notify(struct port_list *portlist, int message_type, u /* JOIN sends messages to the endpoint */ -void EndpointAppPBX::ea_message_join(unsigned long join_id, int message_type, union parameter *param) +void EndpointAppPBX::ea_message_join(unsigned int join_id, int message_type, union parameter *param) { struct port_list *portlist; - struct message *message; + struct lcr_msg *message; if (!join_id) { @@ -3620,6 +3443,7 @@ void EndpointAppPBX::ea_message_join(unsigned long join_id, int message_type, un break; #if 0 + kann nach dem test gelöscht werden, da eine direkte funktion im join und im mISDN zum austausch der message existiert /* JOIN requests bchannel */ case MESSAGE_BCHANNEL: /* indicates the need of own bchannel access */ PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received bchannel assignment %d from join.\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id, param->bchannel.type); @@ -3651,13 +3475,8 @@ void EndpointAppPBX::ea_message_join(unsigned long join_id, int message_type, un } /* connect our audio tx and rx (blueboxing should be possibe before connect :)*/ message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH); - message->param.audiopath = CHANNEL_STATE_CONNECT; + message->param.audiopath = 1; message_put(message); -// /* tell remote epoint to connect audio also, because we like to hear the patterns */ -// message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_REMOTE_AUDIO); -// message->param.audiopath = CHANNEL_STATE_CONNECT; -// message_put(message); -// patterns are available, remote already connected audio } break; @@ -3670,7 +3489,7 @@ void EndpointAppPBX::ea_message_join(unsigned long join_id, int message_type, un e_join_pattern = 0; /* disconnect our audio tx and rx */ message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH); - message->param.audiopath = CHANNEL_STATE_HOLD; + message->param.audiopath = 0; message_put(message); } break; @@ -3691,6 +3510,15 @@ void EndpointAppPBX::ea_message_join(unsigned long join_id, int message_type, un join_notify(portlist, message_type, param); break; + /* JOIN wants keypad / dtml */ + case MESSAGE_ENABLEKEYPAD: + PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received keypad enable request.\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id); + e_enablekeypad = 1; + e_dtmf = 1; + trace_header("ENABLE KEYPAD", DIRECTION_NONE); + end_trace(); + break; + default: PDEBUG(DEBUG_EPOINT, "EPOINT(%d) epoint with terminal '%s' (caller id '%s') received a wrong message: #%d\n", ea_endpoint->ep_serial, e_ext.number, e_callerinfo.id, message); } @@ -3737,7 +3565,7 @@ int match_list(char *list, char *item) void EndpointAppPBX::pick_join(char *extensions) { - struct message *message; + struct lcr_msg *message; struct port_list *portlist; class Port *port; class EndpointAppPBX *eapp, *found; @@ -3870,7 +3698,8 @@ reject: /* connnecting our endpoint */ new_state(EPOINT_STATE_CONNECT); - e_dtmf = 1; + if (e_ext.number[0]) + e_dtmf = 1; set_tone(ea_endpoint->ep_portlist, NULL); /* now we send a release to the ringing endpoint */ @@ -3896,14 +3725,14 @@ reject: message->param.connectinfo.itype = eapp->e_callerinfo.itype; message->param.connectinfo.ntype = eapp->e_callerinfo.ntype; /* handle restricted caller ids */ - apply_callerid_restriction(e_ext.anon_ignore, message->param.connectinfo.id, &message->param.connectinfo.ntype, &message->param.connectinfo.present, &message->param.connectinfo.screen, message->param.connectinfo.extension, message->param.connectinfo.name); + apply_callerid_restriction(&e_ext, message->param.connectinfo.id, &message->param.connectinfo.ntype, &message->param.connectinfo.present, &message->param.connectinfo.screen, message->param.connectinfo.extension, message->param.connectinfo.name); /* display callerid if desired for extension */ SCPY(message->param.connectinfo.display, apply_callerid_display(message->param.connectinfo.id, message->param.connectinfo.itype, message->param.connectinfo.ntype, message->param.connectinfo.present, message->param.connectinfo.screen, message->param.connectinfo.extension, message->param.connectinfo.name)); message_put(message); /* we send a connect to the audio path (not for vbox) */ message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_AUDIOPATH); - message->param.audiopath = CHANNEL_STATE_CONNECT; + message->param.audiopath = 1; message_put(message); /* beeing paranoid, we make call update */ @@ -3943,7 +3772,7 @@ reject: */ void EndpointAppPBX::join_join(void) { - struct message *message; + struct lcr_msg *message; struct join_relation *our_relation, *other_relation; struct join_relation **our_relation_pointer, **other_relation_pointer; class Join *our_join, *other_join; @@ -4063,12 +3892,12 @@ void EndpointAppPBX::join_join(void) { if (other_relation->epoint_id == other_eapp->ea_endpoint->ep_serial) { - /* detach other endpoint on hold */ + /* detach other endpoint on hold */ *other_relation_pointer = other_relation->next; FREE(other_relation, sizeof(struct join_relation)); cmemuse--; other_relation = *other_relation_pointer; - other_eapp->ea_endpoint->ep_join_id = NULL; + other_eapp->ea_endpoint->ep_join_id = 0; continue; } @@ -4223,7 +4052,7 @@ int EndpointAppPBX::check_external(char **errstr, class Port **port) return(0); } -void EndpointAppPBX::logmessage(int message_type, union parameter *param, unsigned long port_id, int dir) +void EndpointAppPBX::logmessage(int message_type, union parameter *param, unsigned int port_id, int dir) { char *logtext = "unknown"; char buffer[64]; @@ -4238,7 +4067,7 @@ void EndpointAppPBX::logmessage(int message_type, union parameter *param, unsign add_trace("from", NULL, "CH(%lu)", port_id); if (param->setup.callerinfo.extension[0]) add_trace("extension", NULL, "%s", param->setup.callerinfo.extension); - add_trace("caller id", "number", "%s", numberrize_callerinfo(param->setup.callerinfo.id, param->setup.callerinfo.ntype)); + add_trace("caller id", "number", "%s", numberrize_callerinfo(param->setup.callerinfo.id, param->setup.callerinfo.ntype, options.national, options.international)); switch(param->setup.callerinfo.present) { case INFO_PRESENT_RESTRICTED: @@ -4252,7 +4081,7 @@ void EndpointAppPBX::logmessage(int message_type, union parameter *param, unsign } if (param->setup.redirinfo.id[0]) { - add_trace("redir'ing", "number", "%s", numberrize_callerinfo(param->setup.redirinfo.id, param->setup.redirinfo.ntype)); + add_trace("redir'ing", "number", "%s", numberrize_callerinfo(param->setup.redirinfo.id, param->setup.redirinfo.ntype, options.national, options.international)); switch(param->setup.redirinfo.present) { case INFO_PRESENT_RESTRICTED: @@ -4305,7 +4134,7 @@ void EndpointAppPBX::logmessage(int message_type, union parameter *param, unsign add_trace("from", NULL, "CH(%lu)", port_id); if (param->connectinfo.extension[0]) add_trace("extension", NULL, "%s", param->connectinfo.extension); - add_trace("connect id", "number", "%s", numberrize_callerinfo(param->connectinfo.id, param->connectinfo.ntype)); + add_trace("connect id", "number", "%s", numberrize_callerinfo(param->connectinfo.id, param->connectinfo.ntype, options.national, options.international)); switch(param->connectinfo.present) { case INFO_PRESENT_RESTRICTED: @@ -4346,10 +4175,10 @@ void EndpointAppPBX::logmessage(int message_type, union parameter *param, unsign add_trace("cause", "location", "3-Transit"); break; case LOCATION_PUBLIC_REMOTE: - add_trace("cause", "location", "4-Remote-PBX"); + add_trace("cause", "location", "4-Remote-Exchange"); break; case LOCATION_PRIVATE_REMOTE: - add_trace("cause", "location", "5-Remote-Exchange"); + add_trace("cause", "location", "5-Remote-PBX"); break; case LOCATION_INTERNATIONAL: add_trace("cause", "location", "7-International-Exchange"); @@ -4452,7 +4281,7 @@ void EndpointAppPBX::logmessage(int message_type, union parameter *param, unsign add_trace("indicator", NULL, "%s", logtext); if (param->notifyinfo.id[0]) { - add_trace("redir'on", "number", "%s", numberrize_callerinfo(param->notifyinfo.id, param->notifyinfo.ntype)); + add_trace("redir'on", "number", "%s", numberrize_callerinfo(param->notifyinfo.id, param->notifyinfo.ntype, options.national, options.international)); switch(param->notifyinfo.present) { case INFO_PRESENT_RESTRICTED: @@ -4553,7 +4382,7 @@ void EndpointAppPBX::logmessage(int message_type, union parameter *param, unsign void EndpointAppPBX::message_disconnect_port(struct port_list *portlist, int cause, int location, char *display) { - struct message *message; + struct lcr_msg *message; if (!portlist) return;