X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=action.cpp;h=0bb68cdbd6bfc57edb1e2ccd4519519975092397;hp=3655032f4e262a4a97e39c96f88838ed23367eb4;hb=83477c7faf66a160530f5a01c1bf3016e2127a4d;hpb=996f984d61d412e9371cb503963de6a1f48e31d4 diff --git a/action.cpp b/action.cpp index 3655032..0bb68cd 100644 --- a/action.cpp +++ b/action.cpp @@ -67,44 +67,96 @@ char *numberrize_callerinfo(char *string, int ntype) /* - * process init 'internal' / 'external' / 'chan' / 'vbox-record' / 'partyline'... + * process init 'internal' / 'external' / 'remote' / 'vbox-record' / 'partyline'... */ -void EndpointAppPBX::_action_init_call(int chan) +void EndpointAppPBX::_action_init_call(char *remote) { - class Call *call; + class Join *join; struct port_list *portlist = ea_endpoint->ep_portlist; + struct admin_list *admin; /* a created call, this should never happen */ - if (ea_endpoint->ep_call_id) + if (ea_endpoint->ep_join_id) { if (options.deb & DEBUG_EPOINT) PERROR("EPOINT(%d): We already have a call instance, this should never happen!\n", ea_endpoint->ep_serial); return; } - /* create call */ - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): Creating new call instance.\n", ea_endpoint->ep_serial); - if (chan) - call = new CallChan(ea_endpoint); - else - call = new CallPBX(ea_endpoint); - if (!call) + /* create join */ + PDEBUG(DEBUG_EPOINT, "EPOINT(%d): Creating new join instance.\n", ea_endpoint->ep_serial); + if (remote) { - /* resource not available */ - message_disconnect_port(portlist, CAUSE_RESSOURCEUNAVAIL, LOCATION_PRIVATE_LOCAL, ""); - new_state(EPOINT_STATE_OUT_DISCONNECT); - set_tone(portlist,"cause_22"); - return; + admin = admin_first; + while(admin) + { + if (admin->remote_name[0] && !strcmp(admin->remote_name, remote)) + break; + admin = admin->next; + } + if (!admin) + { + /* resource not available */ + trace_header("ACTION remote (not available)", DIRECTION_NONE); + add_trace("application", NULL, "%s", remote); + end_trace(); + message_disconnect_port(portlist, CAUSE_RESSOURCEUNAVAIL, LOCATION_PRIVATE_LOCAL, ""); + new_state(EPOINT_STATE_OUT_DISCONNECT); + set_tone(portlist,"cause_22"); + return; + } + join = new JoinRemote(ea_endpoint->ep_serial, remote, admin->sock); } - ea_endpoint->ep_call_id = call->c_serial; + else + join = new JoinPBX(ea_endpoint); + if (!join) + FATAL("No memoy for Join instance.\n"); + ea_endpoint->ep_join_id = join->j_serial; } void EndpointAppPBX::action_init_call(void) { - _action_init_call(0); + _action_init_call(NULL); } -void EndpointAppPBX::action_init_chan(void) +void EndpointAppPBX::action_init_remote(void) { - _action_init_call(1); + struct route_param *rparam; + struct port_list *portlist = ea_endpoint->ep_portlist; + struct message *message; + struct capa_info capainfo; + struct caller_info callerinfo; + struct redir_info redirinfo; + struct dialing_info dialinginfo; + char remote[32]; + + if (!(rparam = routeparam(e_action, PARAM_APPLICATION))) + { + trace_header("ACTION remote (no application given)", DIRECTION_NONE); + end_trace(); + new_state(EPOINT_STATE_OUT_DISCONNECT); + message_disconnect_port(portlist, CAUSE_SERVICEUNAVAIL, LOCATION_PRIVATE_LOCAL, ""); + set_tone(portlist, "cause_3f"); + return; + } + SCPY(remote, rparam->string_value); + _action_init_call(remote); + + /* create bearer/caller/dialinginfo */ + memcpy(&capainfo, &e_capainfo, sizeof(capainfo)); + memcpy(&callerinfo, &e_callerinfo, sizeof(callerinfo)); + memcpy(&redirinfo, &e_redirinfo, sizeof(redirinfo)); + memset(&dialinginfo, 0, sizeof(dialinginfo)); + + /* send setup to remote */ + trace_header("ACTION remote (setup)", DIRECTION_NONE); + add_trace("number", NULL, dialinginfo.id); + add_trace("remote", NULL, remote); + end_trace(); + message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_SETUP); + memcpy(&message->param.setup.dialinginfo, &dialinginfo, sizeof(struct dialing_info)); + memcpy(&message->param.setup.redirinfo, &redirinfo, sizeof(struct redir_info)); + memcpy(&message->param.setup.callerinfo, &callerinfo, sizeof(struct caller_info)); + memcpy(&message->param.setup.capainfo, &capainfo, sizeof(struct capa_info)); + message_put(message); } /* @@ -125,7 +177,7 @@ void EndpointAppPBX::action_dialing_internal(void) set_tone(portlist, "proceeding"); message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_PROCEEDING); message_put(message); - logmessage(message); + logmessage(message->type, &message->param, portlist->port_id, DIRECTION_OUT); new_state(EPOINT_STATE_IN_PROCEEDING); /* create bearer/caller/dialinginfo */ @@ -133,12 +185,12 @@ void EndpointAppPBX::action_dialing_internal(void) memcpy(&callerinfo, &e_callerinfo, sizeof(callerinfo)); memcpy(&redirinfo, &e_redirinfo, sizeof(redirinfo)); memset(&dialinginfo, 0, sizeof(dialinginfo)); - dialinginfo.itype = INFO_ITYPE_INTERN; - SCPY(dialinginfo.number, e_dialinginfo.number); + dialinginfo.itype = INFO_ITYPE_ISDN_EXTENSION; + SCPY(dialinginfo.id, e_dialinginfo.id); /* process extension */ if ((rparam = routeparam(e_action, PARAM_EXTENSION))) - SCPY(dialinginfo.number, rparam->string_value); + SCPY(dialinginfo.id, rparam->string_value); /* process number type */ if ((rparam = routeparam(e_action, PARAM_TYPE))) @@ -179,10 +231,12 @@ void EndpointAppPBX::action_dialing_internal(void) } /* check if extension exists AND only if not multiple extensions */ - if (!read_extension(&ext, dialinginfo.number) && !strchr(dialinginfo.number,',')) + if (!read_extension(&ext, dialinginfo.id) && !strchr(dialinginfo.id,',')) { - printlog("%3d action INTERN dialed extension %s doesn't exist.\n", ea_endpoint->ep_serial, dialinginfo.number); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): extension %s doesn't exist\n", ea_endpoint->ep_serial, dialinginfo.number); + trace_header("ACTION extension (extension doesn't exist)", DIRECTION_NONE); + add_trace("extension", NULL, dialinginfo.id); + end_trace(); + release(RELEASE_JOIN, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, 0, 0); new_state(EPOINT_STATE_OUT_DISCONNECT); message_disconnect_port(portlist, CAUSE_UNALLOCATED, LOCATION_PRIVATE_LOCAL, ""); set_tone(portlist, "cause_86"); @@ -191,17 +245,21 @@ void EndpointAppPBX::action_dialing_internal(void) /* check if internal calls are denied */ if (e_ext.rights < 1) { - printlog("%3d action INTERN access to internal phones are denied for this caller.\n", ea_endpoint->ep_serial); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): internal call from terminal %s denied.\n", ea_endpoint->ep_serial, e_ext.number); + trace_header("ACTION extension (dialing to extension denied)", DIRECTION_NONE); + add_trace("extension", NULL, dialinginfo.id); + end_trace(); new_state(EPOINT_STATE_OUT_DISCONNECT); + release(RELEASE_JOIN, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, 0, 0); message_disconnect_port(portlist, CAUSE_REJECTED, LOCATION_PRIVATE_LOCAL, ""); set_tone(portlist, "cause_81"); return; } /* add or update internal call */ - printlog("%3d action INTERN call to extension %s.\n", ea_endpoint->ep_serial, dialinginfo.number); - message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_call_id, EPOINT_TO_CALL, MESSAGE_SETUP); + trace_header("ACTION extension (calling)", DIRECTION_NONE); + add_trace("extension", NULL, dialinginfo.id); + end_trace(); + message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_SETUP); memcpy(&message->param.setup.dialinginfo, &dialinginfo, sizeof(struct dialing_info)); memcpy(&message->param.setup.redirinfo, &redirinfo, sizeof(struct redir_info)); memcpy(&message->param.setup.callerinfo, &callerinfo, sizeof(struct caller_info)); @@ -254,18 +312,18 @@ void EndpointAppPBX::action_dialing_external(void) memcpy(&callerinfo, &e_callerinfo, sizeof(callerinfo)); memcpy(&redirinfo, &e_redirinfo, sizeof(redirinfo)); memset(&dialinginfo, 0, sizeof(dialinginfo)); - dialinginfo.itype = INFO_ITYPE_EXTERN; + dialinginfo.itype = INFO_ITYPE_ISDN; dialinginfo.sending_complete = 0; - SCPY(dialinginfo.number, e_extdialing); + SCPY(dialinginfo.id, e_extdialing); /* process prefix */ if ((rparam = routeparam(e_action, PARAM_PREFIX))) - SPRINT(dialinginfo.number, "%s%s", rparam->string_value, e_extdialing); + SPRINT(dialinginfo.id, "%s%s", rparam->string_value, e_extdialing); /* process number complete */ if ((rparam = routeparam(e_action, PARAM_COMPLETE))) if ((rparam = routeparam(e_action, PARAM_PREFIX))) - SCPY(dialinginfo.number, rparam->string_value); + SCPY(dialinginfo.id, rparam->string_value); dialinginfo.sending_complete = 1; /* process number type */ @@ -324,9 +382,9 @@ void EndpointAppPBX::action_dialing_external(void) /* check if local calls are denied */ if (e_ext.rights < 2) { - printlog("%3d action EXTERN calls are denied for this caller.\n", ea_endpoint->ep_serial); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): external call from terminal denied: %s\n", ea_endpoint->ep_serial, e_ext.number); - release(RELEASE_CALL, LOCATION_PRIVATE_LOCAL, CAUSE_REJECTED, LOCATION_PRIVATE_LOCAL, 0); + trace_header("ACTION extern (calling denied)", DIRECTION_NONE); + end_trace(); + release(RELEASE_JOIN, LOCATION_PRIVATE_LOCAL, CAUSE_REJECTED, 0, 0); set_tone(portlist, "cause_82"); denied: message_disconnect_port(portlist, CAUSE_REJECTED, LOCATION_PRIVATE_LOCAL, ""); @@ -334,38 +392,42 @@ void EndpointAppPBX::action_dialing_external(void) return; } - if (!strncmp(dialinginfo.number, options.national, strlen(options.national)) + if (!strncmp(dialinginfo.id, options.national, strlen(options.national)) || dialinginfo.ntype == INFO_NTYPE_NATIONAL || dialinginfo.ntype == INFO_NTYPE_INTERNATIONAL) { /* check if national calls are denied */ if (e_ext.rights < 3) { - printlog("%3d action EXTERN national calls are denied for this caller.\n", ea_endpoint->ep_serial); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): national call from terminal %s denied.\n", ea_endpoint->ep_serial, e_ext.number); - release(RELEASE_CALL, LOCATION_PRIVATE_LOCAL, CAUSE_REJECTED, LOCATION_PRIVATE_LOCAL, 0); + trace_header("ACTION extern (national calls denied)", DIRECTION_NONE); + end_trace(); + release(RELEASE_JOIN, LOCATION_PRIVATE_LOCAL, CAUSE_REJECTED, 0, 0); set_tone(portlist, "cause_83"); goto denied; } } - if (!strncmp(dialinginfo.number, options.international, strlen(options.international)) + if (!strncmp(dialinginfo.id, options.international, strlen(options.international)) || dialinginfo.ntype == INFO_NTYPE_INTERNATIONAL) { /* check if international calls are denied */ if (e_ext.rights < 4) { - printlog("%3d action EXTERN international calls are denied for this caller.\n", ea_endpoint->ep_serial); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): international call from terminal %s denied.\n", ea_endpoint->ep_serial, e_ext.number); - release(RELEASE_CALL, LOCATION_PRIVATE_LOCAL, CAUSE_REJECTED, LOCATION_PRIVATE_LOCAL, 0); + trace_header("ACTION extern (international calls denied)", DIRECTION_NONE); + end_trace(); + release(RELEASE_JOIN, LOCATION_PRIVATE_LOCAL, CAUSE_REJECTED, 0, 0); set_tone(portlist, "cause_84"); goto denied; } } /* add or update outgoing call */ - printlog("%3d action EXTERN call to destination %s.\n", ea_endpoint->ep_serial, dialinginfo.number); - message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_call_id, EPOINT_TO_CALL, MESSAGE_SETUP); + trace_header("ACTION extern (calling)", DIRECTION_NONE); + add_trace("number", NULL, dialinginfo.id); + if (dialinginfo.interfaces[0]) + add_trace("interfaces", NULL, dialinginfo.interfaces); + end_trace(); + message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_SETUP); memcpy(&message->param.setup.dialinginfo, &dialinginfo, sizeof(struct dialing_info)); memcpy(&message->param.setup.redirinfo, &redirinfo, sizeof(struct redir_info)); memcpy(&message->param.setup.callerinfo, &callerinfo, sizeof(struct caller_info)); @@ -374,14 +436,25 @@ void EndpointAppPBX::action_dialing_external(void) } -void EndpointAppPBX::action_dialing_chan(void) +void EndpointAppPBX::action_dialing_remote(void) { - struct port_list *portlist = ea_endpoint->ep_portlist; + struct message *message; + struct dialing_info dialinginfo; +// struct route_param *rparam; - printlog("%3d action channel API not implemented.\n", ea_endpoint->ep_serial); - message_disconnect_port(portlist, CAUSE_UNIMPLEMENTED, LOCATION_PRIVATE_LOCAL, ""); - new_state(EPOINT_STATE_OUT_DISCONNECT); - set_tone(portlist,"cause_4f"); + /* create bearer/caller/dialinginfo */ + memset(&dialinginfo, 0, sizeof(dialinginfo)); + + if (dialinginfo.id[0]) + { + /* add or update outgoing call */ + trace_header("ACTION remote (dialing)", DIRECTION_NONE); + add_trace("number", NULL, dialinginfo.id); + end_trace(); + message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_INFORMATION); + memcpy(&message->param.information, &dialinginfo, sizeof(struct dialing_info)); + message_put(message); + } } @@ -401,8 +474,8 @@ void EndpointAppPBX::action_dialing_vbox_record(void) /* check for given extension */ if (!(rparam = routeparam(e_action, PARAM_EXTENSION))) { - printlog("%3d action VBOX-RECORD extension not given by parameter.\n", ea_endpoint->ep_serial); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): cannot record, because no 'extension' parameter has been specified.\n", ea_endpoint->ep_serial); + trace_header("ACTION vbox-record (no extension given by parameter)", DIRECTION_NONE); + end_trace(); new_state(EPOINT_STATE_OUT_DISCONNECT); message_disconnect_port(portlist, CAUSE_SERVICEUNAVAIL, LOCATION_PRIVATE_LOCAL, ""); @@ -413,21 +486,20 @@ void EndpointAppPBX::action_dialing_vbox_record(void) /* check if extension exists */ if (!read_extension(&ext, rparam->string_value)) { - printlog("%3d action VBOX-RECORD given extension %s doesn't exist.\n", ea_endpoint->ep_serial, rparam->string_value); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): extension %s doesn't exist\n", ea_endpoint->ep_serial, rparam->string_value); + trace_header("ACTION vbox-record (given extension does not exists)", DIRECTION_NONE); + add_trace("extension", NULL, "%s", rparam->string_value); + end_trace(); new_state(EPOINT_STATE_OUT_DISCONNECT); message_disconnect_port(portlist, CAUSE_UNALLOCATED, LOCATION_PRIVATE_LOCAL, ""); set_tone(portlist, "cause_86"); return; } - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s dialing extension: %s\n", ea_endpoint->ep_serial, e_ext.number, rparam->string_value); - /* check if internal calls are denied */ if (e_ext.rights < 1) { - printlog("%3d action VBOX-RECORD calls are denied for this caller.\n", ea_endpoint->ep_serial); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): internal call from terminal %s denied.\n", ea_endpoint->ep_serial, e_ext.number); + trace_header("ACTION vbox-record (internal calls are denied)", DIRECTION_NONE); + end_trace(); new_state(EPOINT_STATE_OUT_DISCONNECT); message_disconnect_port(portlist, CAUSE_REJECTED, LOCATION_PRIVATE_LOCAL, ""); set_tone(portlist, "cause_81"); @@ -437,25 +509,27 @@ void EndpointAppPBX::action_dialing_vbox_record(void) set_tone(portlist, "proceeding"); message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_PROCEEDING); message_put(message); - logmessage(message); + logmessage(message->type, &message->param, portlist->port_id, DIRECTION_OUT); new_state(EPOINT_STATE_IN_PROCEEDING); memset(&dialinginfo, 0, sizeof(dialinginfo)); dialinginfo.itype = INFO_ITYPE_VBOX; dialinginfo.sending_complete = 1; - SCPY(dialinginfo.number, rparam->string_value); + SCPY(dialinginfo.id, rparam->string_value); /* append special announcement (if given) */ if ((rparam = routeparam(e_action, PARAM_ANNOUNCEMENT))) if (rparam->string_value[0]) { - SCAT(dialinginfo.number, ","); - SCAT(dialinginfo.number, rparam->string_value); + SCAT(dialinginfo.id, ","); + SCAT(dialinginfo.id, rparam->string_value); } /* add or update internal call */ - printlog("%3d action VBOX-RECORD call to extension %s.\n", ea_endpoint->ep_serial, dialinginfo.number); - message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_call_id, EPOINT_TO_CALL, MESSAGE_SETUP); + trace_header("ACTION vbox-record (calling)", DIRECTION_NONE); + add_trace("extension", NULL, "%s", dialinginfo.id); + end_trace(); + message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_SETUP); memcpy(&message->param.setup.dialinginfo, &dialinginfo, sizeof(struct dialing_info)); memcpy(&message->param.setup.redirinfo, &e_redirinfo, sizeof(struct redir_info)); memcpy(&message->param.setup.callerinfo, &e_callerinfo, sizeof(struct caller_info)); @@ -469,21 +543,21 @@ void EndpointAppPBX::action_dialing_vbox_record(void) */ void EndpointAppPBX::action_init_partyline(void) { - class Call *call; - class CallPBX *callpbx; + class Join *join; + class JoinPBX *joinpbx; struct port_list *portlist = ea_endpoint->ep_portlist; struct message *message; struct route_param *rparam; - int partyline; - struct call_relation *relation; + int partyline, jingle = 0; + struct join_relation *relation; portlist = ea_endpoint->ep_portlist; /* check for given extension */ if (!(rparam = routeparam(e_action, PARAM_ROOM))) { - printlog("%3d action PARTYLINE no 'room' parameter given at routing.\n", ea_endpoint->ep_serial); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): missing parameter 'room'.\n", ea_endpoint->ep_serial); + trace_header("ACTION partyline (no room parameter)", DIRECTION_NONE); + end_trace(); noroom: new_state(EPOINT_STATE_OUT_DISCONNECT); message_disconnect_port(portlist, CAUSE_SERVICEUNAVAIL, LOCATION_PRIVATE_LOCAL, ""); @@ -492,45 +566,40 @@ void EndpointAppPBX::action_init_partyline(void) } if (rparam->integer_value <= 0) { - printlog("%3d action PARTYLINE 'room' value must be greate 0.\n", ea_endpoint->ep_serial); + trace_header("ACTION partyline (illegal room parameter)", DIRECTION_NONE); + add_trace("room", NULL, "%d", rparam->integer_value); + end_trace(); PDEBUG(DEBUG_EPOINT, "EPOINT(%d): invalid value for 'room'.\n", ea_endpoint->ep_serial); goto noroom; } partyline = rparam->integer_value; + if ((rparam = routeparam(e_action, PARAM_JINGLE))) + jingle = 1; - /* don't create call if partyline exists */ - call = call_first; - while(call) + /* don't create join if partyline exists */ + join = join_first; + while(join) { - if (call->c_type == CALL_TYPE_PBX) + if (join->j_type == JOIN_TYPE_PBX) { - callpbx = (class CallPBX *)call; - if (callpbx->c_partyline == rparam->integer_value) + joinpbx = (class JoinPBX *)join; + if (joinpbx->j_partyline == partyline) break; } - call = call->next; + join = join->next; } - if (!call) + if (!join) { - /* create call */ - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): Creating new call instance.\n", ea_endpoint->ep_serial); - if (!(call = new CallPBX(ea_endpoint))) - { - nores: - /* resource not available */ - message_disconnect_port(portlist, CAUSE_RESSOURCEUNAVAIL, LOCATION_PRIVATE_LOCAL, ""); - new_state(EPOINT_STATE_OUT_DISCONNECT); - set_tone(portlist,"cause_22"); - return; - } + /* create join */ + PDEBUG(DEBUG_EPOINT, "EPOINT(%d): Creating new join instance.\n", ea_endpoint->ep_serial); + if (!(join = new JoinPBX(ea_endpoint))) + FATAL("No memory for join object\n"); } else { -//NOTE: callpbx must be set here - /* add relation to existing call */ - if (!(relation=callpbx->add_relation())) - { - goto nores; - } +//NOTE: joinpbx must be set here + /* add relation to existing join */ + if (!(relation=joinpbx->add_relation())) + FATAL("No memory for join relation\n"); relation->type = RELATION_TYPE_SETUP; relation->channel_state = CHANNEL_STATE_CONNECT; relation->rx_state = NOTIFY_STATE_ACTIVE; @@ -538,20 +607,22 @@ void EndpointAppPBX::action_init_partyline(void) relation->epoint_id = ea_endpoint->ep_serial; } - ea_endpoint->ep_call_id = call->c_serial; - - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s dialing room: %d\n", ea_endpoint->ep_serial, e_ext.number, partyline); + ea_endpoint->ep_join_id = join->j_serial; set_tone(portlist, "proceeding"); message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_PROCEEDING); message_put(message); - logmessage(message); + logmessage(message->type, &message->param, portlist->port_id, DIRECTION_OUT); new_state(EPOINT_STATE_IN_PROCEEDING); - /* send setup to call */ - printlog("%3d action PARTYLINE call to room %d.\n", ea_endpoint->ep_serial, partyline); - message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_call_id, EPOINT_TO_CALL, MESSAGE_SETUP); + /* send setup to join */ + trace_header("ACTION partyline (calling)", DIRECTION_NONE); + add_trace("room", NULL, "%d", partyline); + add_trace("jingle", NULL, (jingle)?"on":"off"); + end_trace(); + message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_SETUP); message->param.setup.partyline = partyline; + message->param.setup.partyline_jingle = jingle; memcpy(&message->param.setup.dialinginfo, &e_dialinginfo, sizeof(struct dialing_info)); memcpy(&message->param.setup.redirinfo, &e_redirinfo, sizeof(struct redir_info)); memcpy(&message->param.setup.callerinfo, &e_callerinfo, sizeof(struct caller_info)); @@ -565,43 +636,8 @@ void EndpointAppPBX::action_init_partyline(void) */ void EndpointAppPBX::action_hangup_call(void) { - int i; - - printlog("%3d action CALL to '%s' hangs up.\n", ea_endpoint->ep_serial, e_dialinginfo.number); - /* check */ - if (e_ext.number[0] == '\0') - { - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s: cannot store last dialed number '%s' because caller is unknown (not internal).\n", ea_endpoint->ep_serial, e_ext.number, e_dialinginfo.number); - return; - } - if (!(read_extension(&e_ext, e_ext.number))) - { - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s: cannot store last dialed number '%s' because cannot read settings.\n", ea_endpoint->ep_serial, e_ext.number, e_dialinginfo.number); - return; - } - if (e_dialinginfo.number[0] == '\0') - { - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s: cannot store last dialed number because nothing was dialed.\n", ea_endpoint->ep_serial, e_ext.number); - return; - } - if (!strcmp(e_dialinginfo.number, e_ext.last_out[0])) - { - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s: cannot store last dialed number '%s' because it is identical with the last one.\n", ea_endpoint->ep_serial, e_ext.number, e_dialinginfo.number); - return; - } - - /* insert */ - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s: storing last number '%s'.\n", ea_endpoint->ep_serial, e_ext.number, e_dialinginfo.number); - i = MAX_REMEMBER-1; - while(i) - { - UCPY(e_ext.last_out[i], e_ext.last_out[i-1]); - i--; - } - SCPY(e_ext.last_out[0], e_dialinginfo.number); - - /* write extension */ - write_extension(&e_ext, e_ext.number); + trace_header("ACTION hangup", DIRECTION_NONE); + end_trace(); } @@ -624,8 +660,9 @@ void EndpointAppPBX::action_dialing_login(void) return; if (!read_extension(&e_ext, extension)) { - printlog("%3d action LOGIN given extension %s doesn't exist.\n", ea_endpoint->ep_serial, extension); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): given extension %s not found.\n", ea_endpoint->ep_serial, extension); + trace_header("ACTION login (extension doesn't exist)", DIRECTION_NONE); + add_trace("extension", NULL, "%s", extension); + end_trace(); /* extension doesn't exist */ new_state(EPOINT_STATE_OUT_DISCONNECT); message_disconnect_port(portlist, CAUSE_UNALLOCATED, LOCATION_PRIVATE_LOCAL, ""); @@ -640,8 +677,9 @@ void EndpointAppPBX::action_dialing_login(void) return; if (!read_extension(&e_ext, extension)) { - printlog("%3d action LOGIN given extension %s incomplete or not found..\n", ea_endpoint->ep_serial, extension); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): extension %s incomplete or not found\n", ea_endpoint->ep_serial, extension); + trace_header("ACTION login (extension incomplete or does not exist)", DIRECTION_NONE); + add_trace("extension", NULL, "%s", extension); + end_trace(); return; } } @@ -660,12 +698,12 @@ void EndpointAppPBX::action_dialing_login(void) message->param.connectinfo.present = INFO_PRESENT_RESTRICTED; else message->param.connectinfo.present = e_ext.callerid_present; /* handle restricted caller ids */ - apply_callerid_restriction(e_ext.anon_ignore, portlist->port_type, message->param.connectinfo.id, &message->param.connectinfo.ntype, &message->param.connectinfo.present, &message->param.connectinfo.screen, message->param.connectinfo.voip, message->param.connectinfo.intern, 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.voip, message->param.connectinfo.intern, message->param.connectinfo.name)); + 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->param.connectinfo.ntype = e_ext.callerid_type; message_put(message); - logmessage(message); + logmessage(message->type, &message->param, portlist->port_id, DIRECTION_OUT); /* set our caller id */ SCPY(e_callerinfo.id, e_ext.callerid); @@ -679,15 +717,17 @@ void EndpointAppPBX::action_dialing_login(void) if (!(rparam = routeparam(e_action, PARAM_NOPASSWORD))) { /* make call state to enter password */ - printlog("%3d action LOGIN to extension %s, ask for password.\n", ea_endpoint->ep_serial, e_ext.number); + trace_header("ACTION login (ask for password)", DIRECTION_NONE); + add_trace("extension", NULL, "%s", e_ext.number); + end_trace(); new_state(EPOINT_STATE_IN_OVERLAP); e_ruleset = NULL; e_rule = NULL; e_action = &action_password; e_match_timeout = 0; e_match_to_action = NULL; - e_dialinginfo.number[0] = '\0'; - e_extdialing = strchr(e_dialinginfo.number, '\0'); + e_dialinginfo.id[0] = '\0'; + e_extdialing = strchr(e_dialinginfo.id, '\0'); /* set timeout */ e_password_timeout = now+20; @@ -702,8 +742,8 @@ void EndpointAppPBX::action_dialing_login(void) if (e_ruleset) e_rule = e_ruleset->rule_first; e_action = NULL; - e_dialinginfo.number[0] = '\0'; - e_extdialing = e_dialinginfo.number; + e_dialinginfo.id[0] = '\0'; + e_extdialing = e_dialinginfo.id; set_tone(portlist, "dialpbx"); } } @@ -719,7 +759,8 @@ void EndpointAppPBX::action_init_change_callerid(void) if (!e_ext.change_callerid) { /* service not available */ - printlog("%3d action CHANGE-CALLERID denied for this caller.\n", ea_endpoint->ep_serial); + trace_header("ACTION change-callerid (denied for this caller)", DIRECTION_NONE); + end_trace(); message_disconnect_port(portlist, CAUSE_SERVICEUNAVAIL, LOCATION_PRIVATE_LOCAL, ""); new_state(EPOINT_STATE_OUT_DISCONNECT); set_tone(portlist,"cause_87"); @@ -734,6 +775,8 @@ void EndpointAppPBX::_action_callerid_calleridnext(int next) struct port_list *portlist = ea_endpoint->ep_portlist; struct route_param *rparam; char buffer[64], *callerid; + char old_id[64] = "", new_id[64] = ""; + int old_type=0, new_type=0, old_present=0, new_present=0; if ((rparam = routeparam(e_action, PARAM_CALLERID))) { @@ -774,10 +817,12 @@ void EndpointAppPBX::_action_callerid_calleridnext(int next) } /* caller id complete, dialing with new caller id */ - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s: storing callerid '%s' for all following calls.\n", ea_endpoint->ep_serial, e_ext.number, callerid); /* write new parameters */ if (read_extension(&e_ext, e_ext.number)) { + old_present = (!next)?e_ext.callerid_present:e_ext.id_next_call_present; + old_type = (!next)?e_ext.callerid_type:e_ext.id_next_call_type; + SCPY(old_id, (!next)?e_ext.callerid:e_ext.id_next_call); if (callerid[0] == '\0') { /* no caller id */ @@ -799,11 +844,22 @@ void EndpointAppPBX::_action_callerid_calleridnext(int next) if (!next) e_ext.id_next_call_type = -1; PDEBUG(DEBUG_EPOINT, "EPOINT(%d): nationalized callerid: '%s' type=%d\n", ea_endpoint->ep_serial, (!next)?e_ext.callerid:e_ext.id_next_call, (!next)?e_ext.callerid_type:e_ext.id_next_call_type); } + new_present = (!next)?e_ext.callerid_present:e_ext.id_next_call_present; + new_type = (!next)?e_ext.callerid_type:e_ext.id_next_call_type; + SCPY(new_id, (!next)?e_ext.callerid:e_ext.id_next_call); write_extension(&e_ext, e_ext.number); } /* function activated */ - printlog("%3d action CHANGE-CALLERID caller changes caller id%s to '%s'.\n", ea_endpoint->ep_serial, next?" of next call":"", callerid); + if (next) + trace_header("ACTION change-callerid (only next call)", DIRECTION_NONE); + else + trace_header("ACTION change-callerid (all future calls)", DIRECTION_NONE); + add_trace("old", "caller id", "%s", numberrize_callerinfo(old_id, old_type)); + add_trace("old", "present", "%s", (old_present==INFO_PRESENT_RESTRICTED)?"restricted":"allowed"); + add_trace("new", "caller id", "%s", numberrize_callerinfo(new_id, new_type)); + add_trace("new", "present", "%s", (new_present==INFO_PRESENT_RESTRICTED)?"restricted":"allowed"); + end_trace(); message_disconnect_port(portlist, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL, ""); new_state(EPOINT_STATE_OUT_DISCONNECT); set_tone(portlist,"activated"); @@ -833,7 +889,8 @@ void EndpointAppPBX::action_init_change_forward(void) if (!e_ext.change_forward) { - printlog("%3d action CHANGE-FORWARD denied for this caller.\n", ea_endpoint->ep_serial); + trace_header("ACTION change-forward (denied for this caller)", DIRECTION_NONE); + end_trace(); /* service not available */ message_disconnect_port(portlist, CAUSE_SERVICEUNAVAIL, LOCATION_PRIVATE_LOCAL, ""); new_state(EPOINT_STATE_OUT_DISCONNECT); @@ -873,21 +930,30 @@ void EndpointAppPBX::action_dialing_forward(void) switch(diversion) { case INFO_DIVERSION_CFU: - printlog("%3d action CHANGE-FORWARD changing CFU (unconditional) to '%s'.\n", ea_endpoint->ep_serial, dest); + trace_header("ACTION change-forward (new CFU=unconditional)", DIRECTION_NONE); + add_trace("destin'", NULL, "%s", dest); + end_trace(); SCPY(e_ext.cfu, dest); break; case INFO_DIVERSION_CFB: - printlog("%3d action CHANGE-FORWARD changing CFB (busy) to '%s'.\n", ea_endpoint->ep_serial, dest); + trace_header("ACTION change-forward (new CFB=busy)", DIRECTION_NONE); + add_trace("destin'", NULL, "%s", dest); + end_trace(); SCPY(e_ext.cfb, dest); break; case INFO_DIVERSION_CFNR: if ((rparam = routeparam(e_action, PARAM_DELAY))) e_ext.cfnr_delay = rparam->integer_value; - printlog("%3d action CHANGE-FORWARD changing CFNR (no response) to '%s' with delay=%d.\n", ea_endpoint->ep_serial, dest, e_ext.cfnr_delay); + trace_header("ACTION change-forward (new CFNR=no response)", DIRECTION_NONE); + add_trace("destin'", NULL, "%s", dest); + add_trace("delay", NULL, "%s", e_ext.cfnr_delay); + end_trace(); SCPY(e_ext.cfnr, dest); break; case INFO_DIVERSION_CFP: - printlog("%3d action CHANGE-FORWARD changing CFP (parallel) to '%s'.\n", ea_endpoint->ep_serial, dest); + trace_header("ACTION change-forward (new CFP=parallel)", DIRECTION_NONE); + add_trace("destin'", NULL, "%s", dest); + end_trace(); SCPY(e_ext.cfp, dest); break; } @@ -912,8 +978,8 @@ void EndpointAppPBX::action_init_redial_reply(void) e_select = 0; if (!e_ext.last_out[0]) { - printlog("%3d action REDIAL/REPLY no number available to dial.\n", ea_endpoint->ep_serial); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): no stored last number.\n", ea_endpoint->ep_serial); + trace_header("ACTION redial/reply (no last number stored)", DIRECTION_NONE); + end_trace(); new_state(EPOINT_STATE_OUT_DISCONNECT); message_disconnect_port(portlist, CAUSE_SERVICEUNAVAIL, LOCATION_PRIVATE_LOCAL, ""); set_tone(portlist, "cause_3f"); @@ -969,9 +1035,15 @@ void EndpointAppPBX::_action_redial_reply(int in) if (e_extdialing[0]=='0' || e_extdialing[0]=='2') { nodisplay: - printlog("%3d action REDIAL/REPLY dialing '%s'.\n", ea_endpoint->ep_serial, last); - SCPY(e_dialinginfo.number, last); - e_extdialing = e_dialinginfo.number; + if (in) + trace_header("ACTION reply (dialing)", DIRECTION_NONE); + else + trace_header("ACTION redial (dialing)", DIRECTION_NONE); + add_trace("number", NULL, "%s", last); + add_trace("last but", NULL, "%d", e_select); + end_trace(); + SCPY(e_dialinginfo.id, last); + e_extdialing = e_dialinginfo.id; e_action = NULL; process_dialing(); return; @@ -995,7 +1067,7 @@ void EndpointAppPBX::_action_redial_reply(int in) SPRINT(message->param.notifyinfo.display, "(%d) %s", e_select+1, (last[0])?last:"- empty -"); PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s sending display:%s\n", ea_endpoint->ep_serial, e_ext.number, message->param.notifyinfo.display); message_put(message); - logmessage(message); + logmessage(message->type, &message->param, ea_endpoint->ep_portlist->port_id, DIRECTION_OUT); } /* process dialing redial @@ -1024,8 +1096,8 @@ void EndpointAppPBX::action_dialing_powerdial(void) /* power dialing only possible if we have a last dialed number */ if (!e_ext.last_out[0]) { - printlog("%3d action POWERDIAL no number available to redial.\n", ea_endpoint->ep_serial); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): no stored last number.\n", ea_endpoint->ep_serial); + trace_header("ACTION powerdial (no last number stored)", DIRECTION_NONE); + end_trace(); new_state(EPOINT_STATE_OUT_DISCONNECT); message_disconnect_port(portlist, CAUSE_SERVICEUNAVAIL, LOCATION_PRIVATE_LOCAL, ""); set_tone(portlist, "cause_3f"); @@ -1056,8 +1128,10 @@ void EndpointAppPBX::action_dialing_powerdial(void) if (e_powerdelay < 1) e_powerdelay = 0.2; - printlog("%3d action POWERDIAL to '%s' with delay=%d.\n", ea_endpoint->ep_serial, e_ext.last_out[0], (int)e_powerdelay); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): powerdialing to '%s' (delay=%d).\n", ea_endpoint->ep_serial, e_ext.last_out[0], (int)e_powerdelay); + trace_header("ACTION powerdial (dialing)", DIRECTION_NONE); + add_trace("number", NULL, "%s", e_ext.last_out[0]); + add_trace("delay", NULL, "%d", e_powerdelay); + end_trace(); /* send connect to avoid overlap timeout */ // new_state(EPOINT_STATE_CONNECT); connect may prevent further dialing @@ -1066,10 +1140,10 @@ void EndpointAppPBX::action_dialing_powerdial(void) memset(&e_connectinfo, 0, sizeof(e_connectinfo)); message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_portlist->port_id, EPOINT_TO_PORT, MESSAGE_CONNECT); message_put(message); - logmessage(message); + logmessage(message->type, &message->param, ea_endpoint->ep_portlist->port_id, DIRECTION_OUT); /* do dialing */ - SCPY(e_dialinginfo.number, e_ext.last_out[0]); + SCPY(e_dialinginfo.id, e_ext.last_out[0]); e_powerdialing = -1; /* indicates the existence of powerdialing but no redial time given */ e_powercount = 0; e_action = NULL; @@ -1090,10 +1164,11 @@ void EndpointAppPBX::action_dialing_callback(void) /* check given extension */ if (!(rparam = routeparam(e_action, PARAM_EXTENSION))) { - printlog("%3d action CALLBACK no extension was specified in routing.conf.\n", ea_endpoint->ep_serial); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): rejecting callback, because no extension was specified in routing.conf\n", ea_endpoint->ep_serial); - + noextension: + trace_header("ACTION callback (no extension defined)", DIRECTION_NONE); + end_trace(); disconnect: + new_state(EPOINT_STATE_OUT_DISCONNECT); message_disconnect_port(portlist, CAUSE_SERVICEUNAVAIL, LOCATION_PRIVATE_LOCAL, ""); set_tone(portlist, "cause_3f"); @@ -1105,26 +1180,24 @@ void EndpointAppPBX::action_dialing_callback(void) /* if extension is given */ SCPY(e_cbcaller, rparam->string_value); if (e_cbcaller[0] == '\0') - { - printlog("%3d action CALLBACK extension specified in routing.conf is an empty string.\n", ea_endpoint->ep_serial); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): rejecting callback, because given extension is an empty string.\n", ea_endpoint->ep_serial); - goto disconnect; - } + goto noextension; /* read callback extension */ memset(&cbext, 0, sizeof(cbext)); if (!read_extension(&cbext, e_cbcaller)) { - printlog("%3d action CALLBACK extension '%s' specified in routing.conf doesn't exist.\n", ea_endpoint->ep_serial, e_cbcaller); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): rejecting callback, because given extension does not exist.\n", ea_endpoint->ep_serial); + trace_header("ACTION callback (extension doesn't exist)", DIRECTION_NONE); + add_trace("extension", NULL, "%s", e_cbcaller); + end_trace(); goto disconnect; } /* if password is not given */ if (cbext.password[0] == '\0') { - printlog("%3d action CALLBACK extension '%s' has no password specified.\n", ea_endpoint->ep_serial, e_cbcaller); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): rejecting callback, because no password is available in given extension (%s).\n", ea_endpoint->ep_serial, e_cbcaller); + trace_header("ACTION callback (no password set)", DIRECTION_NONE); + add_trace("extension", NULL, "%s", e_cbcaller); + end_trace(); goto disconnect; } @@ -1133,16 +1206,19 @@ void EndpointAppPBX::action_dialing_callback(void) SCPY(e_cbto, rparam->string_value); if (e_cbto[0]) { - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): callback to given number: '%s'\n", ea_endpoint->ep_serial, e_cbto); - printlog("%3d action CALLBACK callback to given number: '%s'\n", ea_endpoint->ep_serial, e_cbto); + trace_header("ACTION callback (alternative caller id)", DIRECTION_NONE); + add_trace("extension", NULL, "%s", e_cbcaller); + add_trace("callerid", NULL, "%s", e_cbto); + end_trace(); SCPY(e_callerinfo.id, e_cbto); e_callerinfo.ntype = INFO_NTYPE_UNKNOWN; e_callerinfo.present = INFO_PRESENT_ALLOWED; } if (e_callerinfo.id[0]=='\0' || e_callerinfo.present==INFO_PRESENT_NOTAVAIL) { - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): rejecting callback, because no caller id is available\n", ea_endpoint->ep_serial); - printlog("%3d action CALLBACK not possible because caller ID is not available.\n", ea_endpoint->ep_serial); + trace_header("ACTION callback (no caller ID available)", DIRECTION_NONE); + add_trace("extension", NULL, "%s", e_cbcaller); + end_trace(); goto disconnect; } /* present id */ @@ -1170,8 +1246,12 @@ void EndpointAppPBX::action_hangup_callback(void) else SCPY(e_cbdialing, e_extdialing); - printlog("%3d action CALLBACK extension=%s callerid='%s' delay='%d' dialing after callback='%s' .\n", ea_endpoint->ep_serial, e_cbcaller, e_callerinfo.id, delay, e_cbdialing); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): caller '%s', callerid '%s', dialing '%s', delay %d\n", ea_endpoint->ep_serial, e_cbcaller, e_callerinfo.id, e_cbdialing, delay); + trace_header("ACTION callback (dialing)", DIRECTION_NONE); + add_trace("extension", NULL, "%s", e_cbcaller); + add_trace("caller id", NULL, "%s", e_callerinfo.id); + add_trace("delay", NULL, "%d", delay); + add_trace("dialing", NULL, "%s", e_cbdialing); + end_trace(); /* set time to callback */ e_callback = now_d + delay; @@ -1192,7 +1272,8 @@ void EndpointAppPBX::action_dialing_abbrev(void) /* abbrev dialing is only possible if we have a caller defined */ if (!e_ext.number[0]) { - printlog("%3d action ABBREVIATION only possible for internal callers.\n", ea_endpoint->ep_serial); + trace_header("ACTION abbreviation (only for extension)", DIRECTION_NONE); + end_trace(); new_state(EPOINT_STATE_OUT_DISCONNECT); message_disconnect_port(portlist, CAUSE_SERVICEUNAVAIL, LOCATION_PRIVATE_LOCAL, ""); set_tone(portlist, "cause_3f"); @@ -1206,7 +1287,9 @@ void EndpointAppPBX::action_dialing_abbrev(void) result = parse_phonebook(e_ext.number, &abbrev, &phone, &name); if (result == 0) { - printlog("%3d action ABBREVIATION '%s' not found.\n", ea_endpoint->ep_serial, abbrev); + trace_header("ACTION abbreviation (not found)", DIRECTION_NONE); + add_trace("abbrev", NULL, "%s", abbrev); + end_trace(); new_state(EPOINT_STATE_OUT_DISCONNECT); message_disconnect_port(portlist, CAUSE_UNALLOCATED, LOCATION_PRIVATE_LOCAL, ""); set_tone(portlist, "cause_01"); @@ -1218,9 +1301,14 @@ void EndpointAppPBX::action_dialing_abbrev(void) } /* dial abbreviation */ - printlog("%3d action ABBREVIATION mapping '%s' to '%s' (%s), dialing...\n", ea_endpoint->ep_serial, abbrev, phone, name?name:"unknown"); - SCPY(e_dialinginfo.number, phone); - e_extdialing = e_dialinginfo.number; + trace_header("ACTION abbreviation (dialing)", DIRECTION_NONE); + add_trace("abbrev", NULL, "%s", abbrev); + add_trace("number", NULL, "%s", phone); + if (name) if (name[0]) + add_trace("name", NULL, "%s", name); + end_trace(); + SCPY(e_dialinginfo.id, phone); + e_extdialing = e_dialinginfo.id; e_action = NULL; process_dialing(); } @@ -1246,33 +1334,38 @@ void EndpointAppPBX::action_dialing_test(void) switch(testcode[0]) { case '1': - printlog("%3d action TESTMODE executing 'proceeding' test.\n", ea_endpoint->ep_serial); + trace_header("ACTION test", DIRECTION_NONE); + add_trace("test", NULL, "proceeding"); + end_trace(); new_state(EPOINT_STATE_IN_PROCEEDING); set_tone(portlist, "proceeding"); message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_PROCEEDING); message_put(message); - logmessage(message); + logmessage(message->type, &message->param, portlist->port_id, DIRECTION_OUT); break; case '2': - printlog("%3d action TESTMODE executing 'alerting' test.\n", ea_endpoint->ep_serial); + trace_header("ACTION test", DIRECTION_NONE); + add_trace("test", NULL, "alerting"); + end_trace(); new_state(EPOINT_STATE_IN_ALERTING); set_tone(portlist, "ringpbx"); message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_ALERTING); message_put(message); - logmessage(message); + logmessage(message->type, &message->param, portlist->port_id, DIRECTION_OUT); break; case '3': - printlog("%3d action TESTMODE executing 'echo connect' test.\n", ea_endpoint->ep_serial); + trace_header("ACTION test", DIRECTION_NONE); + add_trace("test", NULL, "echo"); + end_trace(); new_state(EPOINT_STATE_CONNECT); if (e_ext.number[0]) e_dtmf = 1; set_tone(portlist, NULL); memset(&e_connectinfo, 0, sizeof(e_connectinfo)); SCPY(e_connectinfo.id, e_callerinfo.id); - SCPY(e_connectinfo.intern, e_callerinfo.intern); - SCPY(e_connectinfo.voip, e_callerinfo.voip); + SCPY(e_connectinfo.extension, e_callerinfo.extension); e_connectinfo.itype = e_callerinfo.itype; e_connectinfo.ntype = e_callerinfo.ntype; e_connectinfo.present = e_callerinfo.present; @@ -1280,11 +1373,11 @@ void EndpointAppPBX::action_dialing_test(void) message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_CONNECT); memcpy(&message->param.connectinfo, &e_connectinfo, sizeof(struct connect_info)); /* handle restricted caller ids */ - apply_callerid_restriction(e_ext.anon_ignore, portlist->port_type, message->param.connectinfo.id, &message->param.connectinfo.ntype, &message->param.connectinfo.present, &message->param.connectinfo.screen, message->param.connectinfo.voip, message->param.connectinfo.intern, 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.voip, message->param.connectinfo.intern, message->param.connectinfo.name)); + 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); - logmessage(message); + logmessage(message->type, &message->param, portlist->port_id, DIRECTION_OUT); port = find_port_id(portlist->port_id); if (port) @@ -1294,26 +1387,30 @@ void EndpointAppPBX::action_dialing_test(void) break; case '4': - printlog("%3d action TESTMODE executing 'tone connect' test.\n", ea_endpoint->ep_serial); + trace_header("ACTION test", DIRECTION_NONE); + add_trace("test", NULL, "tone"); + end_trace(); new_state(EPOINT_STATE_CONNECT); if (e_ext.number[0]) e_dtmf = 1; memset(&e_connectinfo, 0, sizeof(e_connectinfo)); message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_CONNECT); message_put(message); - logmessage(message); + logmessage(message->type, &message->param, portlist->port_id, DIRECTION_OUT); set_tone(portlist, "test"); break; case '5': - printlog("%3d action TESTMODE executing 'hold music' test.\n", ea_endpoint->ep_serial); + trace_header("ACTION test", DIRECTION_NONE); + add_trace("test", NULL, "hold music"); + end_trace(); new_state(EPOINT_STATE_CONNECT); if (e_ext.number[0]) e_dtmf = 1; memset(&e_connectinfo, 0, sizeof(e_connectinfo)); message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_CONNECT); message_put(message); - logmessage(message); + logmessage(message->type, &message->param, portlist->port_id, DIRECTION_OUT); set_tone(portlist, "hold"); break; @@ -1324,7 +1421,10 @@ void EndpointAppPBX::action_dialing_test(void) cause = atoi(testcode+1); if (cause > 255) cause = 0; - printlog("%3d action TESTMODE executing 'announcement' test with cause %d.\n", ea_endpoint->ep_serial, cause); + trace_header("ACTION test", DIRECTION_NONE); + add_trace("test", NULL, "announcement"); + add_trace("cause", NULL, "%d", cause); + end_trace(); new_state(EPOINT_STATE_CONNECT); if (e_ext.number[0]) e_dtmf = 1; @@ -1332,7 +1432,7 @@ void EndpointAppPBX::action_dialing_test(void) memset(&e_connectinfo, 0, sizeof(e_connectinfo)); message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_CONNECT); message_put(message); - logmessage(message); + logmessage(message->type, &message->param, portlist->port_id, DIRECTION_OUT); set_tone(portlist, causestr); break; @@ -1343,7 +1443,10 @@ void EndpointAppPBX::action_dialing_test(void) cause = atoi(testcode+1); if (cause > 127) cause = 0; - printlog("%3d action TESTMODE executing 'disconnect' test with cause %d.\n", ea_endpoint->ep_serial, cause); + trace_header("ACTION test", DIRECTION_NONE); + add_trace("test", NULL, "disconnect"); + add_trace("cause", NULL, "%d", cause); + end_trace(); new_state(EPOINT_STATE_OUT_DISCONNECT); SPRINT(causestr,"cause_%02x",cause); message_disconnect_port(portlist, cause, LOCATION_PRIVATE_LOCAL, ""); @@ -1351,27 +1454,32 @@ void EndpointAppPBX::action_dialing_test(void) break; case '8': /* release */ - printlog("%3d action TESTMODE executing 'release' test.\n", ea_endpoint->ep_serial); + trace_header("ACTION test", DIRECTION_NONE); + add_trace("test", NULL, "release"); + add_trace("cause", NULL, "16"); + end_trace(); new_state(EPOINT_STATE_OUT_DISCONNECT); message_disconnect_port(portlist, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL, ""); set_tone(portlist, "release"); break; case '9': /* text callerid test */ - printlog("%3d action TESTMODE executing 'caller id' test.\n", ea_endpoint->ep_serial); + trace_header("ACTION test", DIRECTION_NONE); + add_trace("test", NULL, "callerid"); + end_trace(); new_state(EPOINT_STATE_CONNECT); if (e_ext.number[0]) e_dtmf = 1; memset(&e_connectinfo, 0, sizeof(e_connectinfo)); SCPY(e_connectinfo.id, "12345678"); - SCPY(e_connectinfo.name, "Welcome to Linux"); - SCPY(e_connectinfo.display, "Welcome to Linux"); + SCPY(e_connectinfo.name, "Welcome to LCR"); + SCPY(e_connectinfo.display, "Welcome to LCR"); e_connectinfo.ntype = INFO_NTYPE_UNKNOWN; e_connectinfo.present = INFO_PRESENT_ALLOWED; message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_CONNECT); memcpy(&message->param.connectinfo, &e_connectinfo, sizeof(message->param.connectinfo)); message_put(message); - logmessage(message); + logmessage(message->type, &message->param, portlist->port_id, DIRECTION_OUT); set_tone(portlist, "hold"); break; } @@ -1388,8 +1496,8 @@ void EndpointAppPBX::action_init_play(void) /* check given sample */ if (!(rparam = routeparam(e_action, PARAM_SAMPLE))) { - printlog("%3d action PLAY no sample given.\n", ea_endpoint->ep_serial); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): cannot play, because no sample has been specified\n", ea_endpoint->ep_serial); + trace_header("ACTION play (no sample given)", DIRECTION_NONE); + end_trace(); disconnect: new_state(EPOINT_STATE_OUT_DISCONNECT); @@ -1402,8 +1510,8 @@ void EndpointAppPBX::action_init_play(void) /* if sample is given */ if (rparam->string_value[0] == '\0') { - printlog("%3d action PLAY sample name with empty string given.\n", ea_endpoint->ep_serial); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): cannot play, because given sample is an empty string.\n", ea_endpoint->ep_serial); + trace_header("ACTION play (no sample given)", DIRECTION_NONE); + end_trace(); goto disconnect; } @@ -1597,19 +1705,19 @@ void EndpointAppPBX::action_dialing_calculator(void) switch(mode) { case 0: /* multiply */ - UNPRINT(e_extdialing, sizeof(e_dialinginfo.number)-strlen(e_dialinginfo.number), "%.8f", sign1*value1*value2); + UNPRINT(e_extdialing, sizeof(e_dialinginfo.id)-strlen(e_dialinginfo.id), "%.8f", sign1*value1*value2); break; case 1: /* divide */ - UNPRINT(e_extdialing, sizeof(e_dialinginfo.number)-strlen(e_dialinginfo.number), "%.8f", sign1*value1/value2); + UNPRINT(e_extdialing, sizeof(e_dialinginfo.id)-strlen(e_dialinginfo.id), "%.8f", sign1*value1/value2); break; case 2: /* add */ - UNPRINT(e_extdialing, sizeof(e_dialinginfo.number)-strlen(e_dialinginfo.number), "%.8f", sign1*value1+value2); + UNPRINT(e_extdialing, sizeof(e_dialinginfo.id)-strlen(e_dialinginfo.id), "%.8f", sign1*value1+value2); break; case 3: /* substract */ - UNPRINT(e_extdialing, sizeof(e_dialinginfo.number)-strlen(e_dialinginfo.number), "%.8f", sign1*value1-value2); + UNPRINT(e_extdialing, sizeof(e_dialinginfo.id)-strlen(e_dialinginfo.id), "%.8f", sign1*value1-value2); break; } - e_dialinginfo.number[sizeof(e_dialinginfo.number)-1] = '\0'; + e_dialinginfo.id[sizeof(e_dialinginfo.id)-1] = '\0'; if (strchr(e_extdialing, '.')) /* remove zeroes */ { while (e_extdialing[strlen(e_extdialing)-1] == '0') @@ -1664,7 +1772,7 @@ void EndpointAppPBX::action_dialing_calculator(void) SPRINT(message->param.notifyinfo.display, ">%s", e_extdialing); PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s displaying interpreted dialing '%s' internal values: %f %f\n", ea_endpoint->ep_serial, e_ext.number, e_extdialing, value1, value2); message_put(message); - logmessage(message); + logmessage(message->type, &message->param, portlist->port_id, DIRECTION_OUT); } @@ -1688,8 +1796,8 @@ void EndpointAppPBX::_action_goto_menu(int mode) if (!(rparam = routeparam(e_action, PARAM_RULESET))) { no_ruleset: - printlog("%3d action GOTO/MENU no ruleset ginven in options.conf\n", ea_endpoint->ep_serial); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): no ruleset was secified for action '%s' in routing.conf\n", ea_endpoint->ep_serial, (mode)?"menu":"goto"); + trace_header("ACTION goto/menu (no ruleset given)", DIRECTION_NONE); + end_trace(); disconnect: new_state(EPOINT_STATE_OUT_DISCONNECT); @@ -1703,29 +1811,39 @@ void EndpointAppPBX::_action_goto_menu(int mode) e_ruleset = getrulesetbyname(rparam->string_value); if (!e_ruleset) { - printlog("%3d action GOTO/MENU given ruleset '%s' not found in options.conf\n", ea_endpoint->ep_serial, rparam->string_value); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): given ruleset '%s' for action '%s' was not found in routing.conf\n", ea_endpoint->ep_serial, rparam->string_value, (mode)?"menu":"goto"); + trace_header("ACTION goto/menu (ruleset not found)", DIRECTION_NONE); + add_trace("ruleset", NULL, "%s", rparam->string_value); + end_trace(); goto disconnect; } - printlog("%3d action GOTO/MENU changing to ruleset '%s'\n", ea_endpoint->ep_serial, rparam->string_value); /* if the 'menu' was selected, we will flush all digits */ if (mode) { - //SCPY(e_dialinginfo.number, e_extdialing); - e_dialinginfo.number[0] = 0; - e_extdialing = e_dialinginfo.number; + e_dialinginfo.id[0] = 0; + e_extdialing = e_dialinginfo.id; } else { + /* remove digits that are required to match the rule */ + if ((rparam = routeparam(e_action, PARAM_STRIP))) + { + if (e_extdialing) + SCPY(e_dialinginfo.id, e_extdialing); + e_extdialing = e_dialinginfo.id; + } } /* play sample */ + trace_header("ACTION goto/menu (change to)", DIRECTION_NONE); + add_trace("ruleset", NULL, "%s", e_ruleset->name); + if (e_dialinginfo.id[0]) + add_trace("dialing", NULL, "%s", e_dialinginfo.id); if ((rparam = routeparam(e_action, PARAM_SAMPLE))) { - printlog("%3d action GOTO/MENU start playing sample '%s'\n", ea_endpoint->ep_serial, rparam->string_value); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): playing sample '%s'\n", ea_endpoint->ep_serial, rparam->string_value); + add_trace("sample", NULL, "%s", rparam->string_value); set_tone(ea_endpoint->ep_portlist, rparam->string_value); } + end_trace(); /* do dialing with new ruleset */ e_action = NULL; @@ -1790,7 +1908,14 @@ void EndpointAppPBX::action_dialing_disconnect(void) } /* disconnect only if connect parameter is not given */ - printlog("%3d action DISCONNECT with cause %d, location %d, sample '%s', display '%s'\n", ea_endpoint->ep_serial, cause, location, cause_string, display); + trace_header("ACTION disconnect", DIRECTION_NONE); + add_trace("cause", "value", "%d", cause); + add_trace("cause", "location", "%d", location); + if (cause_string[0]) + add_trace("sample", NULL, "%s", cause_string); + if (display[0]) + add_trace("display", NULL, "%s", display); + end_trace(); new_state(EPOINT_STATE_OUT_DISCONNECT); set_tone(portlist, cause_string); if (!(rparam = routeparam(e_action, PARAM_CONNECT))) @@ -1801,7 +1926,7 @@ void EndpointAppPBX::action_dialing_disconnect(void) message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_portlist->port_id, EPOINT_TO_PORT, MESSAGE_NOTIFY); SCPY(message->param.notifyinfo.display, display); message_put(message); - logmessage(message); + logmessage(message->type, &message->param, ea_endpoint->ep_portlist->port_id, DIRECTION_OUT); } e_action = NULL; } @@ -1815,7 +1940,7 @@ void EndpointAppPBX::action_dialing_help(void) /* show all things that would match */ #if 0 struct numbering *numbering = numbering_int; - char dialing[sizeof(e_dialinginfo.number)]; + char dialing[sizeof(e_dialinginfo.id)]; int i; struct message *message; struct route_param *rparam; @@ -1825,15 +1950,15 @@ void EndpointAppPBX::action_dialing_help(void) return; /* scroll menu */ - if (strchr(e_dialinginfo.number,'*')) + if (strchr(e_dialinginfo.id,'*')) { e_menu--; - e_dialinginfo.number[0] = '\0'; + e_dialinginfo.id[0] = '\0'; } - if (strchr(e_dialinginfo.number,'#')) + if (strchr(e_dialinginfo.id,'#')) { e_menu++; - e_dialinginfo.number[0] = '\0'; + e_dialinginfo.id[0] = '\0'; } /* get position in menu */ @@ -1864,15 +1989,15 @@ void EndpointAppPBX::action_dialing_help(void) } /* if we dial something else we need to add the prefix and change the action */ - if (e_dialinginfo.number[0]) + if (e_dialinginfo.id[0]) { e_action = NUMB_ACTION_NONE; SCPY(dialing, numbering->prefix); //we ignore the first digit after selecting - //SCAT(dialing, e_dialinginfo.number); - SCPY(e_dialinginfo.number, dialing); - e_extdialing = e_dialinginfo.number+strlen(numbering->prefix); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s selected a new menu '%s' dialing: %s\n", ea_endpoint->ep_serial, e_ext.number, numb_actions[numbering->action], e_dialinginfo.number); + //SCAT(dialing, e_dialinginfo.id); + SCPY(e_dialinginfo.id, dialing); + e_extdialing = e_dialinginfo.id+strlen(numbering->prefix); + PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s selected a new menu '%s' dialing: %s\n", ea_endpoint->ep_serial, e_ext.number, numb_actions[numbering->action], e_dialinginfo.id); nesting?: process_dialing(); return; @@ -1883,7 +2008,7 @@ nesting?: SPRINT(message->param.notifyinfo.display, ">%s %s%s%s", numbering->prefix, numb_actions[numbering->action], (numbering->param[0])?" ":"", numbering->param); PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s selected a new menu '%s' sending display:%s\n", ea_endpoint->ep_serial, e_ext.number, numb_actions[numbering->action], message->param.notifyinfo.display); message_put(message); - logmessage(message); + logmessage(message->type, message->paramea_endpoint->ep_portlist->port_id, DIRECTION_OUT); #endif } @@ -1911,7 +2036,7 @@ void EndpointAppPBX::action_hangup_execute(void) { struct route_param *rparam; char *command = "", isdn_port[10]; - char *argv[8+1]; /* check also number of args below */ + char *argv[7+1]; /* check also number of args below */ int i = 0; /* get script / command */ @@ -1919,12 +2044,13 @@ void EndpointAppPBX::action_hangup_execute(void) command = rparam->string_value; if (command[0] == '\0') { - printlog("%3d action EXECUTE no 'execute' parameter given at routing.conf.\n", ea_endpoint->ep_serial); - PERROR("EPOINT(%d): terminal %s: NO PARAMETER GIVEN for 'execute' action. see routing.conf\n", ea_endpoint->ep_serial, e_ext.number); + trace_header("ACTION execute (no parameter given)", DIRECTION_NONE); + end_trace(); return; } - printlog("%3d action EXECUTE command='%s'\n", ea_endpoint->ep_serial, command); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s: executing '%s'.\n", ea_endpoint->ep_serial, e_ext.number, command); + trace_header("ACTION execute", DIRECTION_NONE); + add_trace("command", NULL, "%s", command); + end_trace(); argv[0] = command; while(strchr(argv[0], '/')) @@ -1936,12 +2062,11 @@ void EndpointAppPBX::action_hangup_execute(void) } argv[1+i] = e_extdialing; argv[2+i] = numberrize_callerinfo(e_callerinfo.id, e_callerinfo.ntype); - argv[3+i] = e_callerinfo.intern; - argv[4+i] = e_callerinfo.voip; - argv[5+i] = e_callerinfo.name; + argv[3+i] = e_callerinfo.extension; + argv[4+i] = e_callerinfo.name; SPRINT(isdn_port, "%d", e_callerinfo.isdn_port); - argv[6+i] = isdn_port; - argv[7+i] = NULL; /* check also number of args above */ + argv[5+i] = isdn_port; + argv[6+i] = NULL; /* check also number of args above */ execve("/bin/sh", argv, environ); } @@ -1970,18 +2095,23 @@ void EndpointAppPBX::action_hangup_file(void) mode = "w"; if (file[0] == '\0') { - printlog("%3d action FILE no filename given.\n", ea_endpoint->ep_serial); - PERROR("EPOINT(%d): terminal %s: NO FILENAME GIVEN for 'file' action. see routing.conf\n", ea_endpoint->ep_serial, e_ext.number); + trace_header("ACTION file (no filename given)", DIRECTION_NONE); + end_trace(); return; } if (!(fp = fopen(file, mode))) { - printlog("%3d action FILE file '%s' cannot be opened. (errno = %d)\n", ea_endpoint->ep_serial, file, errno); - PERROR("EPOINT(%d): terminal %s: given file '%s' cannot be opened. see routing.conf\n", ea_endpoint->ep_serial, e_ext.number, file); + trace_header("ACTION file (failed to open)", DIRECTION_NONE); + add_trace("file", "name", "%s", file); + add_trace("file", "mode", "%s", (mode[0]=='w')?"write":"append"); + end_trace(); return; } - printlog("%3d action FILE file='%s' content='%s'\n", ea_endpoint->ep_serial, file, content); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s: writing file '%s' with content '%s'.\n", ea_endpoint->ep_serial, e_ext.number, file, content); + trace_header("ACTION file", DIRECTION_NONE); + add_trace("file", "name", "%s", file); + add_trace("file", "mode", "%s", (mode[0]=='w')?"write":"append"); + add_trace("content", NULL, "%s", content); + end_trace(); fprintf(fp, "%s\n", content); fclose(fp); } @@ -1998,8 +2128,11 @@ void EndpointAppPBX::action_init_pick(void) if ((rparam = routeparam(e_action, PARAM_EXTENSIONS))) extensions = rparam->string_value; - printlog("%3d action PICK\n", ea_endpoint->ep_serial); - pick_call(extensions); + trace_header("ACTION pick", DIRECTION_NONE); + if (extensions) if (extensions[0]) + add_trace("extensions", NULL, "%s", extensions); + end_trace(); + pick_join(extensions); } @@ -2029,8 +2162,9 @@ void EndpointAppPBX::action_dialing_password(void) /* check the password */ if (e_ext.password[0]=='\0' || (strlen(e_ext.password)==strlen(e_extdialing) && !!strcmp(e_ext.password,e_extdialing))) { - printlog("%3d action PASSWORD WRITE password wrong\n", ea_endpoint->ep_serial); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): password wrong %s\n", ea_endpoint->ep_serial, e_extdialing); + trace_header("ACTION password_write (wrong password)", DIRECTION_NONE); + add_trace("dialed", NULL, "%s", e_extdialing); + end_trace(); e_connectedmode = 0; e_dtmf = 0; new_state(EPOINT_STATE_OUT_DISCONNECT); @@ -2044,7 +2178,9 @@ void EndpointAppPBX::action_dialing_password(void) if (e_action->index == ACTION_PASSWORD_WRITE) { append_callbackauth(e_ext.number, &e_callbackinfo); - printlog("%3d action PASSWORD WRITE password written\n", ea_endpoint->ep_serial); + trace_header("ACTION password_write (written)", DIRECTION_NONE); + add_trace("dialed", NULL, "%s", e_extdialing); + end_trace(); } /* make call state */ @@ -2053,8 +2189,8 @@ void EndpointAppPBX::action_dialing_password(void) if (e_ruleset) e_rule = e_ruleset->rule_first; e_action = NULL; - e_dialinginfo.number[0] = '\0'; - e_extdialing = e_dialinginfo.number; + e_dialinginfo.id[0] = '\0'; + e_extdialing = e_dialinginfo.id; set_tone(portlist, "dialpbx"); } @@ -2094,7 +2230,9 @@ void EndpointAppPBX::process_dialing(void) /* check nesting levels */ if (++e_rule_nesting > RULE_NESTING) { - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): rules are nesting too deep. (%d levels) check for infinite loops in routing.conf\n", ea_endpoint->ep_serial, e_rule_nesting); + trace_header("ACTION (nesting too deep)", DIRECTION_NONE); + add_trace("max-levels", NULL, "%d", RULE_NESTING); + end_trace(); new_state(EPOINT_STATE_OUT_DISCONNECT); message_disconnect_port(portlist, CAUSE_UNSPECIFIED, LOCATION_PRIVATE_LOCAL, ""); set_tone(portlist, "cause_3f"); @@ -2120,7 +2258,7 @@ void EndpointAppPBX::process_dialing(void) release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL); goto end; } - release(RELEASE_CALL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL, 0); + release(RELEASE_JOIN, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, 0, 0); e_action = e_action->next; if (!e_action) { @@ -2131,7 +2269,6 @@ void EndpointAppPBX::process_dialing(void) set_tone(portlist, "cause_3f"); goto end; } - PDEBUG(DEBUG_ROUTE|DEBUG_EPOINT, "EPOINT(%d): continueing with action '%s'.\n", ea_endpoint->ep_serial, action_defs[e_action->index].name); goto action_timeout; } @@ -2146,13 +2283,13 @@ void EndpointAppPBX::process_dialing(void) #if 0 /* check if we do menu selection */ - if (e_action==NUMB_ACTION_NONE && (e_dialinginfo.number[0]=='*' || e_dialinginfo.number[0]=='#')) + if (e_action==NUMB_ACTION_NONE && (e_dialinginfo.id[0]=='*' || e_dialinginfo.id[0]=='#')) /* do menu selection */ if (e_ext.display_menu) { if (portlist->port_type==PORT_TYPE_DSS1_NT_IN || portlist->port_type==PORT_TYPE_DSS1_NT_OUT) /* only if the dialing terminal is an isdn telephone connected to an internal port */ { - e_dialinginfo.number[0] = '\0'; + e_dialinginfo.id[0] = '\0'; e_action = NUMB_ACTION_MENU; e_menu = 0; process_dialing(); @@ -2170,7 +2307,7 @@ void EndpointAppPBX::process_dialing(void) SCPY(message->param.notifyinfo.display,get_isdn_cause(LOCATION_PRIVATE_LOCAL, epoint->e_ext.display_cause, param->disconnectinfo.location, param->disconnectinfo.cause)); } message_put(message); - logmessage(message); + logmessage(message->type, message->param, portlist->port_id, DIRECTION_OUT); } new_state(EPOINT_STATE_OUT_DISCONNECT); set_tone(portlist,"cause_1c"); @@ -2187,30 +2324,30 @@ void EndpointAppPBX::process_dialing(void) e_select = 0; /* check for external call */ - if (!strncmp(e_dialinginfo.number, "extern:", 7)) + if (!strncmp(e_dialinginfo.id, "extern:", 7)) { - e_extdialing = e_dialinginfo.number+7; + e_extdialing = e_dialinginfo.id+7; e_action = &action_external; goto process_action; } /* check for internal call */ - if (!strncmp(e_dialinginfo.number, "intern:", 7)) + if (!strncmp(e_dialinginfo.id, "intern:", 7)) { - e_extdialing = e_dialinginfo.number+7; + e_extdialing = e_dialinginfo.id+7; e_action = &action_internal; goto process_action; } /* check for chan call */ - if (!strncmp(e_dialinginfo.number, "chan:", 5)) + if (!strncmp(e_dialinginfo.id, "remote:", 7)) { - e_extdialing = e_dialinginfo.number+4; - e_action = &action_chan; + e_extdialing = e_dialinginfo.id+7; + e_action = &action_remote; goto process_action; } /* check for vbox call */ - if (!strncmp(e_dialinginfo.number, "vbox:", 5)) + if (!strncmp(e_dialinginfo.id, "vbox:", 5)) { - e_extdialing = e_dialinginfo.number+5; + e_extdialing = e_dialinginfo.id+5; e_action = &action_vbox; goto process_action; } @@ -2218,27 +2355,37 @@ void EndpointAppPBX::process_dialing(void) if (e_match_timeout && now_d>=e_match_timeout) { /* return timeout rule */ - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal '%s' dialing: '%s', timeout in ruleset '%s'\n", ea_endpoint->ep_serial, e_ext.number, e_dialinginfo.number, e_ruleset->name); + PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal '%s' dialing: '%s', timeout in ruleset '%s'\n", ea_endpoint->ep_serial, e_ext.number, e_dialinginfo.id, e_ruleset->name); e_match_timeout = 0; e_action = e_match_to_action; e_extdialing = e_match_to_extdialing; - printlog("%3d routing TIMEOUT processing action '%s' (line %d)\n", ea_endpoint->ep_serial, action_defs[e_action->index].name, e_action->line); - + trace_header("ROUTING (timeout)", DIRECTION_NONE); + add_trace("action", NULL, "%s", action_defs[e_action->index].name); + add_trace("line", NULL, "%d", e_action->line); + end_trace(); } else { //PDEBUG(~0, "HANG-BUG-DEBUGGING: before routing\n"); /* check for matching rule */ - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal '%s' dialing: '%s', checking matching rule of ruleset '%s'\n", ea_endpoint->ep_serial, e_ext.number, e_dialinginfo.number, e_ruleset->name); + PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal '%s' dialing: '%s', checking matching rule of ruleset '%s'\n", ea_endpoint->ep_serial, e_ext.number, e_dialinginfo.id, e_ruleset->name); if (e_ruleset) { e_action = route(e_ruleset); if (e_action) - printlog("%3d routing MATCH processing action '%s' (line %d)\n", ea_endpoint->ep_serial, action_defs[e_action->index].name, e_action->line); + { + trace_header("ACTION (match)", DIRECTION_NONE); + add_trace("action", NULL, "%s", action_defs[e_action->index].name); + add_trace("line", NULL, "%d", e_action->line); + end_trace(); + } } else { e_action = &action_disconnect; if (e_action) - printlog("%3d routing NO MAIN RULESET, DISCONNECTING! '%s'\n", ea_endpoint->ep_serial, action_defs[e_action->index].name); + { + trace_header("ACTION (no main ruleset, disconnecting)", DIRECTION_NONE); + end_trace(); + } } //PDEBUG(~0, "HANG-BUG-DEBUGGING: after routing\n"); } @@ -2270,7 +2417,7 @@ void EndpointAppPBX::process_dialing(void) memset(&e_connectinfo, 0, sizeof(e_connectinfo)); message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_CONNECT); message_put(message); - logmessage(message); + logmessage(message->type, &message->param, portlist->port_id, DIRECTION_OUT); } else if ((rparam = routeparam(e_action, PARAM_ALERTING))) { @@ -2278,7 +2425,7 @@ void EndpointAppPBX::process_dialing(void) memset(&e_connectinfo, 0, sizeof(e_connectinfo)); message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_ALERTING); message_put(message); - logmessage(message); + logmessage(message->type, &message->param, portlist->port_id, DIRECTION_OUT); } else if ((rparam = routeparam(e_action, PARAM_PROCEEDING))) { @@ -2286,7 +2433,7 @@ void EndpointAppPBX::process_dialing(void) memset(&e_connectinfo, 0, sizeof(e_connectinfo)); message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_PROCEEDING); message_put(message); - logmessage(message); + logmessage(message->type, &message->param, portlist->port_id, DIRECTION_OUT); } if (action_defs[e_action->index].init_func) @@ -2333,7 +2480,7 @@ void EndpointAppPBX::process_dialing(void) if (!e_action) { - SPRINT(message->param.notifyinfo.display, "> %s", e_dialinginfo.number); + SPRINT(message->param.notifyinfo.display, "> %s", e_dialinginfo.id); } else { SPRINT(message->param.notifyinfo.display, "%s%s%s", action_defs[e_action->index].name, (e_extdialing[0])?" ":"", e_extdialing); @@ -2341,7 +2488,7 @@ void EndpointAppPBX::process_dialing(void) PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s displaying interpreted dialing '%s'\n", ea_endpoint->ep_serial, e_ext.number, message->param.notifyinfo.display); message_put(message); - logmessage(message); + logmessage(message->type, &message->param, portlist->port_id, DIRECTION_OUT); } end: @@ -2369,20 +2516,20 @@ void EndpointAppPBX::process_hangup(int cause, int location) } else if (!e_stop) time(&e_stop); - PDEBUG(DEBUG_EPOINT, "EPOINT(%d): writing connect from %s to %s into logfile of %s\n", ea_endpoint->ep_serial, e_callerinfo.id, e_dialinginfo.number, e_ext.number); + PDEBUG(DEBUG_EPOINT, "EPOINT(%d): writing connect from %s to %s into logfile of %s\n", ea_endpoint->ep_serial, e_callerinfo.id, e_dialinginfo.id, e_ext.number); switch(e_dialinginfo.itype) { case INFO_ITYPE_CHAN: - SPRINT(dialingtext, "chan:%s", e_dialinginfo.number); + SPRINT(dialingtext, "chan:%s", e_dialinginfo.id); break; - case INFO_ITYPE_INTERN: - SPRINT(dialingtext, "intern:%s", e_dialinginfo.number); + case INFO_ITYPE_ISDN_EXTENSION: + SPRINT(dialingtext, "intern:%s", e_dialinginfo.id); break; case INFO_ITYPE_VBOX: - SPRINT(dialingtext, "vbox:%s", e_dialinginfo.number); + SPRINT(dialingtext, "vbox:%s", e_dialinginfo.id); break; default: - SPRINT(dialingtext, "%s", e_dialinginfo.number); + SPRINT(dialingtext, "%s", e_dialinginfo.id); } if (e_callerinfo.id[0]) @@ -2392,18 +2539,17 @@ void EndpointAppPBX::process_hangup(int cause, int location) /* allpy restriction */ if (!e_ext.anon_ignore && e_callerinfo.present==INFO_PRESENT_RESTRICTED) SPRINT(callertext, "anonymous"); - if (e_callerinfo.intern[0]) /* add intern if present */ - UNPRINT(strchr(callertext,'\0'), sizeof(callertext)-1+strlen(callertext), " (intern %s)", e_callerinfo.intern); - if (e_callerinfo.voip[0]) /* add voip if present */ - UNPRINT(strchr(callertext,'\0'), sizeof(callertext)-1+strlen(callertext), " (voip %s)", e_callerinfo.voip); + if (e_callerinfo.extension[0]) /* add intern if present */ + UNPRINT(strchr(callertext,'\0'), sizeof(callertext)-1+strlen(callertext), " (intern %s)", e_callerinfo.extension); write_log(e_ext.number, callertext, dialingtext, e_start, e_stop, 0, cause, location); /* store last received call for reply-list */ - if (e_callerinfo.id[0] || e_callerinfo.intern[0]) + if (e_origin == 1) // outgoing to phone is incomming for user + if (e_callerinfo.id[0] || e_callerinfo.extension[0]) if (e_ext.anon_ignore || e_callerinfo.present!=INFO_PRESENT_RESTRICTED) { - if (e_callerinfo.intern[0]) - SPRINT(callertext, "intern:%s", e_callerinfo.intern); + if (e_callerinfo.extension[0]) + SPRINT(callertext, "intern:%s", e_callerinfo.extension); else SPRINT(callertext, "extern:%s", numberrize_callerinfo(e_callerinfo.id, e_callerinfo.ntype)); if (!!strcmp(callertext, e_ext.last_in[0])) @@ -2420,8 +2566,26 @@ void EndpointAppPBX::process_hangup(int cause, int location) } else PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s: cannot store last received id '%s' because it is identical with the last one.\n", ea_endpoint->ep_serial, e_ext.number, callertext); } - } + /* store last made call for reply-list */ + if (e_origin == 0) // incomming from phone is outgoing for user + if (e_dialinginfo.id[0]) + { + if (!!strcmp(e_dialinginfo.id, e_ext.last_out[0])) + { + i = MAX_REMEMBER-1; + while(i) + { + UCPY(e_ext.last_out[i], e_ext.last_out[i-1]); + i--; + } + SCPY(e_ext.last_out[0], e_dialinginfo.id); + writeext |= 1; /* store extension later */ + PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s: storing last number '%s'.\n", ea_endpoint->ep_serial, e_ext.number, e_dialinginfo.id); + } else + PDEBUG(DEBUG_EPOINT, "EPOINT(%d): terminal %s: cannot store last number '%s' because it is identical with the last one.\n", ea_endpoint->ep_serial, e_ext.number, e_dialinginfo.id); + } + } /* write extension if needed */ if (writeext == 0x11) write_extension(&e_ext, e_ext.number);