- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4341 - in freeswitch/trunk/src: . mod/codecs/mod_g711
by Freeswitch SVN 21 Feb '07

21 Feb '07

Author: anthm Date: Wed Feb 21 01:35:55 2007 New Revision: 4341 Modified: freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_ivr.c Log: add 120ms to g711, fix errs in g711 alaw defs, tweak buffer in file playback and add kill to hupall Modified: freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c Wed Feb 21 01:35:55 2007 @@ -188,6 +188,26 @@ /* Registration */ +static const switch_codec_implementation_t g711u_8k_120ms_implementation = { + /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, + /*.ianacode */ 0, + /*.iananame */ "PCMU", + /*.fmtp */ NULL, + /*.samples_per_second */ 8000, + /*.bits_per_second */ 64000, + /*.microseconds_per_frame */ 120000, + /*.samples_per_frame */ 960, + /*.bytes_per_frame */ 1920, + /*.encoded_bytes_per_frame */ 960, + /*.number_of_channels */ 1, + /*.pref_frames_per_packet */ 1, + /*.max_frames_per_packet */ 1, + /*.init */ switch_g711u_init, + /*.encode */ switch_g711u_encode, + /*.decode */ switch_g711u_decode, + /*.destroy */ switch_g711u_destroy +}; + static const switch_codec_implementation_t g711u_8k_60ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 0, @@ -205,7 +225,8 @@ /*.init */ switch_g711u_init, /*.encode */ switch_g711u_encode, /*.decode */ switch_g711u_decode, - /*.destroy */ switch_g711u_destroy + /*.destroy */ switch_g711u_destroy, + /*.next*/ &g711u_8k_120ms_implementation }; static const switch_codec_implementation_t g711u_8k_30ms_implementation = { @@ -273,6 +294,25 @@ +static const switch_codec_implementation_t g711a_8k_120ms_implementation = { + /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, + /*.ianacode */ 8, + /*.iananame */ "PCMA", + /*.fmtp */ NULL, + /*.samples_per_second */ 8000, + /*.bits_per_second */ 64000, + /*.microseconds_per_frame */ 120000, + /*.samples_per_frame */ 960, + /*.bytes_per_frame */ 1920, + /*.encoded_bytes_per_frame */ 960, + /*.number_of_channels */ 1, + /*.pref_frames_per_packet */ 1, + /*.max_frames_per_packet */ 1, + /*.init */ switch_g711a_init, + /*.encode */ switch_g711a_encode, + /*.decode */ switch_g711a_decode, + /*.destroy */ switch_g711a_destroy +}; static const switch_codec_implementation_t g711a_8k_60ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, @@ -288,10 +328,11 @@ /*.number_of_channels */ 1, /*.pref_frames_per_packet */ 1, /*.max_frames_per_packet */ 1, - /*.init */ switch_g711u_init, - /*.encode */ switch_g711u_encode, - /*.decode */ switch_g711u_decode, - /*.destroy */ switch_g711u_destroy, + /*.init */ switch_g711a_init, + /*.encode */ switch_g711a_encode, + /*.decode */ switch_g711a_decode, + /*.destroy */ switch_g711a_destroy, + /*.next*/ &g711a_8k_120ms_implementation }; static const switch_codec_implementation_t g711a_8k_30ms_implementation = { @@ -308,10 +349,10 @@ /*.number_of_channels */ 1, /*.pref_frames_per_packet */ 1, /*.max_frames_per_packet */ 1, - /*.init */ switch_g711u_init, - /*.encode */ switch_g711u_encode, - /*.decode */ switch_g711u_decode, - /*.destroy */ switch_g711u_destroy, + /*.init */ switch_g711a_init, + /*.encode */ switch_g711a_encode, + /*.decode */ switch_g711a_decode, + /*.destroy */ switch_g711a_destroy, /*.next*/ &g711a_8k_60ms_implementation }; @@ -350,10 +391,10 @@ /*.number_of_channels */ 1, /*.pref_frames_per_packet */ 1, /*.max_frames_per_packet */ 1, - /*.init */ switch_g711u_init, - /*.encode */ switch_g711u_encode, - /*.decode */ switch_g711u_decode, - /*.destroy */ switch_g711u_destroy, + /*.init */ switch_g711a_init, + /*.encode */ switch_g711a_encode, + /*.decode */ switch_g711a_decode, + /*.destroy */ switch_g711a_destroy, /*.next*/ &g711a_8k_20ms_implementation }; Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Wed Feb 21 01:35:55 2007 @@ -693,6 +693,7 @@ session = (switch_core_session_t *) val; channel = switch_core_session_get_channel(session); switch_channel_hangup(channel, cause); + switch_core_session_kill_channel(session, SWITCH_SIG_KILL); } } switch_mutex_unlock(runtime.session_table_mutex); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Wed Feb 21 01:35:55 2007 @@ -1218,6 +1218,14 @@ if (!fh->audio_buffer) { switch_buffer_create_dynamic(&fh->audio_buffer, FILE_BLOCKSIZE, FILE_BUFSIZE, 0); + if (!fh->audio_buffer) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup buffer failed\n"); + + switch_core_file_close(fh); + switch_core_session_reset(session); + + return SWITCH_STATUS_GENERR; + } } if (asis) { @@ -1334,7 +1342,10 @@ olen = asis ? framelen : ilen; do_speed = 0; } else { - olen = 32 * framelen; + olen = sizeof(abuf); + if (!asis) { + olen /= 2; + } switch_core_file_read(fh, abuf, &olen); switch_buffer_write(fh->audio_buffer, abuf, asis ? olen : olen * 2); olen = switch_buffer_read(fh->audio_buffer, abuf, framelen);

1 0

[commit] r4340 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 21 Feb '07

21 Feb '07

Author: brian Date: Tue Feb 20 22:37:17 2007 New Revision: 4340 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: change the override to header symbol from : to ^ (beware) 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 Tue Feb 20 22:37:17 2007 @@ -2256,7 +2256,7 @@ goto done; } - if ((dest_to = strchr(dest, ':'))) { + if ((dest_to = strchr(dest, '^'))) { *dest_to++ = '\0'; tech_pvt->dest_to = switch_core_session_alloc(nsession, strlen(dest_to) + 5); snprintf(tech_pvt->dest_to, strlen(dest_to) + 5, "sip:%s", dest_to);

1 0

[commit] r4339 - in freeswitch/trunk/src: . include
by Freeswitch SVN 20 Feb '07

20 Feb '07

Author: mikej Date: Tue Feb 20 16:54:23 2007 New Revision: 4339 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch_core.c Log: add pool allocated printf function switch_core_sprintf Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Tue Feb 20 16:54:23 2007 @@ -402,6 +402,15 @@ */ SWITCH_DECLARE(char *) switch_core_session_sprintf(switch_core_session_t *session, const char *fmt, ...); +/*! + \brief printf-style style printing routine. The data is output to a string allocated from the pool + \param pool a pool to use for allocation + \param fmt The format of the string + \param ... The arguments to use while printing the data + \return The new string +*/ +SWITCH_DECLARE(char *) switch_core_sprintf(switch_memory_pool_t *pool, const char *fmt, ...); + /*! \brief Retrieve the memory pool from a session \param session the session to retrieve the pool from Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Feb 20 16:54:23 2007 @@ -1481,6 +1481,21 @@ return result; } +SWITCH_DECLARE(char *) switch_core_sprintf(switch_memory_pool_t *pool, const char *fmt, ...) +{ + va_list ap; + char *result = NULL; + + assert(pool != NULL); + va_start(ap, fmt); + + result = apr_pvsprintf(pool ,fmt, ap); + + va_end(ap); + + return result; +} + SWITCH_DECLARE(char *) switch_core_session_strdup(switch_core_session_t *session, const char *todup) {

1 0

[commit] r4338 - freeswitch/trunk/src
by Freeswitch SVN 20 Feb '07

20 Feb '07

Author: mikej Date: Tue Feb 20 13:27:21 2007 New Revision: 4338 Modified: freeswitch/trunk/src/switch_core.c Log: refactor switch_core_sql_thread with the following main changes: Do the entire transaction as a single exec, instead of 3 separate ones to resolve issue of unmatched transaction error. try really hard to commit the transaction (1000 times) but we no longer try forever. If 1000 times fail, you will lose some update/insert/deletes from the core db, but we will no longer continue to loop forever and stop processing the sql queue in the case of an error. added better overflow protection to the buffer, we now ignore sql strings we get over 64k. (not full transactions, just individual sql strings that we get queued). Previously this caused a buffer overflow. We now use sprintf instead of snprintf as we are already handling overflow checks outside of the sprintf. Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Feb 20 13:27:21 2007 @@ -3790,9 +3790,15 @@ uint32_t itterations = 0; uint8_t trans = 0, nothing_in_queue = 0; uint32_t freq = 1000, target = 1000; - uint32_t len = 0; - uint32_t sql_len = SQLLEN; + switch_size_t len = 0, sql_len = SQLLEN; + const char *begin_sql = "BEGIN DEFERRED TRANSACTION CORE1;\n"; + char *end_sql = "END TRANSACTION CORE1"; + switch_size_t begin_len = strlen(begin_sql); + switch_size_t end_len = strlen(end_sql); char *sqlbuf = (char *) malloc(sql_len); + char *sql; + switch_size_t newlen; + if (!runtime.event_db) { runtime.event_db = switch_core_db_handle(); @@ -3801,28 +3807,32 @@ for(;;) { if (switch_queue_trypop(runtime.sql_queue, &pop) == SWITCH_STATUS_SUCCESS) { - char *sql = (char *) pop; - uint32_t newlen; + sql = (char *) pop; if (sql) { - if (itterations == 0) { - char *isql = "begin transaction CORE1;\n"; - switch_core_db_persistant_execute(runtime.event_db, isql, 0); - trans = 1; - - } + newlen = strlen(sql) + 2; + + /* ignore abnormally large strings sql strings as potential buffer overflow */ + if (newlen + end_len < SQLLEN) { + + if (itterations == 0) { + len = begin_len; + sprintf(sqlbuf, "%s", begin_sql); + trans = 1; + } - itterations++; - newlen = (uint32_t)strlen(sql) + 2; - if (len + newlen > sql_len) { - sql_len = len + SQLLEN; - if (!(sqlbuf = realloc(sqlbuf, sql_len))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "SQL thread ending on mem err\n"); - break; + itterations++; + if (len + newlen + end_len > sql_len) { + sql_len = len + SQLLEN; + if (!(sqlbuf = realloc(sqlbuf, sql_len))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "SQL thread ending on mem err\n"); + break; + } } + sprintf(sqlbuf + len, "%s;\n", sql); + len += newlen; + } - snprintf(sqlbuf + len, sql_len - len, "%s;\n", sql); - len += newlen; switch_core_db_free(sql); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "SQL thread ending\n"); @@ -3834,10 +3844,10 @@ if (trans && ((itterations == target) || nothing_in_queue)) { - char *isql = "end transaction CORE1"; - - switch_core_db_persistant_execute(runtime.event_db, sqlbuf, 0); - switch_core_db_persistant_execute(runtime.event_db, isql, 0); + sprintf(sqlbuf + len, "%s", end_sql); + if (switch_core_db_persistant_execute(runtime.event_db, sqlbuf, 1000) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "SQL thread unable to commit transaction, records lost!\n"); + } itterations = 0; trans = 0; nothing_in_queue = 0;

1 0

[commit] r4337 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 20 Feb '07

20 Feb '07

Author: anthm Date: Tue Feb 20 12:50:50 2007 New Revision: 4337 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: update 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 Tue Feb 20 12:50:50 2007 @@ -683,7 +683,7 @@ static void set_local_sdp(private_object_t *tech_pvt, char *ip, uint32_t port, char *sr, int force) { - char buf[1024]; + char buf[2048]; switch_time_t now = switch_time_now(); int ptime = 0; @@ -2365,7 +2365,7 @@ ptime = dptime; for (a = m->m_attributes; a; a = a->a_next) { - if (!strcasecmp(a->a_name, "ptime")) { + if (!strcasecmp(a->a_name, "ptime") && a->a_value) { ptime = atoi(a->a_value); } }

1 0

[commit] r4329 - in freeswitch/trunk/src: . include
by Freeswitch SVN 19 Feb '07

19 Feb '07

Author: mikej Date: Mon Feb 19 17:57:27 2007 New Revision: 4329 Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/switch_channel.c Log: switch_channel_set_variable_nodup which does not dup the value from the session pool. The value MUST already be allocated from the pool for that session, or very bad things could happen. Use with caution. Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Mon Feb 19 17:57:27 2007 @@ -211,6 +211,15 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_variable(switch_channel_t *channel, const char *varname, const char *value); /*! + \brief Set a variable on a given channel, without duplicating the value from the session pool. + \param channel channel to set variable on + \param varname the name of the variable + \param value the vaule of the variable (MUST BE ALLOCATED FROM THE SESSION POOL ALREADY) + \returns SWITCH_STATUS_SUCCESS if successful +*/ +SWITCH_DECLARE(switch_status_t) switch_channel_set_variable_nodup(switch_channel_t *channel, const char *varname, char *value); + +/*! \brief Retrieve a variable from a given channel \param channel channel to retrieve variable from \param varname the name of the variable Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Feb 19 17:57:27 2007 @@ -373,6 +373,23 @@ return SWITCH_STATUS_FALSE; } +SWITCH_DECLARE(switch_status_t) switch_channel_set_variable_nodup(switch_channel_t *channel, const char *varname, char *value) +{ + assert(channel != NULL); + + if (varname) { + switch_core_hash_delete(channel->variables, varname); + if (!switch_strlen_zero(value)) { + switch_core_hash_insert_dup(channel->variables, varname, value); + } else { + switch_core_hash_delete(channel->variables, varname); + } + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; +} + SWITCH_DECLARE(int) switch_channel_test_flag(switch_channel_t *channel, switch_channel_flag_t flags) { assert(channel != NULL);

1 0

[commit] r4328 - freeswitch/trunk/src
by Freeswitch SVN 19 Feb '07

19 Feb '07

Author: brian Date: Mon Feb 19 16:28:58 2007 New Revision: 4328 Modified: freeswitch/trunk/src/switch_ivr.c Log: add channel data to event Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Feb 19 16:28:58 2007 @@ -171,6 +171,7 @@ if (switch_core_session_dequeue_private_event(session, &event) == SWITCH_STATUS_SUCCESS) { switch_ivr_parse_event(session, event); + switch_channel_event_set_data(switch_core_session_get_channel(session), event); switch_event_fire(&event); }

1 0

[commit] r4327 - in freeswitch/trunk/src: . include
by Freeswitch SVN 19 Feb '07

19 Feb '07

Author: brian Date: Mon Feb 19 16:06:27 2007 New Revision: 4327 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_ivr.c Log: making private events fire (please test) Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Feb 19 16:06:27 2007 @@ -746,6 +746,7 @@ SWITCH_EVENT_CODEC - Codec Change SWITCH_EVENT_BACKGROUND_JOB - Background Job SWITCH_EVENT_DETECTED_SPEECH - Detected Speech + SWITCH_EVENT_PRIVATE_COMMAND - A private command event SWITCH_EVENT_ALL - All events at once </pre> @@ -785,6 +786,7 @@ SWITCH_EVENT_CODEC, SWITCH_EVENT_BACKGROUND_JOB, SWITCH_EVENT_DETECTED_SPEECH, + SWITCH_EVENT_PRIVATE_COMMAND, SWITCH_EVENT_ALL } switch_event_types_t; Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Feb 19 16:06:27 2007 @@ -1909,6 +1909,7 @@ } if (session->private_event_queue) { + (*event)->event_id = SWITCH_EVENT_PRIVATE_COMMAND; if (switch_queue_trypush(session->private_event_queue, *event) == SWITCH_STATUS_SUCCESS) { *event = NULL; switch_core_session_kill_channel(session, SWITCH_SIG_BREAK); Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Mon Feb 19 16:06:27 2007 @@ -130,6 +130,7 @@ "CODEC", "BACKGROUND_JOB", "DETECTED_SPEECH", + "PRIVATE_COMMAND", "ALL" }; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Feb 19 16:06:27 2007 @@ -98,6 +98,7 @@ unsigned long CMD_NOMEDIA = apr_hashfunc_default("nomedia", &hlen); assert(channel != NULL); + assert(event != NULL); if (switch_strlen_zero(cmd)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Command!\n"); @@ -170,7 +171,7 @@ if (switch_core_session_dequeue_private_event(session, &event) == SWITCH_STATUS_SUCCESS) { switch_ivr_parse_event(session, event); - switch_event_destroy(&event); + switch_event_fire(&event); } if (switch_channel_has_dtmf(channel)) {

1 0

[commit] r4326 - freeswitch/trunk/src
by Freeswitch SVN 19 Feb '07

19 Feb '07

Author: mmurdock Date: Mon Feb 19 12:00:29 2007 New Revision: 4326 Modified: freeswitch/trunk/src/switch_ivr.c Log: Fix indents to tabs in previous commit Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Feb 19 12:00:29 2007 @@ -4406,10 +4406,11 @@ if (!match) { if (*menu->buf) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IVR menu '%s' caught invalid input '%s'\n", menu->name, menu->buf); - if (menu->invalid_sound) { - play_or_say(session, menu, menu->invalid_sound, 0); - } - } else { + if (menu->invalid_sound) { + play_or_say(session, menu, menu->invalid_sound, 0); + } + } + else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IVR menu '%s' no input detected\n", menu->name); } errs++;

1 0

[commit] r4325 - freeswitch/trunk/src
by Freeswitch SVN 19 Feb '07

19 Feb '07

Author: mmurdock Date: Mon Feb 19 11:57:14 2007 New Revision: 4325 Modified: freeswitch/trunk/src/switch_ivr.c Log: No entry at menu should not play the invalid prompt but still count as an invalid entry and repeat the menu Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Feb 19 11:57:14 2007 @@ -4406,13 +4406,12 @@ if (!match) { if (*menu->buf) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IVR menu '%s' caught invalid input '%s'\n", menu->name, menu->buf); - } - else { + if (menu->invalid_sound) { + play_or_say(session, menu, menu->invalid_sound, 0); + } + } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IVR menu '%s' no input detected\n", menu->name); } - if (menu->invalid_sound) { - play_or_say(session, menu, menu->invalid_sound, 0); - } errs++; if (status == SWITCH_STATUS_SUCCESS) { status = switch_ivr_sleep(session, 1000);

1 0