July 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9089 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 18 Jul '08

18 Jul '08

Author: anthm Date: Fri Jul 18 12:46:11 2008 New Revision: 9089 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Fri Jul 18 12:46:11 2008 @@ -2001,7 +2001,7 @@ } } - if (((m = sdp->sdp_media)) && m->m_mode == sdp_sendonly) { + if (((m = sdp->sdp_media)) && (m->m_mode == sdp_sendonly || m->m_mode == sdp_inactive)) { sendonly = 2; /* global sendonly always wins */ }

1 0

[commit] r9088 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by Freeswitch SVN 18 Jul '08

18 Jul '08

Author: anthm Date: Fri Jul 18 12:18:31 2008 New Revision: 9088 Modified: freeswitch/trunk/src/include/switch_rtp.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_rtp.c freeswitch/trunk/src/switch_stun.c Log: update Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Fri Jul 18 12:18:31 2008 @@ -418,6 +418,8 @@ */ SWITCH_DECLARE(void *) switch_rtp_get_private(switch_rtp_t *rtp_session); +SWITCH_DECLARE(switch_status_t) switch_rtp_activate_stun_ping(switch_rtp_t *rtp_session, const char *stun_ip, uint32_t packet_count, switch_bool_t funny); + /*! \} */ Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Fri Jul 18 12:18:31 2008 @@ -156,7 +156,8 @@ PFLAG_RECIEVED_IN_NAT_REG_CONTACT = (1 << 22), PFLAG_3PCC = (1 << 23), PFLAG_DISABLE_RTP_AUTOADJ = (1 << 24), - PFLAG_DISABLE_SRTP_AUTH = (1 << 25) + PFLAG_DISABLE_SRTP_AUTH = (1 << 25), + PFLAG_FUNNY_STUN = (1 << 26) } PFLAGS; typedef enum { @@ -165,6 +166,12 @@ } sofia_NDLB_t; typedef enum { + STUN_FLAG_SET = (1 << 0), + STUN_FLAG_PING = (1 << 1), + STUN_FLAG_FUNNY = (1 << 2) +} STUNFLAGS; + +typedef enum { TFLAG_IO = (1 << 0), TFLAG_CHANGE_MEDIA = (1 << 1), TFLAG_OUTBOUND = (1 << 2), @@ -417,6 +424,9 @@ char *local_crypto_key; char *remote_crypto_key; char *record_route; + char *extrtpip; + char *stun_ip; + uint32_t stun_flags; int crypto_tag; unsigned char local_raw_key[SWITCH_RTP_MAX_CRYPTO_LEN]; unsigned char remote_raw_key[SWITCH_RTP_MAX_CRYPTO_LEN]; @@ -566,7 +576,7 @@ void sofia_reg_check_expire(sofia_profile_t *profile, time_t now, int reboot); void sofia_reg_check_gateway(sofia_profile_t *profile, time_t now); void sofia_reg_unregister(sofia_profile_t *profile); -switch_status_t sofia_glue_ext_address_lookup(char **ip, switch_port_t *port, char *sourceip, switch_memory_pool_t *pool); +switch_status_t sofia_glue_ext_address_lookup(sofia_profile_t *profile, private_object_t *tech_pvt, char **ip, switch_port_t *port, char *sourceip, switch_memory_pool_t *pool); void sofia_glue_pass_sdp(private_object_t *tech_pvt, char *sdp); int sofia_glue_get_user_host(char *in, char **user, char **host); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri Jul 18 12:18:31 2008 @@ -1047,6 +1047,12 @@ } else { profile->pflags &= ~PFLAG_DISABLE_SRTP_AUTH; } + } else if (!strcasecmp(var, "NDLB-funny-stun")) { + if (switch_true(val)) { + profile->pflags |= PFLAG_FUNNY_STUN; + } else { + profile->pflags &= ~PFLAG_FUNNY_STUN; + } } else if (!strcasecmp(var, "rfc2833-pt")) { profile->te = (switch_payload_t) atoi(val); } else if (!strcasecmp(var, "cng-pt")) { @@ -1380,6 +1386,12 @@ profile->pflags |= PFLAG_DISABLE_RTP_AUTOADJ; } else if (!strcasecmp(var, "NDLB-support-asterisk-missing-srtp-auth") && switch_true(val)) { profile->pflags |= PFLAG_DISABLE_SRTP_AUTH; + } else if (!strcasecmp(var, "NDLB-funny-stun")) { + if (switch_true(val)) { + profile->pflags |= PFLAG_FUNNY_STUN; + } else { + profile->pflags &= ~PFLAG_FUNNY_STUN; + } } else if (!strcasecmp(var, "rfc2833-pt")) { profile->te = (switch_payload_t) atoi(val); } else if (!strcasecmp(var, "cng-pt")) { @@ -1435,7 +1447,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invald IP 0.0.0.0 replaced with %s\n", mod_sofia_globals.guess_ip); } else if (strcasecmp(val, "auto")) { switch_port_t port = 0; - if (sofia_glue_ext_address_lookup(&myip, &port, val, profile->pool) == SWITCH_STATUS_SUCCESS) { + if (sofia_glue_ext_address_lookup(profile, NULL, &myip, &port, val, profile->pool) == SWITCH_STATUS_SUCCESS) { ip = myip; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to get external ip.\n"); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Fri Jul 18 12:18:31 2008 @@ -425,11 +425,14 @@ switch_channel_set_name(tech_pvt->channel, name); } -switch_status_t sofia_glue_ext_address_lookup(char **ip, switch_port_t *port, char *sourceip, switch_memory_pool_t *pool) +switch_status_t sofia_glue_ext_address_lookup(sofia_profile_t *profile, private_object_t *tech_pvt, char **ip, switch_port_t *port, char *sourceip, switch_memory_pool_t *pool) { char *error = ""; switch_status_t status = SWITCH_STATUS_FALSE; int x; + switch_port_t myport = *port; + const char *var; + int funny = 0; if (!sourceip) { return status; @@ -442,6 +445,11 @@ return status; } for (x = 0; x < 5; x++) { + if ((profile->pflags & PFLAG_FUNNY_STUN) || + (tech_pvt && (var = switch_channel_get_variable(tech_pvt->channel, "funny_stun")) && switch_true(var))) { + error = "funny"; + funny++; + } if ((status = switch_stun_lookup(ip, port, stun_ip, SWITCH_STUN_DEFAULT_PORT, &error, pool)) != SWITCH_STATUS_SUCCESS) { switch_yield(100000); } else { @@ -456,7 +464,18 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Stun Failed! No IP returned\n"); return SWITCH_STATUS_FALSE; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stun Success [%s]:[%d]\n", *ip, *port); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stun Success [%s]:[%d] [%s][%d]\n", *ip, *port, tech_pvt->profile->rtpip, myport); + if (tech_pvt) { + if (myport == *port && !strcmp(*ip, tech_pvt->profile->rtpip)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stun Not Required ip and port match. [%s]:[%d]\n", *ip, *port); + } else { + tech_pvt->stun_ip = switch_core_session_strdup(tech_pvt->session, stun_ip); + tech_pvt->stun_flags |= STUN_FLAG_SET; + if (funny) { + tech_pvt->stun_flags |= STUN_FLAG_FUNNY; + } + } + } } else { *ip = sourceip; } @@ -482,6 +501,7 @@ char *ip = tech_pvt->profile->rtpip; switch_port_t sdp_port; char tmp[50]; + const char *use_ip = NULL; if (!force) { if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE) || @@ -502,12 +522,19 @@ } sdp_port = tech_pvt->local_sdp_audio_port; - if (tech_pvt->profile->extrtpip) { - if (sofia_glue_ext_address_lookup(&ip, &sdp_port, tech_pvt->profile->extrtpip, switch_core_session_get_pool(tech_pvt->session)) != - SWITCH_STATUS_SUCCESS) { + if (!(use_ip = switch_channel_get_variable(tech_pvt->channel, "rtp_adv_audio_ip"))) { + if (tech_pvt->profile->extrtpip) { + use_ip = tech_pvt->profile->extrtpip; + } + } + + if (use_ip) { + tech_pvt->extrtpip = switch_core_session_strdup(tech_pvt->session, use_ip); + if (sofia_glue_ext_address_lookup(tech_pvt->profile, tech_pvt, &ip, &sdp_port, tech_pvt->extrtpip, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_FALSE; } } + tech_pvt->adv_sdp_audio_ip = switch_core_session_strdup(tech_pvt->session, ip); tech_pvt->adv_sdp_audio_port = sdp_port; @@ -544,7 +571,7 @@ if (tech_pvt->profile->extrtpip) { - if (sofia_glue_ext_address_lookup(&ip, &sdp_port, tech_pvt->profile->extrtpip, switch_core_session_get_pool(tech_pvt->session)) != + if (sofia_glue_ext_address_lookup(tech_pvt->profile, tech_pvt, &ip, &sdp_port, tech_pvt->profile->extrtpip, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_FALSE; } @@ -1730,7 +1757,8 @@ uint8_t vad_in = switch_test_flag(tech_pvt, TFLAG_VAD_IN) ? 1 : 0; uint8_t vad_out = switch_test_flag(tech_pvt, TFLAG_VAD_OUT) ? 1 : 0; uint8_t inb = switch_test_flag(tech_pvt, TFLAG_OUTBOUND) ? 0 : 1; - + uint32_t stun_ping = 0; + if ((val = switch_channel_get_variable(tech_pvt->channel, "rtp_enable_vad_in")) && switch_true(val)) { vad_in = 1; } @@ -1745,6 +1773,18 @@ vad_out = 0; } + if ((tech_pvt->stun_flags & STUN_FLAG_SET) && (val = switch_channel_get_variable(tech_pvt->channel, "rtp_stun_ping"))) { + int ival = atoi(val); + + if (ival <= 0) { + if (switch_true(val)) { + ival = 6; + } + } + + stun_ping = (ival * tech_pvt->read_codec.implementation->samples_per_second) / tech_pvt->read_codec.implementation->samples_per_frame; + } + tech_pvt->ssrc = switch_rtp_get_ssrc(tech_pvt->rtp_session); switch_set_flag(tech_pvt, TFLAG_RTP); switch_set_flag(tech_pvt, TFLAG_IO); @@ -1756,6 +1796,11 @@ switch_channel_get_name(switch_core_session_get_channel(tech_pvt->session)), vad_in ? "in" : "", vad_out ? "out" : ""); } + if (stun_ping) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setting stun ping to %s:%d\n", tech_pvt->stun_ip, stun_ping); + switch_rtp_activate_stun_ping(tech_pvt->rtp_session, tech_pvt->stun_ip, stun_ping, (tech_pvt->stun_flags & STUN_FLAG_FUNNY) ? 1 : 0); + } + if ((val = switch_channel_get_variable(tech_pvt->channel, "jitterbuffer_msec"))) { int len = atoi(val); Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Jul 18 12:18:31 2008 @@ -135,6 +135,9 @@ switch_sockaddr_t *remote_addr; rtp_msg_t recv_msg; + + switch_sockaddr_t *remote_stun_addr; + uint32_t autoadj_window; uint32_t autoadj_tally; @@ -169,7 +172,9 @@ uint32_t rsamples_per_interval; uint32_t ms_per_packet; uint32_t remote_port; - uint8_t stuncount; + uint32_t stuncount; + uint32_t funny_stun; + uint32_t default_stuncount; struct switch_rtp_vad_data vad_data; struct switch_rtp_rfc2833_data dtmf_data; switch_payload_t te; @@ -188,6 +193,7 @@ switch_rtp_crypto_key_t *crypto_keys[SWITCH_RTP_CRYPTO_MAX]; int reading; int writing; + char *stun_ip; }; static int global_init = 0; @@ -195,6 +201,52 @@ rtp_msg_t *send_msg, void *data, uint32_t datalen, switch_payload_t payload, uint32_t timestamp, switch_frame_flag_t *flags); +static switch_status_t do_stun_ping(switch_rtp_t *rtp_session) +{ + uint8_t buf[256] = { 0 }; + uint8_t *start = buf; + switch_stun_packet_t *packet; + unsigned int elapsed; + switch_size_t bytes; + switch_status_t status = SWITCH_STATUS_SUCCESS; + + switch_assert(rtp_session != NULL); + + WRITE_INC(rtp_session); + + if (rtp_session->stuncount != 0) { + rtp_session->stuncount--; + goto end; + } + + if (rtp_session->last_stun) { + elapsed = (unsigned int) ((switch_timestamp_now() - rtp_session->last_stun) / 1000); + + if (elapsed > 30000) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No stun for a long time (PUNT!)\n"); + status = SWITCH_STATUS_FALSE; + goto end; + } + } + + if (rtp_session->funny_stun) { + *start++ = 0; + *start++ = 0; + *start++ = 0x22; + *start++ = 0x22; + } + + packet = switch_stun_packet_build_header(SWITCH_STUN_BINDING_REQUEST, NULL, start); + bytes = switch_stun_packet_length(packet); + switch_socket_sendto(rtp_session->sock_output, rtp_session->remote_stun_addr, 0, (void *) packet, &bytes); + rtp_session->stuncount = rtp_session->default_stuncount; + + end: + WRITE_DEC(rtp_session); + + return status; +} + static switch_status_t ice_out(switch_rtp_t *rtp_session) { uint8_t buf[256] = { 0 }; @@ -214,7 +266,7 @@ } if (rtp_session->last_stun) { - elapsed = (unsigned int) ((switch_time_now() - rtp_session->last_stun) / 1000); + elapsed = (unsigned int) ((switch_timestamp_now() - rtp_session->last_stun) / 1000); if (elapsed > 30000) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No stun for a long time (PUNT!)\n"); @@ -227,12 +279,22 @@ switch_stun_packet_attribute_add_username(packet, rtp_session->ice_user, 32); bytes = switch_stun_packet_length(packet); switch_socket_sendto(rtp_session->sock_output, rtp_session->remote_addr, 0, (void *) packet, &bytes); - rtp_session->stuncount = 25; + rtp_session->stuncount = rtp_session->default_stuncount; end: WRITE_DEC(rtp_session); - return SWITCH_STATUS_SUCCESS; + return status; +} + + +static void handle_stun_ping_reply(switch_rtp_t *rtp_session, void *data, switch_size_t len) +{ + if (!switch_rtp_ready(rtp_session)) { + return; + } + + rtp_session->last_stun = switch_timestamp_now(); } static void handle_ice(switch_rtp_t *rtp_session, void *data, switch_size_t len) @@ -268,7 +330,7 @@ } end_buf = buf + ((sizeof(buf) > packet->header.length) ? packet->header.length : sizeof(buf)); - rtp_session->last_stun = switch_time_now(); + rtp_session->last_stun = switch_timestamp_now(); switch_stun_packet_first_attribute(packet, attr); @@ -828,6 +890,26 @@ rtp_session->cng_pt = pt; } +SWITCH_DECLARE(switch_status_t) switch_rtp_activate_stun_ping(switch_rtp_t *rtp_session, const char *stun_ip, uint32_t packet_count, switch_bool_t funny) +{ + + if (switch_sockaddr_info_get(&rtp_session->remote_stun_addr, stun_ip, SWITCH_UNSPEC, + SWITCH_STUN_DEFAULT_PORT, 0, rtp_session->pool) != SWITCH_STATUS_SUCCESS || !rtp_session->remote_stun_addr) { + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error resolving stun ping addr\n"); + return SWITCH_STATUS_FALSE; + } + + if (funny) { + rtp_session->funny_stun++; + } + + rtp_session->default_stuncount = packet_count; + + rtp_session->stun_ip = switch_core_strdup(rtp_session->pool, stun_ip); + return SWITCH_STATUS_SUCCESS; +} + SWITCH_DECLARE(switch_status_t) switch_rtp_activate_jitter_buffer(switch_rtp_t *rtp_session, uint32_t queue_frames) { rtp_session->jb = stfu_n_init(queue_frames); @@ -843,6 +925,7 @@ switch_snprintf(user_ice, sizeof(user_ice), "%s%s", rlogin, login); rtp_session->ice_user = switch_core_strdup(rtp_session->pool, ice_user); rtp_session->user_ice = switch_core_strdup(rtp_session->pool, user_ice); + rtp_session->default_stuncount = 25; if (rtp_session->ice_user) { if (ice_out(rtp_session) != SWITCH_STATUS_SUCCESS) { @@ -1218,8 +1301,12 @@ if (bytes && rtp_session->recv_msg.header.version != 2) { uint8_t *data = (uint8_t *) rtp_session->recv_msg.body; - if (rtp_session->recv_msg.header.version == 0 && rtp_session->ice_user) { - handle_ice(rtp_session, (void *) &rtp_session->recv_msg, bytes); + if (rtp_session->recv_msg.header.version == 0) { + if (rtp_session->ice_user) { + handle_ice(rtp_session, (void *) &rtp_session->recv_msg, bytes); + } else if (rtp_session->remote_stun_addr) { + handle_stun_ping_reply(rtp_session, (void *) &rtp_session->recv_msg, bytes); + } } if (rtp_session->invalid_handler) { @@ -1834,6 +1921,10 @@ rtp_session->last_write_ts = this_ts; } + if (rtp_session->remote_stun_addr) { + do_stun_ping(rtp_session); + } + if (rtp_session->ice_user) { if (ice_out(rtp_session) != SWITCH_STATUS_SUCCESS) { ret = -1; Modified: freeswitch/trunk/src/switch_stun.c ============================================================================== --- freeswitch/trunk/src/switch_stun.c (original) +++ freeswitch/trunk/src/switch_stun.c Fri Jul 18 12:18:31 2008 @@ -433,7 +433,8 @@ { switch_sockaddr_t *local_addr = NULL, *remote_addr = NULL, *from_addr = NULL; switch_socket_t *sock = NULL; - uint8_t buf[256] = { 0 }; + uint8_t buf[260] = { 0 }; + uint8_t *start = buf; void *end_buf; switch_stun_packet_t *packet; switch_stun_packet_attribute_t *attr; @@ -443,6 +444,14 @@ uint16_t rport = 0; switch_time_t started = 0; unsigned int elapsed = 0; + int funny = 0; + int size = sizeof(buf); + + switch_assert(err); + + if (!strcmp(*err, "funny")) { + funny = 1; + } *err = "Success"; @@ -468,8 +477,15 @@ return SWITCH_STATUS_FALSE; } + if (funny) { + *start++ = 0; + *start++ = 0; + *start++ = 0x22; + *start++ = 0x22; + } + switch_socket_opt_set(sock, SWITCH_SO_NONBLOCK, TRUE); - packet = switch_stun_packet_build_header(SWITCH_STUN_BINDING_REQUEST, NULL, buf); + packet = switch_stun_packet_build_header(SWITCH_STUN_BINDING_REQUEST, NULL, start); switch_stun_random_string(username, 32, NULL); switch_stun_packet_attribute_add_username(packet, username, 32); bytes = switch_stun_packet_length(packet); @@ -496,7 +512,11 @@ } switch_socket_close(sock); - packet = switch_stun_packet_parse(buf, sizeof(buf)); + if (funny) { + size -= 4; + } + + packet = switch_stun_packet_parse(start, size); if (!packet) { *err = "Invalid STUN/ICE packet"; return SWITCH_STATUS_FALSE;

1 0

[commit] r9087 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 18 Jul '08

18 Jul '08

Author: mikej Date: Fri Jul 18 12:17:45 2008 New Revision: 9087 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: doh Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Fri Jul 18 12:17:45 2008 @@ -2106,7 +2106,7 @@ } if (switch_stristr("tag=", user)) { - user += 3; + user += 4; istag++; } else if (user == domain) { isall++;

1 0

[commit] r9086 - freeswitch/trunk/debian
by Freeswitch SVN 18 Jul '08

18 Jul '08

Author: cypromis Date: Fri Jul 18 10:04:07 2008 New Revision: 9086 Modified: freeswitch/trunk/debian/control freeswitch/trunk/debian/files Log: typo Modified: freeswitch/trunk/debian/control ============================================================================== --- freeswitch/trunk/debian/control (original) +++ freeswitch/trunk/debian/control Fri Jul 18 10:04:07 2008 @@ -2,7 +2,7 @@ Maintainer: Michal Bielicki <michal.bielicki(a)voiceworks.pl> Section: net Priority: extra -Build-Depends: debhelper (>= 5), fakeroot, automake1.9, autoconf, libtool, unixodbc-dev, libasound2-dev, libcurl3-dev|libcurl4-openssl-dev, libssl-dev, ncurses-dev, libogg-dev, libvorbis-dev, libperl-dev, libgdbm-dev, libdb-dev, libgnutls-dev +Build-Depends: debhelper (>= 5), fakeroot, automake1.9, autoconf, libtool, unixodbc-dev, libasound2-dev, libcurl3-openssl-dev, libssl-dev, ncurses-dev, libogg-dev, libvorbis-dev, libperl-dev, libgdbm-dev, libdb-dev, libgnutls-dev Standards-Version: 3.7.3 Package: freeswitch Modified: freeswitch/trunk/debian/files ============================================================================== --- freeswitch/trunk/debian/files (original) +++ freeswitch/trunk/debian/files Fri Jul 18 10:04:07 2008 @@ -1,12 +1,18 @@ -freeswitch_1.0~rc6-1_i386.deb net extra -freeswitch-dev_1.0~rc6-1_i386.deb net extra -freeswitch-spidermonkey_1.0~rc6-1_i386.deb net extra -freeswitch-perl_1.0~rc6-1_i386.deb net extra -freeswitch-lua_1.0~rc6-1_i386.deb net extra -freeswitch-codec-passthru-g7231_1.0~rc6-1_i386.deb net extra -freeswitch-codec-passthru-amr_1.0~rc6-1_i386.deb net extra -freeswitch-codec-passthru-g729_1.0~rc6-1_i386.deb net extra -freeswitch-lang-en_1.0~rc6-1_i386.deb net extra -freeswitch-lang-de_1.0~rc6-1_i386.deb net extra -freeswitch-lang-fr_1.0~rc6-1_i386.deb net extra -freeswitch-lang-it_1.0~rc6-1_i386.deb net extra +freeswitch_1.0.1~trunk_i386.deb net extra +freeswitch-dev_1.0.1~trunk_i386.deb net extra +freeswitch-spidermonkey_1.0.1~trunk_i386.deb net extra +freeswitch-perl_1.0.1~trunk_i386.deb net extra +freeswitch-lua_1.0.1~trunk_i386.deb net extra +freeswitch-codec-passthru-g7231_1.0.1~trunk_i386.deb net extra +freeswitch-codec-passthru-amr_1.0.1~trunk_i386.deb net extra +freeswitch-codec-passthru-g729_1.0.1~trunk_i386.deb net extra +freeswitch-lang-en_1.0.1~trunk_i386.deb net extra +freeswitch-sounds-en-us-callie-8000_1.0.1~trunk_i386.deb net extra +freeswitch-sounds-en-us-callie-16000_1.0.1~trunk_i386.deb net extra +freeswitch-sounds-en-us-callie-32000_1.0.1~trunk_i386.deb net extra +freeswitch-sounds-music-8000_1.0.1~trunk_i386.deb net extra +freeswitch-lang-de_1.0.1~trunk_i386.deb net extra +freeswitch-lang-fr_1.0.1~trunk_i386.deb net extra +freeswitch-lang-it_1.0.1~trunk_i386.deb net extra +freeswitch-lang-es_1.0.1~trunk_i386.deb net extra +freeswitch-lang-nl_1.0.1~trunk_i386.deb net extra

1 0

[commit] r9085 - freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx
by Freeswitch SVN 18 Jul '08

18 Jul '08

Author: brian Date: Fri Jul 18 09:31:00 2008 New Revision: 9085 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile Log: typo Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile Fri Jul 18 09:31:00 2008 @@ -48,7 +48,7 @@ mv $(BASE)/libs/Communicator_semi_40.cd_semi_6000/* $(DESTDIR)$(PREFIX)/grammar/model/communicator $(DESTDIR)$(PREFIX)/grammar/model/wsj1: - mkdir -p $(DESTDIR)$(PREFIX)/grammar/model/wjs1 + mkdir -p $(DESTDIR)$(PREFIX)/grammar/model/wsj1 mv $(POCKETSPHINX_DIR)/model/hmm/wsj1/* $(DESTDIR)$(PREFIX)/grammar/model/communicator/wsj1 grammar_maker:

1 0

[commit] r9084 - in freeswitch/trunk: conf/autoload_configs src/mod/asr_tts/mod_pocketsphinx
by Freeswitch SVN 17 Jul '08

17 Jul '08

Author: brian Date: Thu Jul 17 19:49:25 2008 New Revision: 9084 Modified: freeswitch/trunk/conf/autoload_configs/pocketsphinx.conf.xml freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Log: add config and woops our config options have dashes not underscores... variables have underscore Modified: freeswitch/trunk/conf/autoload_configs/pocketsphinx.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/pocketsphinx.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/pocketsphinx.conf.xml Thu Jul 17 19:49:25 2008 @@ -4,5 +4,7 @@ <param name="silence-hits" value="25"/> <param name="listen-hits" value="1"/> <param name="auto-reload" value="true"/> +  +  </settings> </configuration> Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Thu Jul 17 19:49:25 2008 @@ -443,9 +443,9 @@ globals.listen_hits = atoi(val); } else if (!strcasecmp(var, "auto-reload")) { globals.auto_reload = switch_true(val); - } else if (!strcasecmp(var, "narrowband_model")) { + } else if (!strcasecmp(var, "narrowband-model")) { globals.model8k = switch_core_strdup(globals.pool, val); - } else if (!strcasecmp(var, "wideband_model")) { + } else if (!strcasecmp(var, "wideband-model")) { globals.model16k = switch_core_strdup(globals.pool, val); } }

1 0

[commit] r9083 - freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx
by Freeswitch SVN 17 Jul '08

17 Jul '08

Author: brian Date: Thu Jul 17 19:46:47 2008 New Revision: 9083 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Log: move the models into the config so you can override them and set the defaults if you dont Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Thu Jul 17 19:46:47 2008 @@ -49,6 +49,7 @@ uint32_t silence_hits; uint32_t listen_hits; int auto_reload; + switch_memory_pool_t *pool; } globals; typedef enum { @@ -442,9 +443,22 @@ globals.listen_hits = atoi(val); } else if (!strcasecmp(var, "auto-reload")) { globals.auto_reload = switch_true(val); + } else if (!strcasecmp(var, "narrowband_model")) { + globals.model8k = switch_core_strdup(globals.pool, val); + } else if (!strcasecmp(var, "wideband_model")) { + globals.model16k = switch_core_strdup(globals.pool, val); } } } + + if (!globals.model8k) { + globals.model8k = switch_core_strdup(globals.pool, "communicator"); + } + + if (!globals.model16k) { + globals.model16k = switch_core_strdup(globals.pool, "wsj1"); + } + done: if (xml) { switch_xml_free(xml); @@ -473,6 +487,8 @@ switch_asr_interface_t *asr_interface; switch_mutex_init(&MUTEX, SWITCH_MUTEX_NESTED, pool); + + globals.pool = pool; if ((switch_event_bind_removable(modname, SWITCH_EVENT_RELOADXML, NULL, event_handler, NULL, &NODE) != SWITCH_STATUS_SUCCESS)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); @@ -495,9 +511,6 @@ asr_interface->asr_check_results = pocketsphinx_asr_check_results; asr_interface->asr_get_results = pocketsphinx_asr_get_results; - globals.model8k = switch_core_strdup(pool, "communicator"); - globals.model16k = switch_core_strdup(pool, "wsj1"); - err_set_logfp(NULL); /* indicate that the module should continue to be loaded */

1 0

[commit] r9082 - freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx
by Freeswitch SVN 17 Jul '08

17 Jul '08

Author: brian Date: Thu Jul 17 19:13:11 2008 New Revision: 9082 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Log: add 16k support to pocketsphinx using the wsj1 model. Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile Thu Jul 17 19:13:11 2008 @@ -47,6 +47,10 @@ mkdir -p $(DESTDIR)$(PREFIX)/grammar/model/communicator mv $(BASE)/libs/Communicator_semi_40.cd_semi_6000/* $(DESTDIR)$(PREFIX)/grammar/model/communicator +$(DESTDIR)$(PREFIX)/grammar/model/wsj1: + mkdir -p $(DESTDIR)$(PREFIX)/grammar/model/wjs1 + mv $(POCKETSPHINX_DIR)/model/hmm/wsj1/* $(DESTDIR)$(PREFIX)/grammar/model/communicator/wsj1 + grammar_maker: @cp -f $(BASE)/scripts/mklm $(DESTDIR)$(PREFIX)/bin/mklm @cp -f $(BASE)/scripts/quick_lm.pl $(DESTDIR)$(PREFIX)/bin/quick_lm.pl @@ -55,4 +59,4 @@ @cp -f $(BASE)/scripts/Makefile.gram $(DESTDIR)$(PREFIX)/grammar/Makefile @cp -f $(POCKETSPHINX_DIR)/model/lm/cmudict.0.6d $(DESTDIR)$(PREFIX)/conf/cmudict.0.6d -local_install: $(DESTDIR)$(PREFIX)/grammar/model $(DESTDIR)$(PREFIX)/grammar/model/communicator grammar_maker +local_install: $(DESTDIR)$(PREFIX)/grammar/model $(DESTDIR)$(PREFIX)/grammar/model/communicator $(DESTDIR)$(PREFIX)/grammar/model/wsj1 grammar_maker Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Thu Jul 17 19:13:11 2008 @@ -43,7 +43,8 @@ static switch_event_node_t *NODE = NULL; static struct { - char *model; + char *model8k; + char *model16k; uint32_t thresh; uint32_t silence_hits; uint32_t listen_hits; @@ -78,19 +79,25 @@ /*! function to open the asr interface */ static switch_status_t pocketsphinx_asr_open(switch_asr_handle_t *ah, const char *codec, int rate, const char *dest, switch_asr_flag_t *flags) { - pocketsphinx_t *ps; if (!(ps = (pocketsphinx_t *) switch_core_alloc(ah->memory_pool, sizeof(*ps)))) { return SWITCH_STATUS_MEMERR; } - switch_mutex_init(&ps->flag_mutex, SWITCH_MUTEX_NESTED, ah->memory_pool); ah->private_info = ps; + if (rate == 8000) { + ah->rate = 8000; + } else if (rate == 16000) { + ah->rate = 16000; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "invalid rate %d. Only 8000 and 16000 are supported.\n", rate); + } + codec = "L16"; - ah->rate = 8000; + ah->codec = switch_core_strdup(ah->memory_pool, codec); @@ -105,7 +112,7 @@ /*! function to load a grammar to the asr interface */ static switch_status_t pocketsphinx_asr_load_grammar(switch_asr_handle_t *ah, const char *grammar, const char *path) { - char *lm, *dic, *model; + char *lm, *dic, *model, *rate = NULL; pocketsphinx_t *ps = (pocketsphinx_t *) ah->private_info; switch_status_t status = SWITCH_STATUS_FALSE; @@ -122,8 +129,11 @@ dic = switch_mprintf("%s%s%s%s%s.dic", SWITCH_GLOBAL_dirs.grammar_dir, SWITCH_PATH_SEPARATOR, grammar, SWITCH_PATH_SEPARATOR, grammar); } - model = switch_mprintf("%s%smodel%s%s", SWITCH_GLOBAL_dirs.grammar_dir, SWITCH_PATH_SEPARATOR, SWITCH_PATH_SEPARATOR, globals.model); - + if (ah->rate == 8000) { + model = switch_mprintf("%s%smodel%s%s", SWITCH_GLOBAL_dirs.grammar_dir, SWITCH_PATH_SEPARATOR, SWITCH_PATH_SEPARATOR, globals.model8k); + } else { + model = switch_mprintf("%s%smodel%s%s", SWITCH_GLOBAL_dirs.grammar_dir, SWITCH_PATH_SEPARATOR, SWITCH_PATH_SEPARATOR, globals.model16k); + } if (switch_file_exists(dic, ah->memory_pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open dictionary %s.\n", dic); goto end; @@ -134,10 +144,12 @@ goto end; } + rate = switch_mprintf("%d", ah->rate); + switch_assert(lm && dic && model); ps->config = cmd_ln_init(ps->config, ps_args(), FALSE, - "-samprate", "8000", + "-samprate", rate, "-hmm", model, "-lm", lm, "-dict", dic, @@ -175,6 +187,7 @@ end: + switch_safe_free(rate); switch_safe_free(lm); switch_safe_free(dic); switch_safe_free(model); @@ -366,8 +379,8 @@ lconf = (int32_t)logmath_log_to_ln(ps_get_logmath(ps->ps), conf); ps->confidence = lconf - lconf - lconf; - if (ps->confidence > 100) { - ps->confidence = 100; + if (ps->confidence > 1000) { + ps->confidence = 1000; } else if (ps->confidence < 0) { ps->confidence = 0; } @@ -482,7 +495,9 @@ asr_interface->asr_check_results = pocketsphinx_asr_check_results; asr_interface->asr_get_results = pocketsphinx_asr_get_results; - globals.model = switch_core_strdup(pool, "communicator"); + globals.model8k = switch_core_strdup(pool, "communicator"); + globals.model16k = switch_core_strdup(pool, "wsj1"); + err_set_logfp(NULL); /* indicate that the module should continue to be loaded */

1 0

[commit] r9081 - freeswitch/trunk/conf/dialplan/extensions
by Freeswitch SVN 17 Jul '08

17 Jul '08

Author: brian Date: Thu Jul 17 17:33:58 2008 New Revision: 9081 Added: freeswitch/trunk/conf/dialplan/extensions/00_pizza_demo.xml Log: some examples of modules_exists Added: freeswitch/trunk/conf/dialplan/extensions/00_pizza_demo.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/dialplan/extensions/00_pizza_demo.xml Thu Jul 17 17:33:58 2008 @@ -0,0 +1,9 @@ +<include> + <extension name="pizza_demo"> + <condition field="destination_number" expression="^(pizza|74992)$"/> + <condition field="${module_exists(mod_spidermonkey)}" expression="true"/> + <condition field="${module_exists(mod_pocketsphinx)}" expression="true"> + <action application="javascript" data="ps_pizza.js"/> + </condition> + </extension> +</include>

1 0

[commit] r9080 - freeswitch/trunk
by Freeswitch SVN 17 Jul '08

17 Jul '08

Author: mikej Date: Thu Jul 17 17:25:17 2008 New Revision: 9080 Modified: freeswitch/trunk/configure.in Log: tweak Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Thu Jul 17 17:25:17 2008 @@ -3,7 +3,7 @@ # Must change all of the below together # For a release, set revision for that tagged release as well and uncomment -AC_INIT([freeswitch], [1.0.pre4], BUG-REPORT-ADDRESS) +AC_INIT([freeswitch], [1.0.trunk], BUG-REPORT-ADDRESS) AC_SUBST(SWITCH_VERSION_MAJOR, [1]) AC_SUBST(SWITCH_VERSION_MINOR, [0]) AC_SUBST(SWITCH_VERSION_MICRO, [trunk])

1 0