January 2007 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r4062 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 26 Jan '07

26 Jan '07

Author: anthm Date: Fri Jan 26 16:12:19 2007 New Revision: 4062 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: add sip_call_id variable to sofia Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Fri Jan 26 16:12:19 2007 @@ -306,6 +306,7 @@ char *chat_from; char *chat_to; char *e_dest; + char *call_id; unsigned long rm_rate; switch_payload_t pt; switch_mutex_t *flag_mutex; @@ -800,6 +801,7 @@ } } + static void attach_private(switch_core_session_t *session, sofia_profile_t *profile, private_object_t *tech_pvt, @@ -829,6 +831,7 @@ tech_set_codecs(tech_pvt); snprintf(name, sizeof(name), "sofia/%s/%s", profile->name, channame); switch_channel_set_name(channel, name); + } static void terminate_session(switch_core_session_t **session, switch_call_cause_t cause, int line) @@ -2632,9 +2635,8 @@ tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); - - tech_pvt->nh = nh; - + assert(tech_pvt->nh != NULL); + if (switch_channel_test_flag(channel, CF_NOMEDIA)) { switch_set_flag(tech_pvt, TFLAG_NOMEDIA); } @@ -4223,6 +4225,11 @@ switch_channel_set_variable(channel, "sip_contact_host", contact_host); switch_channel_set_variable(channel, "sip_contact_port", contact_port); + if (!tech_pvt->call_id && sip && sip->sip_call_id && sip->sip_call_id->i_id) { + tech_pvt->call_id = switch_core_session_strdup(session, (char *)sip->sip_call_id->i_id); + switch_channel_set_variable(channel, "sip_call_id", tech_pvt->call_id); + } + via_host = (char *) sip->sip_via->v_host; if (!(via_port = (char *) sip->sip_via->v_port)) { via_port = "5060"; @@ -4324,7 +4331,7 @@ memset(tech_pvt->sofia_private, 0, sizeof(*tech_pvt->sofia_private)); switch_copy_string(tech_pvt->sofia_private->uuid, switch_core_session_get_uuid(session), sizeof(tech_pvt->sofia_private->uuid)); nua_handle_bind(nh, tech_pvt->sofia_private); - + tech_pvt->nh = nh; } static void sip_i_register(nua_t *nua, @@ -4500,7 +4507,10 @@ if (switch_channel_test_flag(channel, CF_NOMEDIA)) { switch_set_flag(tech_pvt, TFLAG_NOMEDIA); } - + if (!tech_pvt->call_id && sip && sip->sip_call_id && sip->sip_call_id->i_id) { + tech_pvt->call_id = switch_core_session_strdup(session, (char *)sip->sip_call_id->i_id); + switch_channel_set_variable(channel, "sip_call_id", tech_pvt->call_id); + } } else { /* too late */ return;

1 0

[Freeswitch-svn] [commit] r4061 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by Freeswitch SVN 26 Jan '07

26 Jan '07

Author: anthm Date: Fri Jan 26 15:39:45 2007 New Revision: 4061 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr.c Log: fix cause code passthrough Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Fri Jan 26 15:39:45 2007 @@ -779,7 +779,7 @@ } switch_input_type_t; typedef enum { - SWITCH_CAUSE_UNALLOCATED = 1, + SWITCH_CAUSE_UNALLOCATED = 0, SWITCH_CAUSE_NO_ROUTE_TRANSIT_NET = 2, SWITCH_CAUSE_NO_ROUTE_DESTINATION = 3, SWITCH_CAUSE_CHANNEL_UNACCEPTABLE = 6, Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Fri Jan 26 15:39:45 2007 @@ -1175,7 +1175,6 @@ // map QSIG cause codes to SIP from RFC4497 section 8.4.1 static int hangup_cause_to_sip(switch_call_cause_t cause) { switch (cause) { - case SWITCH_CAUSE_UNALLOCATED: case SWITCH_CAUSE_NO_ROUTE_TRANSIT_NET: case SWITCH_CAUSE_NO_ROUTE_DESTINATION: return 404; @@ -2334,7 +2333,7 @@ case 404: case 485: case 604: - return SWITCH_CAUSE_UNALLOCATED; + return SWITCH_CAUSE_NO_ROUTE_DESTINATION; case 408: case 504: return SWITCH_CAUSE_RECOVERY_ON_TIMER_EXPIRE; Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Fri Jan 26 15:39:45 2007 @@ -120,7 +120,7 @@ SWITCH_DECLARE(char *) switch_channel_cause2str(switch_call_cause_t cause) { uint8_t x; - char *str = "UNALLOCATED"; + char *str = "UNKNOWN"; for(x = 0; CAUSE_CHART[x].name; x++) { if (CAUSE_CHART[x].cause == cause) { @@ -620,7 +620,7 @@ channel->state = state; switch_mutex_unlock(channel->flag_mutex); - if (state == CS_HANGUP && channel->hangup_cause == SWITCH_CAUSE_UNALLOCATED) { + if (state == CS_HANGUP && !channel->hangup_cause) { channel->hangup_cause = SWITCH_CAUSE_NORMAL_CLEARING; } if (state < CS_HANGUP) { Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Jan 26 15:39:45 2007 @@ -2881,8 +2881,8 @@ } done: - *cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; - + *cause = SWITCH_CAUSE_UNALLOCATED; + if (var_event) { switch_event_destroy(&var_event); } @@ -2900,18 +2900,19 @@ if (!peer_channels[i]) { continue; } - - *cause = switch_channel_get_cause(peer_channels[i]); + *cause = switch_channel_get_cause(peer_channels[i]); break; } } - if (reason != SWITCH_CAUSE_UNALLOCATED) { - *cause = reason; - } else if (caller_channel) { - *cause = switch_channel_get_cause(caller_channel); - } else { - *cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + if (!*cause) { + if (reason) { + *cause = reason; + } else if (caller_channel) { + *cause = switch_channel_get_cause(caller_channel); + } else { + *cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + } } if (idx == IDX_CANCEL) {

1 0

[Freeswitch-svn] [commit] r4060 - in freeswitch/trunk/src: . include
by Freeswitch SVN 26 Jan '07

26 Jan '07

Author: anthm Date: Fri Jan 26 12:52:22 2007 New Revision: 4060 Modified: freeswitch/trunk/src/include/switch_xml.h freeswitch/trunk/src/switch_xml.c Log: fix horrible evil bug update to this revision at once and do a "make sure" Modified: freeswitch/trunk/src/include/switch_xml.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml.h (original) +++ freeswitch/trunk/src/include/switch_xml.h Fri Jan 26 12:52:22 2007 @@ -84,6 +84,8 @@ char **attr; /*! tag character content, empty string if none */ char *txt; + /*! path to free on destroy*/ + char *free_path; /*! tag offset from start of parent tag character content */ switch_size_t off; /*! next tag with same name in this section at this depth */ Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Fri Jan 26 12:52:22 2007 @@ -848,33 +848,21 @@ } -static int preprocess(const char *file, int new_fd, int rlevel) +static int preprocess(const char *file, int write_fd, int rlevel) { - int old_fd, close_fd = -1; - char *new_file = NULL; + int read_fd = -1; switch_size_t cur = 0, ml = 0; char *q, *cmd, buf[2048], ebuf[8192]; - if ((old_fd = open(file, O_RDONLY, 0)) < 0) { - return old_fd; + if ((read_fd = open(file, O_RDONLY, 0)) < 0) { + return read_fd; } if (rlevel > 100) { return -1; } - if (new_fd < 0) { - if (!(new_file = switch_mprintf("%s%sfreeswitch.registry", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR))) { - goto done; - } - - if ((new_fd = open(new_file, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR)) < 0) { - goto done; - } - close_fd = new_fd; - } - - while((cur = read_line(old_fd, buf, sizeof(buf))) > 0) { + while((cur = read_line(read_fd, buf, sizeof(buf))) > 0) { char *arg, *e; char *bp = expand_vars(buf, ebuf, sizeof(ebuf), &cur); @@ -894,11 +882,11 @@ } if ((cmd = strstr(bp, ""))) { *e = '\0'; e += 3; - write(new_fd, e, (unsigned)strlen(e)); + write(write_fd, e, (unsigned)strlen(e)); } else { ml++; } @@ -945,7 +933,7 @@ fme = switch_mprintf("%s%s%s", SWITCH_GLOBAL_dirs.conf_dir, SWITCH_PATH_SEPARATOR, arg); ifile = fme; } - if (preprocess(ifile, new_fd, rlevel + 1) < 0) { + if (preprocess(ifile, write_fd, rlevel + 1) < 0) { fprintf(stderr, "Error including %s (%s)\n", ifile, strerror(errno)); } switch_safe_free(fme); @@ -955,38 +943,56 @@ continue; } - write(new_fd, bp, (unsigned)cur); - } - - close(old_fd); - - if (close_fd > -1) { - close(close_fd); - new_fd = open(new_file, O_RDONLY, 0); - } - - done: - - switch_safe_free(new_file); - - if (new_fd < 0) { - return old_fd; + write(write_fd, bp, (unsigned)cur); } - return new_fd; + close(read_fd); + return write_fd; } // a wrapper for switch_xml_parse_fd that accepts a file name SWITCH_DECLARE(switch_xml_t) switch_xml_parse_file(const char *file) { - int fd = -1; + int fd = -1, write_fd = -1; switch_xml_t xml = NULL; + char *new_file = NULL; + char *abs; - if ((fd = preprocess(file, -1, 0)) > -1) { - xml = switch_xml_parse_fd(fd); - close(fd); + if ((abs = strrchr(file, '/')) || (abs = strrchr(file, '\\'))) { + abs++; + } else { + abs = file; } + if (!(new_file = switch_mprintf("%s%s%s.fsxml", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, abs))) { + return NULL; + } + + if ((write_fd = open(new_file, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR)) < 0) { + goto done; + } + + if (preprocess(file, write_fd, 0) > -1) { + close(write_fd); + write_fd = -1; + if ((fd = open(new_file, O_RDONLY, 0)) > -1) { + if ((xml = switch_xml_parse_fd(fd))) { + xml->free_path = new_file; + new_file = NULL; + } + close(fd); + fd = -1; + } + } + + done: + if (write_fd > -1) { + close(write_fd); + } + if (fd > -1) { + close(fd); + } + switch_safe_free(new_file); return xml; } @@ -1340,6 +1346,11 @@ return; } + if (xml->free_path) { + unlink(xml->free_path); + switch_safe_free(xml->free_path); + } + switch_xml_free(xml->child); switch_xml_free(xml->ordered);

1 0

[Freeswitch-svn] [commit] r4059 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 26 Jan '07

26 Jan '07

Author: anthm Date: Fri Jan 26 10:58:35 2007 New Revision: 4059 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: add more hint info to conference xml open Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Fri Jan 26 10:58:35 2007 @@ -2966,7 +2966,7 @@ } else { profile_name = "default"; } - params = switch_mprintf("conf_name=%s&profile_name=%s"); + params = switch_mprintf("conf_name=%s&profile_name=%s", conf_name, profile_name); /* Open the config from the xml registry */ if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, params))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); @@ -3525,7 +3525,7 @@ profile_name = "default"; } - params = switch_mprintf("conf_name=%s&profile_name=%s"); + params = switch_mprintf("conf_name=%s&profile_name=%s", conf_name, profile_name); /* Open the config from the xml registry */ if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, params))) {

1 0

[Freeswitch-svn] [commit] r4058 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 26 Jan '07

26 Jan '07

Author: anthm Date: Fri Jan 26 10:48:58 2007 New Revision: 4058 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: add more hint info to conference xml open Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Fri Jan 26 10:48:58 2007 @@ -2924,7 +2924,7 @@ static switch_status_t conf_api_sub_transfer(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char**argv) { switch_status_t ret_status = SWITCH_STATUS_SUCCESS; - + char *params = NULL; assert(conference != NULL); assert(stream != NULL); @@ -2966,9 +2966,9 @@ } else { profile_name = "default"; } - + params = switch_mprintf("conf_name=%s&profile_name=%s"); /* Open the config from the xml registry */ - if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) { + if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, params))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); goto done; } @@ -3034,6 +3034,7 @@ } done: + switch_safe_free(params); return ret_status; } @@ -3471,6 +3472,7 @@ uint8_t rl = 0, isbr = 0; char *dpin = NULL; conf_xml_cfg_t xml_cfg = {0}; + char *params = NULL; channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -3523,8 +3525,10 @@ profile_name = "default"; } + params = switch_mprintf("conf_name=%s&profile_name=%s"); + /* Open the config from the xml registry */ - if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) { + if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, params))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); goto done; } @@ -3797,7 +3801,7 @@ codec_done2: switch_core_codec_destroy(&member.write_codec); done: - + switch_safe_free(params); switch_buffer_destroy(&member.resample_buffer); switch_buffer_destroy(&member.audio_buffer); switch_buffer_destroy(&member.mux_buffer); @@ -4541,7 +4545,7 @@ switch_xml_t cxml, cfg, advertise, room; /* Open the config from the xml registry */ - if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) { + if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, "presence"))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); goto done; }

1 0

[Freeswitch-svn] [commit] r4057 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 26 Jan '07

26 Jan '07

Author: anthm Date: Fri Jan 26 10:42:38 2007 New Revision: 4057 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_rtp.c Log: modest rearranging Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Fri Jan 26 10:42:38 2007 @@ -1124,8 +1124,6 @@ tech_pvt->read_frame.buflen = SWITCH_RTP_MAX_BUF_LEN; - - switch_channel_set_variable(channel, "endpoint_disposition", "INIT"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SOFIA INIT\n"); if (switch_channel_test_flag(channel, CF_NOMEDIA)) { switch_set_flag_locked(tech_pvt, TFLAG_NOMEDIA); @@ -1152,7 +1150,6 @@ tech_pvt = (private_object_t *) switch_core_session_get_private(session); assert(tech_pvt != NULL); - switch_channel_set_variable(channel, "endpoint_disposition", "RING"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SOFIA RING\n"); return SWITCH_STATUS_SUCCESS; @@ -1170,7 +1167,6 @@ tech_pvt = (private_object_t *) switch_core_session_get_private(session); assert(tech_pvt != NULL); - switch_channel_set_variable(channel, "endpoint_disposition", "EXECUTE"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SOFIA EXECUTE\n"); return SWITCH_STATUS_SUCCESS; @@ -1587,7 +1583,7 @@ SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); - switch_channel_set_variable(channel, "endpoint_disposition", "ANSWER"); + } } @@ -2002,7 +1998,6 @@ SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_AUDIO_AUX("cn telephone-event"), TAG_END()); - switch_channel_set_variable(channel, "endpoint_disposition", "PROGRESS"); } } break; @@ -2202,7 +2197,6 @@ switch_channel_set_flag(nchannel, CF_OUTBOUND); switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); switch_channel_set_state(nchannel, CS_INIT); - switch_channel_set_variable(nchannel, "endpoint_disposition", "OUTBOUND"); *new_session = nsession; status = SWITCH_STATUS_SUCCESS; if (session) { @@ -2264,8 +2258,9 @@ sdp_rtpmap_t *map; for (map = m->m_rtpmaps; map; map = map->rm_next) { - int32_t i; - + int32_t i, btn = 0; + const switch_codec_implementation_t *mimp = NULL, *better_than_nothing[10] = {0}; + if (!strcasecmp(map->rm_encoding, "telephone-event")) { tech_pvt->te = (switch_payload_t)map->rm_pt; } @@ -2281,23 +2276,36 @@ } if (match && (map->rm_rate == imp->samples_per_second)) { - char tmp[50]; - tech_pvt->rm_encoding = switch_core_session_strdup(session, (char *)map->rm_encoding); - tech_pvt->pt = (switch_payload_t)map->rm_pt; - tech_pvt->rm_rate = map->rm_rate; - tech_pvt->codec_ms = imp->microseconds_per_frame / 1000; - tech_pvt->remote_sdp_audio_ip = switch_core_session_strdup(session, (char *)sdp->sdp_connection->c_address); - tech_pvt->rm_fmtp = switch_core_session_strdup(session, (char *)map->rm_fmtp); - tech_pvt->remote_sdp_audio_port = (switch_port_t)m->m_port; - tech_pvt->agreed_pt = (switch_payload_t)map->rm_pt; - snprintf(tmp, sizeof(tmp), "%d", tech_pvt->remote_sdp_audio_port); - switch_channel_set_variable(channel, SWITCH_REMOTE_MEDIA_IP_VARIABLE, tech_pvt->remote_sdp_audio_ip); - switch_channel_set_variable(channel, SWITCH_REMOTE_MEDIA_PORT_VARIABLE, tmp); + if (ptime && ptime * 1000 != imp->microseconds_per_frame && btn < 10) { + better_than_nothing[btn++] = imp; + continue; + } + mimp = imp; break; } else { match = 0; } - } + } + + if (!match && btn) { + match = 1; + mimp = better_than_nothing[0]; + } + + if (mimp) { + char tmp[50]; + tech_pvt->rm_encoding = switch_core_session_strdup(session, (char *)map->rm_encoding); + tech_pvt->pt = (switch_payload_t)map->rm_pt; + tech_pvt->rm_rate = map->rm_rate; + tech_pvt->codec_ms = mimp->microseconds_per_frame / 1000; + tech_pvt->remote_sdp_audio_ip = switch_core_session_strdup(session, (char *)sdp->sdp_connection->c_address); + tech_pvt->rm_fmtp = switch_core_session_strdup(session, (char *)map->rm_fmtp); + tech_pvt->remote_sdp_audio_port = (switch_port_t)m->m_port; + tech_pvt->agreed_pt = (switch_payload_t)map->rm_pt; + snprintf(tmp, sizeof(tmp), "%d", tech_pvt->remote_sdp_audio_port); + switch_channel_set_variable(channel, SWITCH_REMOTE_MEDIA_IP_VARIABLE, tech_pvt->remote_sdp_audio_ip); + switch_channel_set_variable(channel, SWITCH_REMOTE_MEDIA_PORT_VARIABLE, tmp); + } if (match) { if (tech_set_codec(tech_pvt, 1) != SWITCH_STATUS_SUCCESS) { @@ -2829,7 +2837,6 @@ if (switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) { switch_set_flag_locked(tech_pvt, TFLAG_ANS); switch_channel_mark_answered(channel); - switch_channel_set_variable(channel, "endpoint_disposition", "ANSWER"); if ((uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { other_channel = switch_core_session_get_channel(other_session); switch_channel_answer(other_channel); @@ -2854,7 +2861,6 @@ if (match) { switch_set_flag_locked(tech_pvt, TFLAG_ANS); - switch_channel_set_variable(channel, "endpoint_disposition", "ANSWER"); if (tech_choose_port(tech_pvt) == SWITCH_STATUS_SUCCESS) { activate_rtp(tech_pvt); switch_channel_mark_answered(channel); @@ -2867,7 +2873,6 @@ } } else if (switch_test_flag(tech_pvt, TFLAG_EARLY_MEDIA)) { switch_set_flag_locked(tech_pvt, TFLAG_ANS); - switch_channel_set_variable(channel, "endpoint_disposition", "ANSWER"); switch_channel_mark_answered(channel); if ((uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { other_channel = switch_core_session_get_channel(other_session); Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Fri Jan 26 10:42:38 2007 @@ -1006,6 +1006,7 @@ switch_log_printf(SWITCH_CHANNEL_ID_LOG, (char *) file, func, line, SWITCH_LOG_NOTICE, "Pre-Answer %s!\n", channel->name); switch_channel_set_flag(channel, CF_EARLY_MEDIA); + switch_channel_set_variable(channel, "endpoint_disposition", "EARLY MEDIA"); if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_PROGRESS) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(channel, event); switch_event_fire(&event); @@ -1078,7 +1079,7 @@ switch_channel_event_set_data(channel, event); switch_event_fire(&event); } - + switch_channel_set_variable(channel, "endpoint_disposition", "ANSWER"); switch_log_printf(SWITCH_CHANNEL_ID_LOG, (char *) file, func, line, SWITCH_LOG_NOTICE, "Channel [%s] has been answered\n", channel->name); return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Jan 26 10:42:38 2007 @@ -60,19 +60,6 @@ #pragma pack(4) #endif -#if __BYTE_ORDER == __BIG_ENDIAN - -typedef struct { - uint32_t ts; /* timestamp */ -} PACKED srtp_mini_hdr_t; - -#else -typedef struct { - uint32_t ts; /* timestamp */ -} PACKED srtp_mini_hdr_t; - -#endif - #ifdef _MSC_VER #pragma pack() #endif @@ -85,12 +72,6 @@ } rtp_msg_t; -typedef struct { - srtp_mini_hdr_t header; - char body[SWITCH_RTP_MAX_BUF_LEN]; -} rtp_mini_msg_t; - - struct rfc2833_digit { char digit; int duration; @@ -162,6 +143,7 @@ char *user_ice; switch_time_t last_stun; uint32_t packet_size; + uint32_t conf_packet_size; uint32_t rpacket_size; switch_time_t last_read; uint32_t ms_per_packet; @@ -170,7 +152,6 @@ switch_buffer_t *packet_buffer; struct switch_rtp_vad_data vad_data; struct switch_rtp_rfc2833_data dtmf_data; - uint8_t mini; switch_payload_t te; switch_mutex_t *flag_mutex; switch_timer_t timer; @@ -180,30 +161,6 @@ static int global_init = 0; -static void switch_rtp_miniframe_probe(switch_rtp_t *rtp_session) -{ - const char *str = "!!!!"; - rtp_msg_t msg = {{0}}; - int x; - - msg.header.ssrc = htonl(RTP_MAGIC_NUMBER); - msg.header.ts = htonl(rtp_session->packet_size); - msg.header.seq = htons(RTP_MAGIC_NUMBER); - msg.header.m = 1; - msg.header.pt = RTP_MAGIC_NUMBER; - msg.header.version = 2; - msg.header.p = 0; - msg.header.x = 0; - msg.header.cc = 0; - - snprintf(msg.body, sizeof(msg.body), str); - for(x = 0; x < 3 ; x++) { - switch_size_t bytes = strlen(str) + sizeof(msg.header); - switch_socket_sendto(rtp_session->sock, rtp_session->remote_addr, 0, (void*)&msg, &bytes); - } -} - - static switch_status_t ice_out(switch_rtp_t *rtp_session) { @@ -470,7 +427,7 @@ rtp_session->seq = (uint16_t)rtp_session->send_msg.header.seq; rtp_session->payload = payload; rtp_session->ms_per_packet = ms_per_packet; - rtp_session->packet_size = packet_size; + rtp_session->packet_size = rtp_session->conf_packet_size = packet_size; if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE)) { err_status_t stat; @@ -537,12 +494,7 @@ if (switch_rtp_set_local_address(rtp_session, rx_host, rx_port, err) != SWITCH_STATUS_SUCCESS) { return NULL; } - - if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_MINI)) { - switch_rtp_miniframe_probe(rtp_session); - switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_MINI); - } - + return rtp_session; } @@ -807,36 +759,14 @@ } if (bytes > 0) { - uint32_t effective_size = (uint32_t)(bytes - sizeof(srtp_mini_hdr_t)); - if (rtp_session->recv_msg.header.pt == RTP_MAGIC_NUMBER) { - if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_MINI)) { - switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_MINI); - rtp_session->rpacket_size = ntohl(rtp_session->recv_msg.header.ts); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "YAY MINI-RTP! %d\n", rtp_session->rpacket_size); - switch_rtp_miniframe_probe(rtp_session); - } - continue; - } - - - if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_MINI) && rtp_session->rpacket_size && effective_size > 0) { - uint32_t mfactor = (effective_size % rtp_session->rpacket_size); - - if (!mfactor) { - uint32_t ts; - rtp_mini_msg_t *mini = (rtp_mini_msg_t *) &rtp_session->recv_msg; - ts = mini->header.ts; - bytes -= sizeof(srtp_mini_hdr_t); - - memmove(rtp_session->recv_msg.body, mini->body, bytes); - - rtp_session->recv_msg.header.ts = ts; - rtp_session->recv_msg.header.seq = htons(rtp_session->rseq++); - rtp_session->recv_msg.header.pt = rtp_session->rpayload; - bytes += rtp_header_len; - rtp_session->recv_msg.header.version = 2; - } - } + uint32_t effective_size = (uint32_t)(bytes - rtp_header_len); + if (rtp_session->recv_msg.header.pt == rtp_session->payload && effective_size != rtp_session->packet_size) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Configured packet size %u != inbound packet size %u: auto-correcting..\n", + rtp_session->packet_size, + effective_size + ); + rtp_session->packet_size = effective_size; + } } if (rtp_session->timer.interval) { @@ -1282,23 +1212,7 @@ } if (send) { - if (rtp_session->mini) { - rtp_mini_msg_t mini = {{0}}; - bytes -= rtp_header_len; - mini.header.ts = send_msg->header.ts; - memcpy(mini.body, send_msg->body, bytes); - bytes += sizeof(srtp_mini_hdr_t); - switch_socket_sendto(rtp_session->sock, rtp_session->remote_addr, 0, (void*)&mini, &bytes); - } else { - switch_socket_sendto(rtp_session->sock, rtp_session->remote_addr, 0, (void*)send_msg, &bytes); - } - - if (!rtp_session->mini && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_MINI)) { - rtp_session->mini++; - rtp_session->rpayload = (switch_payload_t)send_msg->header.pt; - rtp_session->rseq = ntohs((uint16_t)send_msg->header.seq); - } - + switch_socket_sendto(rtp_session->sock, rtp_session->remote_addr, 0, (void*)send_msg, &bytes); } if (rtp_session->ice_user) {

1 0

[Freeswitch-svn] [commit] r4056 - in freeswitch/trunk/src/mod: applications/mod_conference endpoints/mod_sofia
by Freeswitch SVN 25 Jan '07

25 Jan '07

Author: anthm Date: Thu Jan 25 12:26:23 2007 New Revision: 4056 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: make conference_local_play_file honor the sound-prefix param Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Jan 25 12:26:23 2007 @@ -287,7 +287,8 @@ static void conference_function(switch_core_session_t *session, char *data); static void launch_conference_thread(conference_obj_t *conference); static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, void *obj); -static switch_status_t conference_local_play_file(switch_core_session_t *session, char *path, uint32_t leadin, char *buf, switch_size_t len); +static switch_status_t conference_local_play_file(conference_obj_t *conference, + switch_core_session_t *session, char *path, uint32_t leadin, char *buf, switch_size_t len); static switch_status_t conference_member_play_file(conference_member_t *member, char *file, uint32_t leadin); static switch_status_t conference_member_say(conference_member_t *member, char *text, uint32_t leadin); static uint32_t conference_member_stop_file(conference_member_t *member, file_stop_t stop); @@ -3415,7 +3416,8 @@ } /* Play a file */ -static switch_status_t conference_local_play_file(switch_core_session_t *session, char *path, uint32_t leadin, char *buf, switch_size_t len) +static switch_status_t conference_local_play_file(conference_obj_t *conference, + switch_core_session_t *session, char *path, uint32_t leadin, char *buf, switch_size_t len) { uint32_t x = 0; switch_status_t status = SWITCH_STATUS_SUCCESS; @@ -3432,7 +3434,17 @@ /* if all is well, really play the file */ if (status == SWITCH_STATUS_SUCCESS) { + char *dpath = NULL; + + if (conference->sound_prefix) { + if (!(dpath = switch_mprintf("%s/%s", conference->sound_prefix, path))) { + return SWITCH_STATUS_MEMERR; + } + path = dpath; + } + status = switch_ivr_play_file(session, NULL, path, NULL); + switch_safe_free(dpath); } return status; @@ -3610,7 +3622,7 @@ /* be friendly */ if (conference->pin_sound) { - conference_local_play_file(session, conference->pin_sound, 20, pin_buf, sizeof(pin_buf)); + conference_local_play_file(conference, session, conference->pin_sound, 20, pin_buf, sizeof(pin_buf)); } /* wait for them if neccessary */ if (strlen(pin_buf) < strlen(conference->pin)) { @@ -3631,7 +3643,7 @@ /* more friendliness */ if (conference->bad_pin_sound) { - conference_local_play_file(session, conference->bad_pin_sound, 20, pin_buf, sizeof(pin_buf)); + conference_local_play_file(conference, session, conference->bad_pin_sound, 20, pin_buf, sizeof(pin_buf)); } } pin_retries --; @@ -3648,7 +3660,7 @@ if (conference->locked_sound) { /* Answer the channel */ switch_channel_answer(channel); - conference_local_play_file(session, conference->locked_sound, 20, NULL, 0); + conference_local_play_file(conference, session, conference->locked_sound, 20, NULL, 0); } goto done; } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu Jan 25 12:26:23 2007 @@ -2223,6 +2223,7 @@ sdp_media_t *m; sdp_attribute_t *a; switch_channel_t *channel; + int ptime = 0, dptime = 0; tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); @@ -2246,10 +2247,19 @@ switch_set_flag_locked(tech_pvt, TFLAG_SIP_HOLD); } else if (!strcasecmp(a->a_name, "sendrecv")) { switch_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD); + } else if (!strcasecmp(a->a_name, "ptime")) { + dptime = atoi(a->a_value); } } for (m = sdp->sdp_media; m ; m = m->m_next) { + ptime = dptime; + for (a = m->m_attributes; a; a = a->a_next) { + if (!strcasecmp(a->a_name, "ptime")) { + ptime = atoi(a->a_value); + } + } + if (m->m_type == sdp_media_audio) { sdp_rtpmap_t *map;

1 0

[Freeswitch-svn] [commit] r4055 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 25 Jan '07

25 Jan '07

Author: anthm Date: Thu Jan 25 09:56:32 2007 New Revision: 4055 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: make reg freq 2 sec less than you actually say to avoid crossfire and make the minimum setting be 5 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu Jan 25 09:56:32 2007 @@ -5109,7 +5109,12 @@ oreg->expires_str = switch_core_strdup(oreg->pool, "300"); } - oreg->freq = atoi(oreg->expires_str); + if ((oreg->freq = atoi(oreg->expires_str)) < 5) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid Freq: %d. Setting Register-Frequency to 5\n", oreg->freq); + oreg->freq = 5; + } + oreg->freq -= 2; + oreg->next = profile->registrations; profile->registrations = oreg;

1 0

[Freeswitch-svn] [commit] r4052 - freeswitch/trunk/src/mod/asr_tts/mod_lumenvox
by Freeswitch SVN 25 Jan '07

25 Jan '07

Author: anthm Date: Wed Jan 24 19:19:41 2007 New Revision: 4052 Added: freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/ freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/Makefile freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/mod_lumenvox.cpp Log: Initial Check-In of mod_lumenvox Added: freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/Makefile Wed Jan 24 19:19:41 2007 @@ -0,0 +1,18 @@ +LDFLAGS += -L/opt/lumenvox/engine_7.0/lib -llv_lvspeechport +CFLAGS += -fpermissive -Wno-deprecated -Wno-conversion -fpermissive -Wno-unused -Wno-comment -Wno-sign-compare -Wno-conversion -Wno-reorder -I/opt/lumenvox/engine_7.0/include +LINKER=g++ +CC=g++ + +all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) + +depends: + +$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).cpp + $(CC) $(CFLAGS) -fPIC -c $(MODNAME).cpp -o $(MODNAME).o + $(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) + +clean: + rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ + +install: + cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod Added: freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/mod_lumenvox.cpp ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/mod_lumenvox.cpp Wed Jan 24 19:19:41 2007 @@ -0,0 +1,459 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony Minessale II <anthmct(a)yahoo.com> + * + * + * mod_lumenvox.c -- Lumenvox Interface + * + * + */ +#ifdef __ICC +#pragma warning (disable:188) +#endif + +#include <LVSpeechPort.h> +#include <switch.h> +#include <sstream> + +static const char modname[] = "mod_lumenvox"; + +typedef enum { + LVFLAG_HAS_TEXT = (1 << 0), + LVFLAG_BARGE = (1 << 1), + LVFLAG_READY = (1 << 2) +} lvflag_t; + +typedef struct { + LVSpeechPort port; + uint32_t flags; + int sound_format; + int channel; + switch_mutex_t *flag_mutex; +} lumenvox_t; + +static void log_callback(const char* message, void* userdata) +{ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s\n", message); +} + +static const char *state_names[] = { + "NOT_READY", + "READY", + "BARGE_IN", + "END_SPEECH", + "STOPPED", + "BARGE_IN_TIMEOUT", + "END_SPEECH_TIMEOUT", + "BEEP" +}; + +std::ostream& operator << (std::ostream& os ,const LVSemanticData& Data) +{ + int i; + LVSemanticObject Obj; + switch (Data.Type()) + { + case SI_TYPE_BOOL: + os << Data.GetBool(); + break; + case SI_TYPE_INT: + os << Data.GetInt(); + break; + case SI_TYPE_DOUBLE: + os << Data.GetDouble(); + break; + case SI_TYPE_STRING: + os << Data.GetString(); + break; + case SI_TYPE_OBJECT: + Obj = Data.GetSemanticObject(); + for (i = 0; i < Obj.NumberOfProperties(); ++i) + { + os << "<" << Obj.PropertyName(i) << ">"; + os << Obj.PropertyValue(i); + os << "</" << Obj.PropertyName(i) << ">"; + } + break; + case SI_TYPE_ARRAY: + for (i = 0; i < Data.GetSemanticArray().Size(); ++i) + { + os << Data.GetArray().At(i); + } + break; + } + return os; +} + +//============================================================================================== +// code to plug LVInterpretation into any standard stream +std::ostream& operator << (std::ostream& os, const LVInterpretation& Interp) +{ + os << "<interpretation grammar=\""<<Interp.GrammarLabel() + <<"\" score=\""<<Interp.Score()<<"\">"; + os << "<result name=\""<<Interp.ResultName()<<"\">"; + os << Interp.ResultData(); + os << "</result>"; + os << "<input>"; + os << Interp.InputSentence(); + os << "</input>"; + os << "</interpretation>"; + return os; +} + + +static void state_change_callback(long new_state, unsigned long total_bytes, + unsigned long recorded_bytes, void *user_data) +{ + lumenvox_t *lv = (lumenvox_t *) user_data; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "State: [%s] total bytes: [%ld] recorded bytes: [%ld]\n", + state_names[new_state], + total_bytes, + recorded_bytes); + + switch (new_state) + { + case STREAM_STATUS_READY: + break; + case STREAM_STATUS_STOPPED: + switch_clear_flag_locked(lv, LVFLAG_READY); + break; + case STREAM_STATUS_END_SPEECH: + switch_set_flag_locked(lv, LVFLAG_HAS_TEXT); + break; + case STREAM_STATUS_BARGE_IN: + switch_set_flag_locked(lv, LVFLAG_BARGE); + break; + } +} + +static switch_status_t lumenvox_asr_pause(switch_asr_handle_t *ah) +{ + lumenvox_t *lv = (lumenvox_t *) ah->private_info; + + if (switch_test_flag(lv, LVFLAG_READY)) { + lv->port.StreamStop(); + switch_clear_flag_locked(lv, LVFLAG_READY); + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_GENERR; +} + +static switch_status_t lumenvox_asr_resume(switch_asr_handle_t *ah) +{ + lumenvox_t *lv = (lumenvox_t *) ah->private_info; + + switch_clear_flag_locked(lv, LVFLAG_HAS_TEXT); + + if (!switch_test_flag(lv, LVFLAG_READY)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Manually Resuming\n"); + if (lv->port.StreamStart()) { + lv->port.ClosePort(); + return SWITCH_STATUS_GENERR; + } + switch_set_flag_locked(lv, LVFLAG_READY); + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_GENERR; +} + +/*! function to open the asr interface */ +static switch_status_t lumenvox_asr_open(switch_asr_handle_t *ah, char *codec, int rate, char *dest, switch_asr_flag_t *flags) +{ + + lumenvox_t *lv; + int error_code; + + if (!(lv = (lumenvox_t *) switch_core_alloc(ah->memory_pool, sizeof(*lv)))) { + return SWITCH_STATUS_MEMERR; + } + + if (rate != 8000 && rate != 16000) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Rate: Pick 8000 or 16000\n"); + return SWITCH_STATUS_FALSE; + } + + if (!strcasecmp(codec, "PCMU")) { + switch (rate) { + case 8000: + lv->sound_format = ULAW_8KHZ; + break; + } + } else if (!strcasecmp(codec, "PCMA")) { + switch (rate) { + case 8000: + lv->sound_format = ULAW_8KHZ; + break; + } + } else if (!strcasecmp(codec, "speex")) { + switch (rate) { + case 8000: + lv->sound_format = SPX_8KHZ; + break; + case 16000: + lv->sound_format = SPX_16KHZ; + break; + } + } + + if (!lv->sound_format) { + codec = "L16"; + switch (rate) { + case 8000: + lv->sound_format = PCM_8KHZ; + break; + case 16000: + lv->sound_format = PCM_16KHZ; + break; + } + } + + if (!lv->sound_format) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot negotiate sound format.\n"); + return SWITCH_STATUS_FALSE; + } + + ah->rate = rate; + ah->codec = switch_core_strdup(ah->memory_pool, codec); + + lv->port.OpenPort(log_callback, NULL, 5); + error_code = lv->port.GetOpenPortStatus(); + + switch(error_code) + { + case LV_FAILURE: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Licenses Exceeded!\n"); + return SWITCH_STATUS_GENERR; + case LV_OPEN_PORT_FAILED__PRIMARY_SERVER_NOT_RESPONDING: + case LV_NO_SERVER_RESPONDING: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SRE Server Unavailable!\n"); + return SWITCH_STATUS_GENERR; + case LV_SUCCESS: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Port Opened %d %dkhz.\n", lv->sound_format, rate); + break; + } + + + // turn on sound and response file logging + /* + int save_sound_files = 1; + lv->port.SetPropertyEx(PROP_EX_SAVE_SOUND_FILES, + PROP_EX_VALUE_TYPE_INT_PTR, + &save_sound_files); + */ + lv->channel = 1; + lv->flags = *flags; + lv->port.StreamSetParameter(STREAM_PARM_DETECT_BARGE_IN, 1); + lv->port.StreamSetParameter(STREAM_PARM_DETECT_END_OF_SPEECH, 1); + lv->port.StreamSetParameter(STREAM_PARM_AUTO_DECODE, 1); + lv->port.StreamSetParameter(STREAM_PARM_DECODE_FLAGS, LV_DECODE_SEMANTIC_INTERPRETATION); + lv->port.StreamSetParameter(STREAM_PARM_VOICE_CHANNEL, lv->channel); + lv->port.StreamSetParameter(STREAM_PARM_GRAMMAR_SET, (long unsigned int) LV_ACTIVE_GRAMMAR_SET); + + + lv->port.StreamSetStateChangeCallBack(state_change_callback, lv); + lv->port.StreamSetParameter(STREAM_PARM_SOUND_FORMAT, lv->sound_format); + + if (dest) { + lv->port.SetClientPropertyEx(PROP_EX_SRE_SERVERS, PROP_EX_VALUE_TYPE_STRING, (void *) dest); + } + + switch_mutex_init(&lv->flag_mutex, SWITCH_MUTEX_NESTED, ah->memory_pool); + + switch_set_flag_locked(lv, LVFLAG_READY); + if (lv->port.StreamStart()) { + lv->port.ClosePort(); + return SWITCH_STATUS_GENERR; + } + + ah->private_info = lv; + + return SWITCH_STATUS_SUCCESS; +} + +/*! function to load a grammar to the asr interface */ +static switch_status_t lumenvox_asr_load_grammar(switch_asr_handle_t *ah, char *grammar, char *path) +{ + lumenvox_t *lv = (lumenvox_t *) ah->private_info; + + if (path) { + if (!lv->port.LoadGrammar(grammar, path)) { + if (!lv->port.ActivateGrammar(grammar)) { + return SWITCH_STATUS_SUCCESS; + } + } + } else { + if (lv->port.ActivateGrammar(grammar)) { + return SWITCH_STATUS_GENERR; + } + } + + return SWITCH_STATUS_GENERR; +} + + +/*! function to unload a grammar to the asr interface */ +static switch_status_t lumenvox_asr_unload_grammar(switch_asr_handle_t *ah, char *grammar) +{ + lumenvox_t *lv = (lumenvox_t *) ah->private_info; + + if (lv->port.DeactivateGrammar(grammar)) { + return SWITCH_STATUS_GENERR; + } + + return SWITCH_STATUS_SUCCESS; +} + +/*! function to close the asr interface */ +static switch_status_t lumenvox_asr_close(switch_asr_handle_t *ah, switch_asr_flag_t *flags) +{ + lumenvox_t *lv = (lumenvox_t *) ah->private_info; + + switch_set_flag(ah, SWITCH_ASR_FLAG_CLOSED); + lv->port.ClosePort(); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Port Closed.\n"); + return SWITCH_STATUS_SUCCESS; +} + +/*! function to feed audio to the ASR*/ +static switch_status_t lumenvox_asr_feed(switch_asr_handle_t *ah, void *data, unsigned int len, switch_asr_flag_t *flags) +{ + + lumenvox_t *lv = (lumenvox_t *) ah->private_info; + + if (!switch_test_flag(lv, LVFLAG_HAS_TEXT) && switch_test_flag(lv, LVFLAG_READY)) { + if (lv->port.StreamSendData(data, len)) { + return SWITCH_STATUS_FALSE; + } + } + + return SWITCH_STATUS_SUCCESS; +} + +/*! function to read results from the ASR*/ +static switch_status_t lumenvox_asr_check_results(switch_asr_handle_t *ah, switch_asr_flag_t *flags) +{ + lumenvox_t *lv = (lumenvox_t *) ah->private_info; + + return (switch_test_flag(lv, LVFLAG_HAS_TEXT) || switch_test_flag(lv, LVFLAG_BARGE)) ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; +} + +/*! function to read results from the ASR*/ +static switch_status_t lumenvox_asr_get_results(switch_asr_handle_t *ah, char **xmlstr, switch_asr_flag_t *flags) +{ + lumenvox_t *lv = (lumenvox_t *) ah->private_info; + switch_status_t ret = SWITCH_STATUS_SUCCESS; + + if (switch_test_flag(lv, LVFLAG_BARGE)) { + switch_clear_flag_locked(lv, LVFLAG_BARGE); + ret = SWITCH_STATUS_BREAK; + } + + if (switch_test_flag(lv, LVFLAG_HAS_TEXT)) { + std::stringstream ss; + int numInterp; + int code; + + + lv->port.StreamStop(); + code = lv->port.WaitForEngineToIdle(3000, lv->channel); + + if (code == LV_TIME_OUT) { + return SWITCH_STATUS_FALSE; + } + + numInterp = lv->port.GetNumberOfInterpretations(lv->channel); + + for (int t = 0; t < numInterp; ++t) { + ss << lv->port.GetInterpretation(lv->channel, t); + } + + *xmlstr = strdup((char *)ss.str().c_str()); + switch_clear_flag_locked(lv, LVFLAG_HAS_TEXT); + + + if (switch_test_flag(lv, SWITCH_ASR_FLAG_AUTO_RESUME)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Auto Resuming\n"); + switch_set_flag_locked(lv, LVFLAG_READY); + if (lv->port.StreamStart()) { + lv->port.ClosePort(); + return SWITCH_STATUS_GENERR; + } + } + + ret = SWITCH_STATUS_SUCCESS; + } + + return ret; +} + +static const switch_asr_interface_t lumenvox_asr_interface = { + /*.interface_name*/ "lumenvox", + /*.asr_open*/ lumenvox_asr_open, + /*.asr_load_grammar*/ lumenvox_asr_load_grammar, + /*.asr_unload_grammar*/ lumenvox_asr_unload_grammar, + /*.asr_close*/ lumenvox_asr_close, + /*.asr_feed*/ lumenvox_asr_feed, + /*.asr_resume*/ lumenvox_asr_resume, + /*.asr_pause*/ lumenvox_asr_pause, + /*.asr_check_results*/ lumenvox_asr_check_results, + /*.asr_get_results*/ lumenvox_asr_get_results +}; + +static const switch_loadable_module_interface_t lumenvox_module_interface = { + /*.module_name */ modname, + /*.endpoint_interface */ NULL, + /*.timer_interface */ NULL, + /*.dialplan_interface */ NULL, + /*.codec_interface */ NULL, + /*.application_interface */ NULL, + /*.api_interface */ NULL, + /*.file_interface */ NULL, + /*.speech_interface */ NULL, + /*.directory_interface */ NULL, + /*.chat_interface */ NULL, + /*.say_interface */ NULL, + /*.asr_interface */ &lumenvox_asr_interface +}; + +switch_status_t switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) +{ + LVSpeechPort::RegisterAppLogMsg(log_callback, NULL, 5); + //LVSpeechPort::SetClientPropertyEx(PROP_EX_SRE_SERVERS, PROP_EX_VALUE_TYPE_STRING, (void *)"127.0.0.1"); + + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = &lumenvox_module_interface; + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void) +{ + return SWITCH_STATUS_UNLOAD; +}

1 0

[Freeswitch-svn] [commit] r4051 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 24 Jan '07

24 Jan '07

Author: anthm Date: Wed Jan 24 15:52:42 2007 New Revision: 4051 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: add some more dispositions Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Jan 24 15:52:42 2007 @@ -1587,7 +1587,7 @@ SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); - + switch_channel_set_variable(channel, "endpoint_disposition", "ANSWER"); } } @@ -2002,7 +2002,7 @@ SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_AUDIO_AUX("cn telephone-event"), TAG_END()); - + switch_channel_set_variable(channel, "endpoint_disposition", "PROGRESS"); } } break; @@ -2819,6 +2819,7 @@ if (switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) { switch_set_flag_locked(tech_pvt, TFLAG_ANS); switch_channel_mark_answered(channel); + switch_channel_set_variable(channel, "endpoint_disposition", "ANSWER"); if ((uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { other_channel = switch_core_session_get_channel(other_session); switch_channel_answer(other_channel);

1 0