X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=vbox.cpp;h=158a11302244c5595bc658ad2825782ed45285d6;hp=a1f371a1d9e544bed7310d67b0362a08ad55dd01;hb=6f1ac87333108b84a083eedb89ee3eb3d9f4497b;hpb=a17752d887eb9eb975dce3453ab3d176a2818cb1 diff --git a/vbox.cpp b/vbox.cpp index a1f371a..158a113 100644 --- a/vbox.cpp +++ b/vbox.cpp @@ -1,6 +1,6 @@ /*****************************************************************************\ ** ** -** PBX4Linux ** +** Linux Call Router ** ** ** **---------------------------------------------------------------------------** ** Copyright: Andreas Eversberg ** @@ -13,16 +13,6 @@ ** ** \*****************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "main.h" /* note: recording log is written at endpoint */ @@ -55,14 +45,28 @@ VBoxPort::~VBoxPort() } +static void vbox_trace_header(class VBoxPort *vbox, const char *message, int direction) +{ + /* init trace with given values */ + start_trace(-1, + NULL, + vbox?numberrize_callerinfo(vbox->p_callerinfo.id, vbox->p_callerinfo.ntype, options.national, options.international):NULL, + vbox?vbox->p_dialinginfo.id:NULL, + direction, + CATEGORY_CH, + vbox?vbox->p_serial:0, + message); +} + + /* * handler of vbox */ int VBoxPort::handler(void) { - struct message *message; - unsigned long tosend; - unsigned char buffer[ISDN_TRANSMIT<<3]; + struct lcr_msg *message; + unsigned int tosend; + unsigned char buffer[ISDN_TRANSMIT]; time_t currenttime; class Endpoint *epoint; int ret; @@ -82,6 +86,10 @@ int VBoxPort::handler(void) message->param.disconnectinfo.cause = 16; message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; message_put(message); + vbox_trace_header(this, "RELEASE from VBox (recoding limit reached)", DIRECTION_IN); + add_trace("cause", "value", "%d", message->param.disconnectinfo.cause); + add_trace("cause", "location", "%d", message->param.disconnectinfo.location); + end_trace(); /* remove epoint */ free_epointlist(p_epointlist); } @@ -99,7 +107,7 @@ int VBoxPort::handler(void) } /* calculate the number of bytes */ - tosend = (unsigned long)((now_d-p_vbox_audio_start)*8000) - p_vbox_audio_transferred; + tosend = (unsigned int)((now_d-p_vbox_audio_start)*8000) - p_vbox_audio_transferred; /* wait for more */ if (tosend < sizeof(buffer)) @@ -134,6 +142,8 @@ int VBoxPort::handler(void) message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_CONNECT); memcpy(&message->param.connectinfo, &p_connectinfo, sizeof(struct connect_info)); message_put(message); + vbox_trace_header(this, "CONNECT from VBox (announcement is over)", DIRECTION_IN); + end_trace(); new_state(PORT_STATE_CONNECT); } } @@ -141,9 +151,10 @@ int VBoxPort::handler(void) /* start recording, if not already */ if (p_vbox_mode == VBOX_MODE_NORMAL) { - /* send recording start message */ - message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_VBOX_RECORD); - message_put(message); + /* recording start */ + open_record(p_vbox_ext.vbox_codec, 2, 0, p_vbox_ext.number, p_vbox_ext.anon_ignore, p_vbox_ext.vbox_email, p_vbox_ext.vbox_email_file); + vbox_trace_header(this, "RECORDING (announcement is over)", DIRECTION_IN); + end_trace(); } else // else!! if (p_vbox_mode == VBOX_MODE_ANNOUNCEMENT) { @@ -152,15 +163,19 @@ int VBoxPort::handler(void) message->param.disconnectinfo.cause = 16; message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; message_put(message); + vbox_trace_header(this, "RELEASE from VBox (after annoucement)", DIRECTION_IN); + add_trace("cause", "value", "%d", message->param.disconnectinfo.cause); + add_trace("cause", "location", "%d", message->param.disconnectinfo.location); + end_trace(); /* recording is close during destruction */ delete this; return(-1); /* must return because port is gone */ } } else { + if (p_record) + record(buffer, tosend, 0); // from down message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_DATA); - message->param.data.port_type = p_type; - message->param.data.port_id = p_serial; message->param.data.len = tosend; memcpy(message->param.data.data, buffer, tosend); message_put(message); @@ -174,12 +189,11 @@ int VBoxPort::handler(void) /* * endpoint sends messages to the vbox port */ -int VBoxPort::message_epoint(unsigned long epoint_id, int message_id, union parameter *param) +int VBoxPort::message_epoint(unsigned int epoint_id, int message_id, union parameter *param) { - struct message *message; + struct lcr_msg *message; class Endpoint *epoint; char filename[256], *c; - class EndpointAppPBX *eapp; if (Port::message_epoint(epoint_id, message_id, param)) return(1); @@ -193,10 +207,16 @@ int VBoxPort::message_epoint(unsigned long epoint_id, int message_id, union para switch(message_id) { - case MESSAGE_DISCONNECT: /* call has been disconnected */ - PDEBUG(DEBUG_VBOX, "PORT(%s) vbox port with (caller id %s) received disconnect cause=%d\n", p_name, p_callerinfo.id, param->disconnectinfo.cause); + case MESSAGE_DATA: + record(param->data.data, param->data.len, 1); // from up + return(1); + case MESSAGE_DISCONNECT: /* call has been disconnected */ new_state(PORT_STATE_OUT_DISCONNECT); + vbox_trace_header(this, "DISCONNECT to VBox", DIRECTION_OUT); + add_trace("cause", "value", "%d", param->disconnectinfo.cause); + add_trace("cause", "location", "%d", param->disconnectinfo.location); + end_trace(); while(p_epointlist) { @@ -204,6 +224,10 @@ int VBoxPort::message_epoint(unsigned long epoint_id, int message_id, union para message->param.disconnectinfo.cause = CAUSE_NORMAL; message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; message_put(message); + vbox_trace_header(this, "RELEASE from VBox (after disconnect)", DIRECTION_IN); + add_trace("cause", "value", "%d", message->param.disconnectinfo.cause); + add_trace("cause", "location", "%d", message->param.disconnectinfo.location); + end_trace(); /* remove epoint */ free_epointlist(p_epointlist); } @@ -213,7 +237,10 @@ int VBoxPort::message_epoint(unsigned long epoint_id, int message_id, union para break; case MESSAGE_RELEASE: /* release vbox port */ - PDEBUG(DEBUG_VBOX, "PORT(%s) vbox port with (caller id %s) received release\n", p_name, p_callerinfo.id); + vbox_trace_header(this, "RELEASE to VBox", DIRECTION_OUT); + add_trace("cause", "value", "%d", param->disconnectinfo.cause); + add_trace("cause", "location", "%d", param->disconnectinfo.location); + end_trace(); /* we are done */ /* recording is close during destruction */ @@ -223,9 +250,9 @@ int VBoxPort::message_epoint(unsigned long epoint_id, int message_id, union para case MESSAGE_SETUP: /* dial-out command received from epoint, answer with connect */ /* get apppbx */ - memcpy(&p_vbox_ext, ((class EndpointAppPBX *)(epoint->ep_app))->e_ext, sizeof(p_vbox_ext)); + memcpy(&p_vbox_ext, &((class EndpointAppPBX *)(epoint->ep_app))->e_ext, sizeof(p_vbox_ext)); /* extract optional announcement file */ - if ((c = strchr(param->setup.dialinginfo.number, ','))) + if ((c = strchr(param->setup.dialinginfo.id, ','))) { if (c[1] == '/') SPRINT(filename, c+1); @@ -236,23 +263,20 @@ int VBoxPort::message_epoint(unsigned long epoint_id, int message_id, union para { SPRINT(filename, "%s/%s/%s/vbox/announcement", INSTALL_DATA, options.extensions_dir, p_vbox_ext.number); } - PDEBUG(DEBUG_VBOX, "PORT(%s) vbox port received setup from '%s' to '%s'\n", p_name, param->setup.callerinfo.id, param->setup.dialinginfo.number); + vbox_trace_header(this, "SETUP to VBox", DIRECTION_OUT); + add_trace("from", "id", "%s", param->setup.callerinfo.id); + add_trace("to", "box", "%s", param->setup.dialinginfo.id); + end_trace(); + memcpy(&p_dialinginfo, ¶m->setup.dialinginfo, sizeof(p_dialinginfo)); memcpy(&p_callerinfo, ¶m->setup.callerinfo, sizeof(p_callerinfo)); memcpy(&p_redirinfo, ¶m->setup.redirinfo, sizeof(p_redirinfo)); /* link relation */ if (p_epointlist) - { - PERROR("PORT(%s) software error: epoint pointer is set in idle state, how bad!! exitting.\n", p_name); - exit(-1); - } - if (!(epointlist_new(epoint_id))) - { - PERROR("no memory for epointlist\n"); - exit(-1); - } + FATAL("PORT(%s) Epoint pointer is set in idle state, how bad!!\n", p_name); + epointlist_new(epoint_id); /* copy setup infos to port */ - SCPY(p_vbox_extension, param->setup.dialinginfo.number); + SCPY(p_vbox_extension, param->setup.dialinginfo.id); /* create connect info */ SCPY(p_connectinfo.id, p_vbox_extension); @@ -267,29 +291,37 @@ int VBoxPort::message_epoint(unsigned long epoint_id, int message_id, union para message = message_create(p_serial, epoint_id, PORT_TO_EPOINT, MESSAGE_CONNECT); memcpy(&message->param.connectinfo, &p_connectinfo, sizeof(struct connect_info)); message_put(message); + vbox_trace_header(this, "CONNECT from VBox (after setup)", DIRECTION_IN); + end_trace(); new_state(PORT_STATE_CONNECT); } else { /* send alerting message */ message = message_create(p_serial, epoint_id, PORT_TO_EPOINT, MESSAGE_ALERTING); message_put(message); + vbox_trace_header(this, "ALERTING from VBox (play announcement before connect)", DIRECTION_IN); + end_trace(); new_state(PORT_STATE_IN_ALERTING); } - /* start recording during announcement */ - /* start parallel recording if desired */ - p_vbox_mode = p_vbox_ext.vbox_mode; - p_vbox_record_limit = p_vbox_ext.vbox_time; /* play the announcement */ if ((p_vbox_announce_fh = open_tone(filename, &p_vbox_announce_codec, &p_vbox_announce_size, &p_vbox_announce_left)) >= 0) { fhuse++; } - if (!p_vbox_announce_fh || p_vbox_mode==VBOX_MODE_PARALLEL) + vbox_trace_header(this, "ANNOUNCEMENT", DIRECTION_OUT); + add_trace("file", "name", "%s", filename); + add_trace("file", "exists", "%s", (p_vbox_announce_fh>=0)?"yes":"no"); + end_trace(); + /* start recording if desired */ + p_vbox_mode = p_vbox_ext.vbox_mode; + p_vbox_record_limit = p_vbox_ext.vbox_time; + if (p_vbox_announce_fh<0 || p_vbox_mode==VBOX_MODE_PARALLEL) { - PDEBUG(DEBUG_VBOX, "PORT(%s) parallel mode OR no announcement found at: '%s' so we start recording now.\n", p_name, filename); /* recording start */ open_record(p_vbox_ext.vbox_codec, 2, 0, p_vbox_ext.number, p_vbox_ext.anon_ignore, p_vbox_ext.vbox_email, p_vbox_ext.vbox_email_file); + vbox_trace_header(this, "RECORDING", DIRECTION_IN); + end_trace(); } break;