X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=vbox.cpp;h=d0f124dfc5f91f144265be4d73964f3c92fc8e4f;hp=2a9696236b2b9f83de380ef28faad858341c050c;hb=1ace98e214e20173f027f50abac2546159735e59;hpb=2ed0fee489c37a6e2d4473f6185ebbe3e746ac11 diff --git a/vbox.cpp b/vbox.cpp index 2a96962..d0f124d 100644 --- a/vbox.cpp +++ b/vbox.cpp @@ -62,9 +62,13 @@ int VBoxPort::handler(void) { struct message *message; unsigned long tosend; - signed short buffer[128<<1]; + unsigned char buffer[ISDN_TRANSMIT<<3]; time_t currenttime; class Endpoint *epoint; + int ret; + + if ((ret = Port::handler())) + return(ret); if (p_vbox_record_start && p_vbox_record_limit) { @@ -87,126 +91,83 @@ int VBoxPort::handler(void) } } + /* set time the first time */ if (p_vbox_audio_start < 1) { - /* set time the first time */ p_vbox_audio_start = now_d; - } else - { - /* calculate the number of bytes */ - tosend = (unsigned long)((now_d-p_vbox_audio_start)*8000) - p_vbox_audio_transferred; - - /* wait for more */ - if (tosend < 32) - return(0); - - /* too many samples, so we just process 128 bytes until the next call of handler() */ - if (tosend > 128) - tosend = 128; + return(0); + } + + /* calculate the number of bytes */ + tosend = (unsigned long)((now_d-p_vbox_audio_start)*8000) - p_vbox_audio_transferred; - /* dummy read, to clock record buffer */ - read_audio((unsigned char *)buffer, tosend, 0); + /* wait for more */ + if (tosend < sizeof(buffer)) + return(0); + tosend = sizeof(buffer); - /* add the number of samples elapsed */ - p_vbox_audio_transferred += tosend; + /* add the number of samples elapsed */ + p_vbox_audio_transferred += tosend; - /* if announcement is currently played, send audio data */ - if (p_vbox_announce_fh >=0) + /* if announcement is currently played, send audio data */ + if (p_vbox_announce_fh >=0) + { + tosend = read_tone(p_vbox_announce_fh, buffer, p_vbox_announce_codec, tosend, p_vbox_announce_size, &p_vbox_announce_left, 1); + if (tosend <= 0) { - /* read from announcement file */ - switch(p_vbox_announce_codec) - { - case CODEC_LAW: - tosend = read_tone(p_vbox_announce_fh, buffer, p_vbox_announce_codec, tosend, p_vbox_announce_size, &p_vbox_announce_left, 1); - break; - - case CODEC_MONO: - case CODEC_STEREO: - case CODEC_8BIT: - tosend = read_tone(p_vbox_announce_fh, buffer, p_vbox_announce_codec, tosend, p_vbox_announce_size, &p_vbox_announce_left, 1); - break; - - default: - PERROR("correct codec not given.\n"); - exit(-1); - } - if (tosend <= 0) - { - /* end of file */ - close(p_vbox_announce_fh); - p_vbox_announce_fh = -1; - fhuse--; + /* end of file */ + close(p_vbox_announce_fh); + p_vbox_announce_fh = -1; + fhuse--; - time(¤ttime); - p_vbox_record_start = currenttime; + time(¤ttime); + p_vbox_record_start = currenttime; - /* connect if not already */ - epoint = find_epoint_id(ACTIVE_EPOINT(p_epointlist)); - if (epoint) - { - /* if we sent our announcement during ringing, we must now connect */ - if (p_vbox_apppbx->e_ext.vbox_free) - { - /* send connect message */ - 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); - new_state(PORT_STATE_CONNECT); - } - } - - /* 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); - } else // else!! - if (p_vbox_mode == VBOX_MODE_ANNOUNCEMENT) - { - /* send release */ - message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE); - message->param.disconnectinfo.cause = 16; - message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; - message_put(message); - /* recording is close during destruction */ - delete this; - return(-1); /* must return because port is gone */ - } - } else + /* connect if not already */ + epoint = find_epoint_id(ACTIVE_EPOINT(p_epointlist)); + if (epoint) { - switch(p_vbox_announce_codec) + /* if we sent our announcement during ringing, we must now connect */ + if (p_vbox_ext.vbox_free) { - case CODEC_LAW: - message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_DATA); - message->param.data.compressed = 1; - 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); - break; - - case CODEC_MONO: - case CODEC_STEREO: - case CODEC_8BIT: - message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_DATA); - message->param.data.compressed = 0; - message->param.data.port_type = p_type; - message->param.data.port_id = p_serial; - message->param.data.len = tosend<<1; - memcpy(message->param.data.data, buffer, tosend<<1); + /* send connect message */ + 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); - break; - - default: - PERROR("correct announce_codec not given.\n"); - exit(-1); + new_state(PORT_STATE_CONNECT); } } - } + /* start recording, if not already */ + if (p_vbox_mode == VBOX_MODE_NORMAL) + { + /* 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); + } else // else!! + if (p_vbox_mode == VBOX_MODE_ANNOUNCEMENT) + { + /* send release */ + message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE); + message->param.disconnectinfo.cause = 16; + message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; + message_put(message); + /* 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); + } } + return(1); } @@ -221,6 +182,9 @@ int VBoxPort::message_epoint(unsigned long epoint_id, int message_id, union para char filename[256], *c; class EndpointAppPBX *eapp; + if (Port::message_epoint(epoint_id, message_id, param)) + return(1); + epoint = find_epoint_id(epoint_id); if (!epoint) { @@ -228,9 +192,6 @@ int VBoxPort::message_epoint(unsigned long epoint_id, int message_id, union para return(0); } - if (Port::message_epoint(epoint_id, message_id, param)) - return(1); - switch(message_id) { case MESSAGE_DISCONNECT: /* call has been disconnected */ @@ -263,19 +224,18 @@ 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 */ - eapp = (class EndpointAppPBX *)(epoint->ep_app); - p_vbox_apppbx = eapp; + 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[1] == '/') SPRINT(filename, c+1); else - SPRINT(filename, "%s/%s/%s/vbox/%s", INSTALL_DATA, options.extensions_dir, p_vbox_apppbx->e_terminal); + SPRINT(filename, "%s/%s/%s/vbox/%s", INSTALL_DATA, options.extensions_dir, p_vbox_ext.number); *c = '\0'; } else { - SPRINT(filename, "%s/%s/%s/vbox/announcement", INSTALL_DATA, options.extensions_dir, p_vbox_apppbx->e_terminal); + 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); memcpy(&p_callerinfo, ¶m->setup.callerinfo, sizeof(p_callerinfo)); @@ -302,7 +262,7 @@ int VBoxPort::message_epoint(unsigned long epoint_id, int message_id, union para p_connectinfo.screen = INFO_SCREEN_NETWORK; /* connect unless we can send announcement while ringing */ - if (!p_vbox_apppbx->e_ext.vbox_free) + if (!p_vbox_ext.vbox_free) { /* send connect message */ message = message_create(p_serial, epoint_id, PORT_TO_EPOINT, MESSAGE_CONNECT); @@ -317,26 +277,19 @@ int VBoxPort::message_epoint(unsigned long epoint_id, int message_id, union para new_state(PORT_STATE_IN_ALERTING); } - /* start recording during announcement */ - /* start parallel recording if desired */ - p_vbox_mode = p_vbox_apppbx->e_ext.vbox_mode; - p_vbox_record_limit = p_vbox_apppbx->e_ext.vbox_time; - if (p_vbox_mode == VBOX_MODE_PARALLEL) - { - /* send recording start message */ - message = message_create(p_serial, epoint_id, PORT_TO_EPOINT, MESSAGE_VBOX_RECORD); - message_put(message); - } /* 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++; - } else + } + /* 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 || p_vbox_mode==VBOX_MODE_PARALLEL) { - PDEBUG(DEBUG_VBOX, "PORT(%s) no announcement found at: '%s' so we start recording now.\n", p_name, filename); - /* send recording start message */ - message = message_create(p_serial, epoint_id, PORT_TO_EPOINT, MESSAGE_VBOX_RECORD); - message_put(message); + 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); } break;