October 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r9883 - in freeswitch/trunk/src: . mod/applications/mod_commands
by Freeswitch SVN 07 Oct '08

07 Oct '08

Author: anthm Date: Tue Oct 7 17:42:31 2008 New Revision: 9883 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_session.c Log: more heartbeat work Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Oct 7 17:42:31 2008 @@ -2321,6 +2321,57 @@ return SWITCH_STATUS_SUCCESS; } +#define HEARTBEAT_SYNTAX "<uuid> <on|off|<seconds>>" +SWITCH_STANDARD_API(uuid_session_heartbeat_function) +{ + char *mycmd = NULL, *argv[2] = { 0 }; + uint32_t seconds = 60; + int argc, tmp; + switch_core_session_t *l_session = NULL; + + if (switch_strlen_zero(cmd) || !(mycmd = strdup(cmd))) { + goto error; + } + + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + + if (argc != 2) { + goto error; + } + + if (!(l_session = switch_core_session_locate(argv[0]))) { + stream->write_function(stream, "-ERR Usage: cannot locate session.\n"); + return SWITCH_STATUS_SUCCESS; + } + + if (switch_is_number(argv[1])) { + tmp = atoi(argv[1]); + if (tmp > 0) { + seconds = tmp; + } + } else if (!switch_true(argv[1])) { + seconds = 0; + } + + if (seconds) { + switch_core_session_enable_heartbeat(l_session, seconds); + } else { + switch_core_session_disable_heartbeat(l_session); + } + + switch_core_session_rwunlock(l_session); + + switch_safe_free(mycmd); + stream->write_function(stream, "+OK\n"); + return SWITCH_STATUS_SUCCESS; + + error: + switch_safe_free(mycmd); + stream->write_function(stream, "-ERR Usage: uuid_session_heartbeat %s", HEARTBEAT_SYNTAX); + return SWITCH_STATUS_SUCCESS; + +} + #define SETVAR_SYNTAX "<uuid> <var> <value>" SWITCH_STANDARD_API(uuid_setvar_function) { @@ -2694,6 +2745,7 @@ switch_console_set_complete("add alias add"); switch_console_set_complete("add alias del"); SWITCH_ADD_API(commands_api_interface, "status", "status", status_function, ""); + SWITCH_ADD_API(commands_api_interface, "uuid_session_heartbeat", "uuid_session_heartbeat", uuid_session_heartbeat_function, HEARTBEAT_SYNTAX); SWITCH_ADD_API(commands_api_interface, "uuid_bridge", "uuid_bridge", uuid_bridge_function, ""); SWITCH_ADD_API(commands_api_interface, "uuid_setvar", "uuid_setvar", uuid_setvar_function, SETVAR_SYNTAX); SWITCH_ADD_API(commands_api_interface, "uuid_getvar", "uuid_getvar", uuid_getvar_function, GETVAR_SYNTAX); Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Oct 7 17:42:31 2008 @@ -1633,7 +1633,7 @@ if (switch_is_number(var)) { tmp = atoi(var); - if (tmp > 10) { + if (tmp > 0) { seconds = tmp; } } else if (!switch_true(var)) { Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Tue Oct 7 17:42:31 2008 @@ -783,14 +783,21 @@ SWITCH_DECLARE(void) switch_core_session_enable_heartbeat(switch_core_session_t *session, uint32_t seconds) { switch_assert(session != NULL); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s setting session heartbeat to %u second(s).", + + if (seconds < 10) { + seconds = 60; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s setting session heartbeat to %u second(s).\n", switch_channel_get_name(session->channel), seconds); session->track_duration = seconds; + session->read_frame_count = 0; } SWITCH_DECLARE(void) switch_core_session_disable_heartbeat(switch_core_session_t *session) { switch_assert(session != NULL); + session->read_frame_count = 0; session->track_duration = 0; }

1 0

[commit] r9882 - in freeswitch/trunk/src: . include include/private
by Freeswitch SVN 07 Oct '08

07 Oct '08

Author: anthm Date: Tue Oct 7 17:03:37 2008 New Revision: 9882 Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_io.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_event.c Log: add session heartbeat feature Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h ============================================================================== --- freeswitch/trunk/src/include/private/switch_core_pvt.h (original) +++ freeswitch/trunk/src/include/private/switch_core_pvt.h Tue Oct 7 17:03:37 2008 @@ -146,6 +146,8 @@ uint8_t raw_read_buf[SWITCH_RECOMMENDED_BUFFER_SIZE]; uint8_t enc_read_buf[SWITCH_RECOMMENDED_BUFFER_SIZE]; switch_codec_t bug_codec; + uint32_t read_frame_count; + uint32_t track_duration; }; struct switch_media_bug { Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Tue Oct 7 17:03:37 2008 @@ -119,6 +119,9 @@ ///\{ +SWITCH_DECLARE(void) switch_core_session_enable_heartbeat(switch_core_session_t *session, uint32_t seconds); +SWITCH_DECLARE(void) switch_core_session_disable_heartbeat(switch_core_session_t *session); + /*! \brief Add a media bug to the session \param session the session to add the bug to Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Tue Oct 7 17:03:37 2008 @@ -110,6 +110,7 @@ #define SWITCH_PATH_SEPARATOR "/" #endif #define SWITCH_URL_SEPARATOR "://" +#define SWITCH_ENABLE_HEARTBEAT_EVENTS_VARIABLE "enable_heartbeat_events" #define SWITCH_BYPASS_MEDIA_AFTER_BRIDGE_VARIABLE "bypass_media_after_bridge" #define SWITCH_READ_RESULT_VARIABLE "read_result" #define SWITCH_COPY_XML_CDR_VARIABLE "copy_xml_cdr" @@ -1133,6 +1134,7 @@ SWITCH_EVENT_CHANNEL_DATA, SWITCH_EVENT_GENERAL, SWITCH_EVENT_COMMAND, + SWITCH_EVENT_SESSION_HEARTBEAT, SWITCH_EVENT_ALL } switch_event_types_t; Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Oct 7 17:03:37 2008 @@ -1627,6 +1627,24 @@ switch_core_session_rwunlock(other_session); } + if ((var = switch_channel_get_variable(channel, SWITCH_ENABLE_HEARTBEAT_EVENTS_VARIABLE))) { + uint32_t seconds = 60; + int tmp; + + if (switch_is_number(var)) { + tmp = atoi(var); + if (tmp > 10) { + seconds = tmp; + } + } else if (!switch_true(var)) { + seconds = 0; + } + + if (seconds) { + switch_core_session_enable_heartbeat(channel->session, seconds); + } + } + switch_channel_set_variable(channel, "endpoint_disposition", "ANSWER"); switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Channel [%s] has been answered\n", channel->name); if ((var = switch_channel_get_variable(channel, SWITCH_CHANNEL_EXECUTE_ON_ANSWER_VARIABLE)) && !switch_strlen_zero(var)) { Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Tue Oct 7 17:03:37 2008 @@ -106,6 +106,7 @@ switch_status_t status; int need_codec, perfect, do_bugs = 0, do_resample = 0, is_cng = 0; unsigned int flag = 0; + switch_event_header_t *hi; switch_assert(session != NULL); @@ -122,6 +123,41 @@ *frame = NULL; + if (session->read_codec && session->track_duration) { + if (session->read_frame_count == 0) { + switch_event_t *event; + session->read_frame_count = (session->read_codec->implementation->samples_per_second / + session->read_codec->implementation->samples_per_frame) * session->track_duration; + + switch_event_create(&event, SWITCH_EVENT_SESSION_HEARTBEAT); + switch_channel_event_set_data(session->channel, event); + if (!switch_channel_test_flag(session->channel, CF_VERBOSE_EVENTS)) { + if ((hi = switch_channel_variable_first(session->channel))) { + for (; hi; hi = hi->next) { + char buf[1024] = ""; + char *vvar = NULL, *vval = NULL; + + if (strncasecmp(hi->name, "hb_", 3)) { + continue; + } + + vvar = (char *) hi->name; + vval = (char *) hi->value; + + switch_assert(vvar && vval); + switch_snprintf(buf, sizeof(buf), "variable_%s", vvar); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, buf, vval); + } + switch_channel_variable_last(session->channel); + } + } + switch_event_fire(&event); + } else { + session->read_frame_count--; + } + } + + if (switch_channel_test_flag(session->channel, CF_HOLD)) { status = SWITCH_STATUS_BREAK; goto even_more_done; Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Tue Oct 7 17:03:37 2008 @@ -780,6 +780,20 @@ } +SWITCH_DECLARE(void) switch_core_session_enable_heartbeat(switch_core_session_t *session, uint32_t seconds) +{ + switch_assert(session != NULL); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s setting session heartbeat to %u second(s).", + switch_channel_get_name(session->channel), seconds); + session->track_duration = seconds; +} + +SWITCH_DECLARE(void) switch_core_session_disable_heartbeat(switch_core_session_t *session) +{ + switch_assert(session != NULL); + session->track_duration = 0; +} + static void *SWITCH_THREAD_FUNC switch_core_session_thread(switch_thread_t *thread, void *obj) { switch_core_session_t *session = obj; Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Oct 7 17:03:37 2008 @@ -165,6 +165,7 @@ "CHANNEL_DATA", "GENERAL", "COMMAND", + "SESSION_HEARTBEAT", "ALL" };

1 0

[commit] r9881 - freeswitch/trunk/src/mod/formats/mod_shout
by Freeswitch SVN 07 Oct '08

07 Oct '08

Author: anthm Date: Tue Oct 7 16:59:54 2008 New Revision: 9881 Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Log: noom noom noom Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Tue Oct 7 16:59:54 2008 @@ -47,6 +47,28 @@ static char *supported_formats[SWITCH_MAX_CODECS] = { 0 }; +mpg123_handle *our_mpg123_new(const char* decoder, int *error) +{ + mpg123_handle *mh; + const char *arch = "auto"; + int x64 = 0; + + if (sizeof(void *) == 4) { + arch = "i586"; + } else { + x64++; + } + + if ((mh = mpg123_new(arch, NULL))) { + if (x64) { + mpg123_param(mh, MPG123_OUTSCALE, 8192, 0); + } + } + + return mh; +} + + struct shout_context { shout_t *shout; lame_global_flags *gfp; @@ -414,7 +436,7 @@ } mpg123_close(context->mh); - context->mh = mpg123_new(NULL, NULL); + context->mh = our_mpg123_new(NULL, NULL); mpg123_open_feed(context->mh); mpg123_param(context->mh, MPG123_FORCE_RATE, context->samplerate, 0); mpg123_param(context->mh, MPG123_FLAGS, MPG123_MONO_MIX, 0); @@ -607,16 +629,10 @@ } switch_mutex_init(&context->audio_mutex, SWITCH_MUTEX_NESTED, context->memory_pool); - context->mh = mpg123_new(NULL, NULL); + context->mh = our_mpg123_new(NULL, NULL); mpg123_open_feed(context->mh); mpg123_format_all(context->mh); - mpg123_param(context->mh, MPG123_FORCE_RATE, context->samplerate, 0); - //mpg123_param(context->mh, MPG123_DOWN_SAMPLE, 1, 0); - if (sizeof(void *) == 4) { - mpg123_param(context->mh, MPG123_OUTSCALE, 8, 0); - } else { - mpg123_param(context->mh, MPG123_OUTSCALE, 8192, 0); - } + mpg123_param(context->mh, MPG123_FORCE_RATE, context->samplerate, 0); if (handle->handler) { mpg123_param(context->mh, MPG123_FLAGS, MPG123_SEEKBUFFER|MPG123_MONO_MIX, 0); @@ -808,7 +824,7 @@ } mpg123_close(context->mh); - context->mh = mpg123_new(NULL, NULL); + context->mh = our_mpg123_new(NULL, NULL); mpg123_open_feed(context->mh); mpg123_param(context->mh, MPG123_FORCE_RATE, context->samplerate, 0); mpg123_param(context->mh, MPG123_FLAGS, MPG123_MONO_MIX, 0);

1 0

[commit] r9880 - freeswitch/trunk/src/mod/formats/mod_shout
by Freeswitch SVN 07 Oct '08

07 Oct '08

Author: anthm Date: Tue Oct 7 14:12:16 2008 New Revision: 9880 Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Log: fix 32 bit vol on shout MODFORM-15 michael meyers bug he won't give up Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Tue Oct 7 14:12:16 2008 @@ -611,9 +611,9 @@ mpg123_open_feed(context->mh); mpg123_format_all(context->mh); mpg123_param(context->mh, MPG123_FORCE_RATE, context->samplerate, 0); - mpg123_param(context->mh, MPG123_DOWN_SAMPLE, 1, 0); + //mpg123_param(context->mh, MPG123_DOWN_SAMPLE, 1, 0); if (sizeof(void *) == 4) { - mpg123_param(context->mh, MPG123_OUTSCALE, 65536, 0); + mpg123_param(context->mh, MPG123_OUTSCALE, 8, 0); } else { mpg123_param(context->mh, MPG123_OUTSCALE, 8192, 0); }

1 0

[commit] r9879 - freeswitch/trunk/src
by Freeswitch SVN 07 Oct '08

07 Oct '08

Author: anthm Date: Tue Oct 7 13:56:54 2008 New Revision: 9879 Modified: freeswitch/trunk/src/switch_core_db.c freeswitch/trunk/src/switch_core_sqldb.c Log: hide harmless sql warning Modified: freeswitch/trunk/src/switch_core_db.c ============================================================================== --- freeswitch/trunk/src/switch_core_db.c (original) +++ freeswitch/trunk/src/switch_core_db.c Tue Oct 7 13:56:54 2008 @@ -78,7 +78,7 @@ SWITCH_DECLARE(int) switch_core_db_exec(switch_core_db_t *db, const char *sql, switch_core_db_callback_func_t callback, void *data, char **errmsg) { int ret = 0; - int sane = 100; + int sane = 500; char *err = NULL; while (--sane > 0) { @@ -86,7 +86,7 @@ if (ret == SQLITE_BUSY || ret == SQLITE_LOCKED) { if (sane > 1) { switch_safe_free(err); - switch_yield(1000); + switch_yield(20000); continue; } } else { Modified: freeswitch/trunk/src/switch_core_sqldb.c ============================================================================== --- freeswitch/trunk/src/switch_core_sqldb.c (original) +++ freeswitch/trunk/src/switch_core_sqldb.c Tue Oct 7 13:56:54 2008 @@ -128,7 +128,7 @@ while (retries > 0) { switch_core_db_exec(db, sql, NULL, NULL, &errmsg); if (errmsg) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SQL ERR [%s]\n", errmsg); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SQL ERR [%s]\n", errmsg); switch_core_db_free(errmsg); switch_yield(100000); retries--;

1 0

[commit] r9878 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 07 Oct '08

07 Oct '08

Author: anthm Date: Tue Oct 7 13:56:30 2008 New Revision: 9878 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: add reload command Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Oct 7 13:56:30 2008 @@ -834,9 +834,38 @@ return SWITCH_STATUS_SUCCESS; } + SWITCH_STANDARD_API(reload_function) { const char *err; + + if (session) { + return SWITCH_STATUS_FALSE; + } + + if (switch_strlen_zero(cmd)) { + stream->write_function(stream, "-USAGE: %s\n", LOAD_SYNTAX); + return SWITCH_STATUS_SUCCESS; + } + + if (switch_loadable_module_unload_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) cmd, &err) == SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "+OK module unloaded\n"); + } else { + stream->write_function(stream, "-ERR unloading module [%s]\n", err); + } + + if (switch_loadable_module_load_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) cmd, SWITCH_TRUE, &err) == SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "+OK module loaded\n"); + } else { + stream->write_function(stream, "-ERR loading module [%s]\n", err); + } + + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_STANDARD_API(reload_xml_function) +{ + const char *err; switch_xml_t xml_root; if (session) { @@ -2639,8 +2668,9 @@ SWITCH_ADD_API(commands_api_interface, "uuid_park", "Park Channel", park_function, PARK_SYNTAX); SWITCH_ADD_API(commands_api_interface, "reloadacl", "Reload ACL", reload_acl_function, "[reloadxml]"); switch_console_set_complete("add reloadacl reloadxml"); - SWITCH_ADD_API(commands_api_interface, "reloadxml", "Reload XML", reload_function, ""); + SWITCH_ADD_API(commands_api_interface, "reloadxml", "Reload XML", reload_xml_function, ""); SWITCH_ADD_API(commands_api_interface, "unload", "Unload Module", unload_function, LOAD_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "reload", "Reload Module", reload_function, LOAD_SYNTAX); SWITCH_ADD_API(commands_api_interface, "load", "Load Module", load_function, LOAD_SYNTAX); SWITCH_ADD_API(commands_api_interface, "uuid_transfer", "Transfer a session", transfer_function, TRANSFER_SYNTAX); SWITCH_ADD_API(commands_api_interface, "pause", "Pause", pause_function, PAUSE_SYNTAX);

1 0

[commit] r9877 - freeswitch/trunk/src/mod/formats/mod_shout
by Freeswitch SVN 07 Oct '08

07 Oct '08

Author: anthm Date: Tue Oct 7 13:45:58 2008 New Revision: 9877 Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Log: fix 32 bit vol on shout MODFORM-15 michael meyers bug Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Tue Oct 7 13:45:58 2008 @@ -611,7 +611,12 @@ mpg123_open_feed(context->mh); mpg123_format_all(context->mh); mpg123_param(context->mh, MPG123_FORCE_RATE, context->samplerate, 0); - mpg123_param(context->mh, MPG123_OUTSCALE, 8192, 0); + mpg123_param(context->mh, MPG123_DOWN_SAMPLE, 1, 0); + if (sizeof(void *) == 4) { + mpg123_param(context->mh, MPG123_OUTSCALE, 65536, 0); + } else { + mpg123_param(context->mh, MPG123_OUTSCALE, 8192, 0); + } if (handle->handler) { mpg123_param(context->mh, MPG123_FLAGS, MPG123_SEEKBUFFER|MPG123_MONO_MIX, 0);

1 0

[commit] r9876 - freeswitch/trunk/src
by Freeswitch SVN 07 Oct '08

07 Oct '08

Author: brian Date: Tue Oct 7 13:09:31 2008 New Revision: 9876 Modified: freeswitch/trunk/src/switch_cpp.cpp freeswitch/trunk/src/switch_event.c Log: add error handling and error messages for incorrect event api usage Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Tue Oct 7 13:09:31 2008 @@ -208,7 +208,16 @@ event_id = SWITCH_EVENT_MESSAGE; } - switch_event_create_subclass(&event, event_id, subclass_name); + if (!switch_strlen_zero(subclass_name) && event_id != SWITCH_EVENT_CUSTOM) { + switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_WARNING, "Changing event type to custom because you specified a subclass name!\n"); + event_id = SWITCH_EVENT_CUSTOM; + } + + if (switch_event_create_subclass(&event, event_id, subclass_name) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "Failed to create event!\n"); + event = NULL; + } + serialized_string = NULL; mine = 1; } @@ -283,9 +292,17 @@ if (event) { switch_event_t *new_event; if (switch_event_dup(&new_event, event) == SWITCH_STATUS_SUCCESS) { - switch_event_fire(&new_event); + if (switch_event_fire(&new_event) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "Failed to fire the event!\n"); + switch_event_destroy(&new_event); + return false; + } return true; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "Failed to dup the event!\n"); } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "Trying to fire an event that does not exist!\n"); } return false; } @@ -297,6 +314,8 @@ if (event) { switch_event_set_priority(event, priority); return true; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "Trying to setPriority an event that does not exist!\n"); } return false; } @@ -307,6 +326,8 @@ if (event) { return switch_event_get_header(event, header_name); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "Trying to getHeader an event that does not exist!\n"); } return NULL; } @@ -317,6 +338,8 @@ if (event) { return switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, value) == SWITCH_STATUS_SUCCESS ? true : false; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "Trying to addHeader an event that does not exist!\n"); } return false; @@ -328,6 +351,8 @@ if (event) { return switch_event_del_header(event, header_name) == SWITCH_STATUS_SUCCESS ? true : false; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "Trying to delHeader an event that does not exist!\n"); } return false; @@ -340,6 +365,8 @@ if (event) { return switch_event_add_body(event, "%s", value) == SWITCH_STATUS_SUCCESS ? true : false; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "Trying to addBody an event that does not exist!\n"); } return false; @@ -352,6 +379,8 @@ if (event) { return switch_event_get_body(event); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "Trying to getBody an event that does not exist!\n"); } return NULL; @@ -363,6 +392,8 @@ if (event) { return switch_event_name(event->event_id); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "Trying to getType an event that does not exist!\n"); } return (char *) "invalid"; Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Oct 7 13:09:31 2008 @@ -548,11 +548,13 @@ { void *pop; + *event = NULL; + if (event_id != SWITCH_EVENT_CUSTOM && subclass_name) { return SWITCH_STATUS_GENERR; } - if (switch_queue_trypop(EVENT_RECYCLE_QUEUE, &pop) == SWITCH_STATUS_SUCCESS) { + if (switch_queue_trypop(EVENT_RECYCLE_QUEUE, &pop) == SWITCH_STATUS_SUCCESS && pop) { *event = (switch_event_t *) pop; } else { *event = ALLOC(sizeof(switch_event_t)); @@ -1014,10 +1016,6 @@ switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, "Event-Calling-Function", func); switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Event-Calling-Line-Number", "%d", line); - if ((*event)->subclass_name) { - switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, "Event-Subclass", (*event)->subclass_name); - } - if (user_data) { (*event)->event_user_data = user_data; }

1 0

[commit] r9871 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 07 Oct '08

07 Oct '08

Author: brian Date: Tue Oct 7 00:42:35 2008 New Revision: 9871 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: cleanup 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 Tue Oct 7 00:42:35 2008 @@ -909,7 +909,7 @@ gateway->retry_seconds = atoi(retry_seconds); if (gateway->retry_seconds < 10) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "INVALID: retry-seconds of %d on gateway %s correcting the value to 30\n", + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "invalid retry-seconds of %d on gateway %s, using the value of 30 instead.\n", gateway->retry_seconds, name); gateway->retry_seconds = 30; } @@ -954,7 +954,7 @@ gateway->expires_str = switch_core_strdup(gateway->pool, expire_seconds); if ((gateway->freq = atoi(gateway->expires_str)) < 5) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "INVALID: register-frequency of %d on gateway %s to 3600\n", + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid register-frequency of %d on gateway %s, using the value of 3600 instead\n", gateway->freq, name); gateway->freq = 3600; } @@ -4046,7 +4046,7 @@ /* Build the static part of the sip_header_name variable from */ /* the header_type. If the header type is "referred_by" then */ - /* sip_header_name = "sip_referred_by_". */ + /* sip_header_name = "sip_referred_by_". */ sh = sip_header_name; sh_end = sh + sizeof(sip_header_name) - 1; for (cp = var1; *cp; cp++, sh++) { @@ -4056,7 +4056,7 @@ /* Copy the header_type to the sip_header_name. Before copying */ /* each character, check that we aren't going to overflow the */ - /* the sip_header_name buffer. We have to account for the */ + /* the sip_header_name buffer. We have to account for the */ /* trailing underscore and NULL that will be added to the end. */ for (cp = header_type; (*cp && (sh < (sh_end - 1))); cp++, sh++) { *sh = *cp; @@ -4067,26 +4067,26 @@ /* sh now points to the NULL at the end of the partially built */ /* sip_header_name variable. This is also the start of the */ /* variable part of the sip_header_name built from the lvalue */ - /* of the parms data. */ + /* of the params data. */ sh_save = sh; while (params && params[0]) { /* Copy the params data to the sip_header_name variable until */ /* the end of the params string is reached, an '=' is detected */ - /* or until the sip_header_name buffer has been exhausted. */ + /* or until the sip_header_name buffer has been exhausted. */ for (cp = (char *) (*params); ((*cp != '=') && *cp && (sh < sh_end)); cp++, sh++) { *sh = *cp; } - /* cp now points to either the end of the parms data or the */ - /* equal (=) sign spearating the lvalue and rvalue. */ + /* cp now points to either the end of the params data or the */ + /* equal (=) sign separating the lvalue and rvalue. */ if (*cp == '=') cp++; *sh = '\0'; switch_channel_set_variable(channel, sip_header_name, cp); - /* Bump pointer to next param in the list. Also reset the */ + /* Bump pointer to next param in the list. Also reset the */ /* sip_header_name pointer to the beginning of the dynamic area */ params++; sh = sh_save;

1 0

[commit] r9869 - freeswitch/trunk/src
by Freeswitch SVN 07 Oct '08

07 Oct '08

Author: brian Date: Mon Oct 6 21:43:03 2008 New Revision: 9869 Modified: freeswitch/trunk/src/switch_xml.c Log: spelling Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Mon Oct 6 21:43:03 2008 @@ -1680,7 +1680,7 @@ } // Encodes ampersand sequences appending the results to *dst, reallocating *dst -// if length excedes max. a is non-zero for attribute encoding. Returns *dst +// if length exceeds max. a is non-zero for attribute encoding. Returns *dst static char *switch_xml_ampencode(const char *s, switch_size_t len, char **dst, switch_size_t *dlen, switch_size_t *max, short a) { const char *e = NULL; @@ -1744,7 +1744,7 @@ #define XML_INDENT " " // Recursively converts each tag to xml appending it to *s. Reallocates *s if -// its length excedes max. start is the location of the previous tag in the +// its length exceeds max. start is the location of the previous tag in the // parent tag's character content. Returns *s. static char *switch_xml_toxml_r(switch_xml_t xml, char **s, switch_size_t *len, switch_size_t *max, switch_size_t start, char ***attr, uint32_t * count) { @@ -1955,7 +1955,7 @@ switch_xml_free(xml->ordered); if (!xml->parent) { // free root tag allocations - for (i = 10; root->ent[i]; i += 2) // 0 - 9 are default entites (<>&"') + for (i = 10; root->ent[i]; i += 2) // 0 - 9 are default entities (<>&"') if ((s = root->ent[i + 1]) < root->s || s > root->e) free(s); free(root->ent); // free list of general entities @@ -2541,7 +2541,7 @@ /* - * Extend the gl_pathv member of a glob_t structure to accomodate a new item, + * Extend the gl_pathv member of a glob_t structure to accommodate a new item, * add the new item, and update gl_pathc. * * This assumes the BSD realloc, which only copies the block when its size

1 0