May 2009 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r13271 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 10 May '09

10 May '09

Author: brian Date: Sun May 10 12:12:29 2009 New Revision: 13271 Log: MODSOFIA-7 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 Sun May 10 12:12:29 2009 @@ -2898,6 +2898,11 @@ switch_channel_set_variable_partner(channel, var_name, p_contact->m_url->url_host); switch_channel_set_variable(channel, var_name, p_contact->m_url->url_host); } + if (p_contact->m_url->url_params) { + switch_snprintf(var_name, sizeof(var_name), "sip_redirect_contact_params_%d", i); + switch_channel_set_variable_partner(channel, var_name, p_contact->m_url->url_params); + switch_channel_set_variable(channel, var_name, p_contact->m_url->url_params); + } p_contact = p_contact->m_next; i++; }

1 0

[Freeswitch-svn] [commit] r13270 - freeswitch/trunk/src/mod/asr_tts/mod_flite
by FreeSWITCH SVN 10 May '09

10 May '09

Author: brian Date: Sun May 10 12:06:33 2009 New Revision: 13270 Log: MODASRTTS-15 Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.c Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.c Sun May 10 12:06:33 2009 @@ -45,8 +45,8 @@ void unregister_cmu_us_slt(cst_voice * v); SWITCH_MODULE_LOAD_FUNCTION(mod_flite_load); -SWITCH_MODULE_DEFINITION(mod_flite, mod_flite_load, NULL, NULL); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_flite_shutdown); +SWITCH_MODULE_DEFINITION(mod_flite, mod_flite_load, mod_flite_shutdown, NULL); static struct { cst_voice *awb;

1 0

[Freeswitch-svn] [commit] r13269 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 09 May '09

09 May '09

Author: mrene Date: Sat May 9 14:30:46 2009 New Revision: 13269 Log: mod_sofia: Add rescan option to killgw Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 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 Sat May 9 14:30:46 2009 @@ -2043,6 +2043,14 @@ sofia_glue_del_gateway(gateway_ptr); sofia_reg_release_gateway(gateway_ptr); stream->write_function(stream, "+OK gateway marked for deletion.\n"); + + if (argc > 3 && !strcasecmp(argv[3], "rescan")) { + if (reconfig_sofia(profile) == SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "+OK scan complete\n"); + } else { + stream->write_function(stream, "-ERR cannot find config for profile %s\n", profile->name); + } + } } else { stream->write_function(stream, "-ERR no such gateway.\n"); }

1 0

[Freeswitch-svn] [commit] r13268 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 09 May '09

09 May '09

Author: mrene Date: Sat May 9 11:51:12 2009 New Revision: 13268 Log: mod_lcr: Add ifdefs around odbc calls in shutdown function Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Sat May 9 11:51:12 2009 @@ -1350,8 +1350,10 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_lcr_shutdown) { +#ifdef SWITCH_HAVE_ODBC switch_odbc_handle_disconnect(globals.master_odbc); switch_odbc_handle_destroy(&globals.master_odbc); +#endif switch_core_hash_destroy(&globals.profile_hash); return SWITCH_STATUS_SUCCESS;

1 0

[Freeswitch-svn] [commit] r13267 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 09 May '09

09 May '09

Author: mrene Date: Sat May 9 10:05:33 2009 New Revision: 13267 Log: SFSIP-145 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 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 Sat May 9 10:05:33 2009 @@ -1857,10 +1857,10 @@ char *sql = NULL; if ((argv[1]) && (profile = sofia_glue_find_profile(argv[1]))) { + stream->write_function(stream, "%s\n", header); + stream->write_function(stream, "<profile>\n"); if (!argv[2] || strcasecmp(argv[2], "reg")) { - stream->write_function(stream, "%s\n", header); - stream->write_function(stream, " <profile>\n"); - stream->write_function(stream, " <profile-info>\n"); + stream->write_function(stream, " <profile-info>\n"); stream->write_function(stream, " <name>%s</name>\n", switch_str_nil(argv[1])); stream->write_function(stream, " <domain-name>%s</domain-name>\n", profile->domain_name ? profile->domain_name : "N/A"); if (strcasecmp(argv[1], profile->name)) { @@ -1902,9 +1902,8 @@ stream->write_function(stream, " <calls-out>%d</calls-out>\n", profile->ob_calls); stream->write_function(stream, " <failed-calls-in>%d</failed-calls-in>\n", profile->ib_failed_calls); stream->write_function(stream, " <failed-calls-out>%d</failed-calls-out>\n", profile->ob_failed_calls); - + stream->write_function(stream, " </profile-info>\n"); } - stream->write_function(stream, " </profile-info>\n"); stream->write_function(stream, " <registrations>\n"); cb.profile = profile; @@ -1939,7 +1938,7 @@ sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, show_reg_callback_xml, &cb); free(sql); - stream->write_function(stream, "</registrations>\n"); + stream->write_function(stream, " </registrations>\n"); stream->write_function(stream, "</profile>\n"); sofia_glue_release_profile(profile);

1 0

[Freeswitch-svn] [commit] r13266 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 09 May '09

09 May '09

Author: mrene Date: Fri May 8 20:58:30 2009 New Revision: 13266 Log: SFSIP-144 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 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 May 8 20:58:30 2009 @@ -1605,7 +1605,7 @@ TAG_IF(!switch_strlen_zero(tech_pvt->rpid), SIPTAG_REMOTE_PARTY_ID_STR(tech_pvt->rpid)), TAG_IF(!switch_strlen_zero(tech_pvt->preferred_id), SIPTAG_P_PREFERRED_IDENTITY_STR(tech_pvt->preferred_id)), TAG_IF(!switch_strlen_zero(tech_pvt->asserted_id), SIPTAG_P_ASSERTED_IDENTITY_STR(tech_pvt->asserted_id)), - TAG_IF(!switch_strlen_zero(tech_pvt->privacy), SIPTAG_PRIVACY_STR(tech_pvt->preferred_id)), + TAG_IF(!switch_strlen_zero(tech_pvt->privacy), SIPTAG_PRIVACY_STR(tech_pvt->privacy)), TAG_IF(!switch_strlen_zero(alert_info), SIPTAG_HEADER_STR(alert_info)), TAG_IF(!switch_strlen_zero(extra_headers), SIPTAG_HEADER_STR(extra_headers)), TAG_IF(!switch_strlen_zero(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)),

1 0

[Freeswitch-svn] [commit] r13265 - freeswitch/trunk/src/mod/codecs/mod_dahdi_codec
by FreeSWITCH SVN 09 May '09

09 May '09

Author: moy Date: Fri May 8 19:23:05 2009 New Revision: 13265 Log: return silence frame in dahdi codec when there is no output from the decoder Modified: freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c Modified: freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c Fri May 8 19:23:05 2009 @@ -383,8 +383,11 @@ return SWITCH_STATUS_FALSE; } if (0 == res) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No output on %s decoder device.\n", transcoder_name); - *decoded_data_len = 0; + memset(dbuf_linear, 0, codec->implementation->decoded_bytes_per_packet); + *decoded_data_len = codec->implementation->decoded_bytes_per_packet; +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No output on %s decoder device, returning silence frame of %d bytes.\n", transcoder_name, *decoded_data_len); +#endif return SWITCH_STATUS_SUCCESS; } res = read(context->decoding_fd, dbuf_ulaw, sizeof(dbuf_ulaw)); @@ -508,7 +511,7 @@ int spf = 160; int bpfd = 320; int bpfc = 20; - int fpnp = 10; + int fpnp = 20; switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ @@ -518,7 +521,7 @@ 8000, /* samples transferred per second */ 8000, /* actual samples transferred per second */ 8000, /* bits transferred per second */ - mpf, /* number of microseconds per frame (10ms frames) */ + mpf, /* number of microseconds per frame */ spf, /* number of samples per frame */ bpfd, /* number of bytes per frame decompressed */ bpfc, /* number of bytes per frame compressed */ @@ -544,7 +547,7 @@ 8000, /* samples transferred per second */ 8000, /* actual samples transferred per second */ 8000, /* bits transferred per second */ - mpf, /* number of microseconds per frame (10ms frames) */ + mpf, /* number of microseconds per frame */ spf, /* number of samples per frame */ bpfd, /* number of bytes per frame decompressed */ bpfc, /* number of bytes per frame compressed */

1 0

[Freeswitch-svn] [commit] r13264 - freeswitch/trunk/src
by FreeSWITCH SVN 08 May '09

08 May '09

Author: anthm Date: Fri May 8 14:03:54 2009 New Revision: 13264 Log: FSCORE-357 Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Fri May 8 14:03:54 2009 @@ -2052,8 +2052,8 @@ continue; } - switch_channel_wait_for_state_timeout(switch_core_session_get_channel(originate_status[i].peer_session), CS_DESTROY, 5000); - + switch_channel_wait_for_state_timeout(switch_core_session_get_channel(originate_status[i].peer_session), CS_REPORTING, 5000); + switch_yield(100000); if (switch_ivr_generate_xml_cdr(originate_status[i].peer_session, &cdr) == SWITCH_STATUS_SUCCESS) { if ((xml_text = switch_xml_toxml(cdr, SWITCH_FALSE))) { switch_snprintf(buf, sizeof(buf), "%s_%d", cdr_var, ++cdr_total);

1 0

[Freeswitch-svn] [commit] r13263 - freeswitch/trunk/src/include
by FreeSWITCH SVN 08 May '09

08 May '09

Author: mrene Date: Thu May 7 23:48:55 2009 New Revision: 13263 Log: oops Modified: freeswitch/trunk/src/include/switch_xml.h Modified: freeswitch/trunk/src/include/switch_xml.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml.h (original) +++ freeswitch/trunk/src/include/switch_xml.h Thu May 7 23:48:55 2009 @@ -360,14 +360,14 @@ _Out_ switch_xml_t *root, _Out_ switch_xml_t *domain, _Out_ switch_xml_t *group, - _In_ switch_event_t *params); + _In_opt_ switch_event_t *params); SWITCH_DECLARE(switch_status_t) switch_xml_locate_user(_In_z_ const char *key, _In_z_ const char *user_name, _In_z_ const char *domain_name, _In_z_ const char *ip, _Out_ switch_xml_t *root, _Out_ switch_xml_t *domain, _Out_ switch_xml_t *user, _Out_ switch_xml_t *ingroup, - _In_ switch_event_t *params); + _In_opt_ switch_event_t *params); SWITCH_DECLARE(switch_status_t) switch_xml_locate_user_in_domain(_In_z_ const char *user_name, _In_ switch_xml_t domain, _Out_ switch_xml_t *user, _Out_ switch_xml_t *ingroup);

1 0

[Freeswitch-svn] [commit] r13262 - freeswitch/trunk/src/mod/codecs/mod_dahdi_codec
by FreeSWITCH SVN 08 May '09

08 May '09

Author: moy Date: Thu May 7 23:40:32 2009 New Revision: 13262 Log: added proper waiting (up to 10ms) for the DAHDI transcoder output frame Modified: freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c Modified: freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c Thu May 7 23:40:32 2009 @@ -39,6 +39,16 @@ #include <fcntl.h> #include <errno.h> +/* + * some rules to keep in mind for G729 (the frame size may be different for G723) + * we cannot write more than SFRAME_SIZE (320) - sizeof(struct rtp_packet) which + * seems to be 266 bytes + * if we write less than 160 bytes (1 ulaw frame which is 20 bytes of G729 bytes, a read will block forever) + * TODO: do buffering ourselves to provide just the fixed amount of samples that the card expects + * */ +#define DAHDI_G729_INPUT_FRAME_SIZE 160 +#define DAHDI_G729_OUTPUT_FRAME_SIZE 20 + /*#define DEBUG_DAHDI_CODEC 1*/ #define CODEC_G729_IANA_CODE 18 @@ -221,19 +231,22 @@ context->codec_r = (codec->implementation->ianacode == CODEC_G729_IANA_CODE) ? 8 : 12; + return SWITCH_STATUS_SUCCESS; } static int wait_for_transcoder(int fd) { - /* let's wait a bit for the transcoder, if in 20msthe driver does not notify us that its ready to accept more works + /* let's wait a bit for the transcoder, if in 20msthe driver does not notify us that its ready to give us something then just bail out with 0 bytes encoded/decoded as result, I'd expect the card to hold that buffer and return it later */ int res = 0; struct pollfd readpoll; memset(&readpoll, 0, sizeof(readpoll)); readpoll.fd = fd; - readpoll.events = POLLOUT; - res = poll(&readpoll, 1, 50); + readpoll.events = POLLIN; + /* my testing shows that it does not take more than 1ms to encode a 160 bytes frame ulaw to g729, + I dont think there is much difference decoding and for g723, waiting 10ms seems more than reasonable */ + res = poll(&readpoll, 1, 10); return res; }

1 0