March 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12450 - freeswitch/trunk/src
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: mrene Date: Wed Mar 4 23:45:42 2009 New Revision: 12450 Log: tweak Modified: freeswitch/trunk/src/switch_xml_config.c Modified: freeswitch/trunk/src/switch_xml_config.c ============================================================================== --- freeswitch/trunk/src/switch_xml_config.c (original) +++ freeswitch/trunk/src/switch_xml_config.c Wed Mar 4 23:45:42 2009 @@ -181,7 +181,7 @@ case SWITCH_CONFIG_FLAGARRAY: { int8_t *dest = (int8_t*)item->ptr; - int8_t index = (int)(intptr_t)item->data; + int8_t index = (int8_t)(intptr_t)item->data; int8_t newval = value ? !!switch_true(value) : (int8_t)((intptr_t)item->defaultvalue); if (dest[index] != newval) { changed = SWITCH_TRUE;

1 0

[commit] r12449 - freeswitch/trunk/src
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: mrene Date: Wed Mar 4 23:41:40 2009 New Revision: 12449 Log: oops Modified: freeswitch/trunk/src/switch_xml_config.c Modified: freeswitch/trunk/src/switch_xml_config.c ============================================================================== --- freeswitch/trunk/src/switch_xml_config.c (original) +++ freeswitch/trunk/src/switch_xml_config.c Wed Mar 4 23:41:40 2009 @@ -181,8 +181,8 @@ case SWITCH_CONFIG_FLAGARRAY: { int8_t *dest = (int8_t*)item->ptr; - int index = (int)(intptr_t)item->data; - int newval = value ? !!switch_true(value) : (int8_t)((intptr_t)item->defaultvalue); + int8_t index = (int)(intptr_t)item->data; + int8_t newval = value ? !!switch_true(value) : (int8_t)((intptr_t)item->defaultvalue); if (dest[index] != newval) { changed = SWITCH_TRUE; dest[index] = newval;

1 0

[commit] r12448 - freeswitch/trunk/src/include
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: mrene Date: Wed Mar 4 23:34:26 2009 New Revision: 12448 Log: update macros Modified: freeswitch/trunk/src/include/switch_xml_config.h Modified: freeswitch/trunk/src/include/switch_xml_config.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml_config.h (original) +++ freeswitch/trunk/src/include/switch_xml_config.h Wed Mar 4 23:34:26 2009 @@ -77,9 +77,9 @@ } ; -#define SWITCH_CONFIG_ITEM (_key, _type, _reloadable, _ptr, _defaultvalue, _data) { _key, _type, _reloadable, _ptr, _defaultvalue, _data, NULL } -#define SWITCH_CONFIG_ITEM_CALLBACK (_key, _type, _reloadable, _ptr, _defaultvalue, _data) { _key, _type, _reloadable, _ptr, _defaultvalue, NULL, _data } -#define SWITCH_CONFIG_ITEM_END () { NULL, SWITCH_CONFIG_LAST, 0, NULL ,NULL, NULL } +#define SWITCH_CONFIG_ITEM (_key, _type, _reloadable, _ptr, _defaultvalue, _data) { _key, _type, _reloadable, _ptr, _defaultvalue, _data, NULL, NULL } +#define SWITCH_CONFIG_ITEM_CALLBACK (_key, _type, _reloadable, _ptr, _defaultvalue, _data, _functiondata) { _key, _type, _reloadable, _ptr, _defaultvalue, NULL, _data, _functiondata } +#define SWITCH_CONFIG_ITEM_END () { NULL, SWITCH_CONFIG_LAST, 0, NULL ,NULL, NULL, NULL } /*! * \brief Parses all the xml elements, following a ruleset defined by an array of switch_xml_config_item_t

1 0

[commit] r12447 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: mrene Date: Wed Mar 4 23:32:50 2009 New Revision: 12447 Log: update Modified: freeswitch/trunk/src/include/switch_xml_config.h freeswitch/trunk/src/switch_xml_config.c Modified: freeswitch/trunk/src/include/switch_xml_config.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml_config.h (original) +++ freeswitch/trunk/src/include/switch_xml_config.h Wed Mar 4 23:32:50 2009 @@ -60,7 +60,7 @@ struct switch_xml_config_item; typedef struct switch_xml_config_item switch_xml_config_item_t; -typedef switch_status_t (*switch_xml_config_callback_t)(switch_xml_config_item_t *data); +typedef switch_status_t (*switch_xml_config_callback_t)(switch_xml_config_item_t *data, switch_bool_t changed); /*! * \brief A configuration instruction read by switch_xml_config_parse @@ -72,7 +72,8 @@ void *ptr; /*< Ptr to the var to be changed */ void *defaultvalue; /*< Default value */ void *data; /*< Custom data (depending on the type) */ - switch_xml_config_callback_t function; /*< Callback (for type CUSTOM) */ + switch_xml_config_callback_t function; /*< Callback to be called after the var is parsed */ + void *functiondata; /*< Custom data passed to the callback */ } ; Modified: freeswitch/trunk/src/switch_xml_config.c ============================================================================== --- freeswitch/trunk/src/switch_xml_config.c (original) +++ freeswitch/trunk/src/switch_xml_config.c Wed Mar 4 23:32:50 2009 @@ -52,6 +52,8 @@ for (item = instructions; item->key; item++) { const char *value = switch_event_get_header(event, item->key); + switch_bool_t changed = SWITCH_FALSE; + switch_xml_config_callback_t callback = (switch_xml_config_callback_t)item->function; if (reload && !item->reloadable) { continue; @@ -61,45 +63,53 @@ case SWITCH_CONFIG_INT: { int *dest = (int*)item->ptr; + int intval; if (value) { if (switch_is_number(value)) { - *dest = atoi(value); + intval = atoi(value); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s]\n", - value, item->key); - *dest = (int)(intptr_t)item->defaultvalue; + intval = (int)(intptr_t)item->defaultvalue; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s] setting default [%d]\n", + value, item->key, intval); } } else { - *dest = (int)(intptr_t)item->defaultvalue; + intval = (int)(intptr_t)item->defaultvalue; + } + + if (*dest != intval) { + *dest = intval; + changed = SWITCH_TRUE; } } break; case SWITCH_CONFIG_STRING: { switch_xml_config_string_options_t *string_options = (switch_xml_config_string_options_t*)item->data; + const char *newstring = NULL; if (string_options->length > 0) { /* We have a preallocated buffer */ char *dest = (char*)item->ptr; if (value) { - switch_copy_string(dest, value, string_options->length); - } else if (item->defaultvalue){ - switch_copy_string(dest, item->defaultvalue, string_options->length); + newstring = value; + } else if (item->defaultvalue) { + newstring = item->defaultvalue; + } + + if (newstring && strncasecmp(dest, newstring, string_options->length)) { + switch_copy_string(dest, newstring, string_options->length); } } else { char **dest = (char**)item->ptr; - if (string_options->pool) { - if (value) { - *dest = switch_core_strdup(string_options->pool, value); - } else if (item->defaultvalue) { - *dest = switch_core_strdup(string_options->pool, (char*)item->defaultvalue); - } - } else { - switch_safe_free(*dest); /* Free the destination if its not NULL */ - if (value) { - *dest = strdup(value); - } else if(item->defaultvalue) { - *dest = strdup((char*)item->defaultvalue); + const char *newstring = value ? value : (char*)item->defaultvalue; + + if (newstring && strcasecmp(*dest, newstring)) { + if (string_options->pool) { + *dest = switch_core_strdup(string_options->pool, newstring); + } else { + switch_safe_free(*dest); + *dest = strdup(newstring); } + changed = SWITCH_TRUE; } } } @@ -107,38 +117,41 @@ case SWITCH_CONFIG_YESNO: { switch_bool_t *dest = (switch_bool_t*)item->ptr; - if (value) { - *dest = !!switch_true(value); - } else { - *dest = (switch_bool_t)(intptr_t)item->defaultvalue; + switch_bool_t newval = value ? !!switch_true(value) : (switch_bool_t)(intptr_t)item->defaultvalue; + + if (*dest != newval) { + *dest = newval; + changed = SWITCH_TRUE; } } break; case SWITCH_CONFIG_CUSTOM: - { - switch_xml_config_callback_t callback = (switch_xml_config_callback_t)item->function; - callback(item); - } break; case SWITCH_CONFIG_ENUM: { switch_xml_config_enum_item_t *enum_options = (switch_xml_config_enum_item_t*)item->data; int *dest = (int*)item->ptr; + int newval; if (value) { for (;enum_options->key; enum_options++) { if (!strcasecmp(value, enum_options->key)) { - *dest = enum_options->value; + newval = enum_options->value; break; } } - - if (!enum_options->key) { /* if (!found) */ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s]\n", - value, item->key); - } } else { - *dest = (int)(intptr_t)item->defaultvalue; + newval = (int)(intptr_t)item->defaultvalue; + } + + if (!enum_options->key) { /* if (!found) */ + newval = (int)(intptr_t)item->defaultvalue; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s]\n", value, item->key); + } + + if (*dest != newval) { + changed = SWITCH_TRUE; + *dest = newval; } } break; @@ -146,14 +159,18 @@ { int32_t *dest = (int32_t*)item->ptr; int index = (int)(intptr_t)item->data; + int8_t currentval = !!(*dest & index); + int8_t newval = 0; + if (value) { - if (switch_true(value)) { - *dest |= (1 << index); - } else { - *dest &= ~(1 << index); - } + newval = switch_true(value); } else { - if ((switch_bool_t)(intptr_t)item->defaultvalue) { + newval = (switch_bool_t)(intptr_t)item->defaultvalue; + } + + if (newval != currentval) { + changed = SWITCH_TRUE; + if (newval) { *dest |= (1 << index); } else { *dest &= ~(1 << index); @@ -165,15 +182,21 @@ { int8_t *dest = (int8_t*)item->ptr; int index = (int)(intptr_t)item->data; - if (value) { - dest[index] = !!switch_true(value); - } else { - dest[index] = (int8_t)((intptr_t)item->defaultvalue); + int newval = value ? !!switch_true(value) : (int8_t)((intptr_t)item->defaultvalue); + if (dest[index] != newval) { + changed = SWITCH_TRUE; + dest[index] = newval; } } break; case SWITCH_CONFIG_LAST: break; + default: + break; + } + + if (callback) { + callback(item, changed); } }

1 0

[commit] r12446 - freeswitch/trunk/src
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: brian Date: Wed Mar 4 23:03:52 2009 New Revision: 12446 Log: spaces help readability Modified: freeswitch/trunk/src/switch_core_media_bug.c Modified: freeswitch/trunk/src/switch_core_media_bug.c ============================================================================== --- freeswitch/trunk/src/switch_core_media_bug.c (original) +++ freeswitch/trunk/src/switch_core_media_bug.c Wed Mar 4 23:03:52 2009 @@ -123,7 +123,7 @@ } if (!(bug->raw_read_buffer && (bug->raw_write_buffer || !switch_test_flag(bug, SMBF_WRITE_STREAM)))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%sBuffer Error\n", switch_channel_get_name(bug->session->channel)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s Buffer Error\n", switch_channel_get_name(bug->session->channel)); return SWITCH_STATUS_FALSE; }

1 0

[commit] r12445 - freeswitch/trunk/src
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: mikej Date: Wed Mar 4 22:49:19 2009 New Revision: 12445 Log: actually return from error condition Modified: freeswitch/trunk/src/switch_core_media_bug.c Modified: freeswitch/trunk/src/switch_core_media_bug.c ============================================================================== --- freeswitch/trunk/src/switch_core_media_bug.c (original) +++ freeswitch/trunk/src/switch_core_media_bug.c Wed Mar 4 22:49:19 2009 @@ -124,6 +124,7 @@ if (!(bug->raw_read_buffer && (bug->raw_write_buffer || !switch_test_flag(bug, SMBF_WRITE_STREAM)))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%sBuffer Error\n", switch_channel_get_name(bug->session->channel)); + return SWITCH_STATUS_FALSE; } frame->datalen = 0; @@ -137,6 +138,7 @@ switch_mutex_unlock(bug->read_mutex); if (switch_test_flag(bug, SMBF_WRITE_STREAM)) { + switch_assert(bug->raw_write_buffer); switch_mutex_lock(bug->write_mutex); datalen = (uint32_t) switch_buffer_read(bug->raw_write_buffer, bug->data, bytes); if (datalen < bytes) {

1 0

[commit] r12444 - freeswitch/trunk/w32/Library
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: mikej Date: Wed Mar 4 22:48:38 2009 New Revision: 12444 Log: add new switch_xml_config.[ch] files to project Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj Wed Mar 4 22:48:38 2009 @@ -804,6 +804,10 @@ /> </FileConfiguration> </File> + <File + RelativePath="..\..\src\switch_xml_config.c" + > + </File> </Filter> <Filter Name="Header Files" @@ -946,6 +950,10 @@ RelativePath="..\..\src\include\switch_xml.h" > </File> + <File + RelativePath="..\..\src\include\switch_xml_config.h" + > + </File> </Filter> <Filter Name="Resource Files" Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Wed Mar 4 22:48:38 2009 @@ -504,6 +504,10 @@ /> </FileConfiguration> </File> + <File + RelativePath="..\..\src\switch_xml_config.c" + > + </File> </Filter> <Filter Name="Header Files" @@ -555,11 +559,11 @@ > </File> <File - RelativePath="..\..\src\include\private\switch_core.h" + RelativePath="..\..\src\include\switch_core.h" > </File> <File - RelativePath="..\..\src\include\switch_core.h" + RelativePath="..\..\src\include\private\switch_core.h" > </File> <File @@ -650,6 +654,10 @@ RelativePath="..\..\src\include\switch_xml.h" > </File> + <File + RelativePath="..\..\src\include\switch_xml_config.h" + > + </File> </Filter> <Filter Name="Resource Files"

1 0

[commit] r12443 - freeswitch/trunk/src/include
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: brian Date: Wed Mar 4 22:39:35 2009 New Revision: 12443 Log: more tweaks to doxygen and cleanups Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_resample.h Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Wed Mar 4 22:39:35 2009 @@ -144,7 +144,16 @@ _In_opt_ void *user_data, _In_ time_t stop_time, _In_ switch_media_bug_flag_t flags, _Out_ switch_media_bug_t **new_bug); +/*! + \brief Pause a media bug on the session + \param session the session to pause the bug on sets CF_PAUSE_BUGS flag +*/ SWITCH_DECLARE(void) switch_core_media_bug_pause(switch_core_session_t *session); + +/*! + \brief Resume a media bug on the session + \param session the session to resume the bug on, clears CF_PAUSE_BUGS flag +*/ SWITCH_DECLARE(void) switch_core_media_bug_resume(switch_core_session_t *session); /*! @@ -179,6 +188,12 @@ */ SWITCH_DECLARE(switch_core_session_t *) switch_core_media_bug_get_session(_In_ switch_media_bug_t *bug); +/*! + \brief Test for the existance of a flag on an media bug + \param bug the object to test + \param flag the or'd list of flags to test + \return true value if the object has the flags defined +*/ SWITCH_DECLARE(uint32_t) switch_core_media_bug_test_flag(_In_ switch_media_bug_t *bug, _In_ uint32_t flag); /*! @@ -196,6 +211,12 @@ */ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove(_In_ switch_core_session_t *session, _Inout_ switch_media_bug_t **bug); +/*! + \brief Remove media bug callback + \param bug bug to remove + \param callback callback to remove + \return SWITCH_STATUS_SUCCESS if the operation was a success +*/ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove_callback(switch_core_session_t *session, switch_media_bug_callback_t callback); /*! @@ -219,7 +240,16 @@ */ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_read(_In_ switch_media_bug_t *bug, _In_ switch_frame_t *frame); +/*! + \brief Flush the read and write buffers for the bug + \param bug the bug to flush the read and write buffers on +*/ SWITCH_DECLARE(void) switch_core_media_bug_flush(_In_ switch_media_bug_t *bug); + +/*! + \brief Flush the read/write buffers for all media bugs on the session + \param session the session to flush the read/write buffers for all media bugs on the session +*/ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_flush_all(_In_ switch_core_session_t *session); ///\} Modified: freeswitch/trunk/src/include/switch_resample.h ============================================================================== --- freeswitch/trunk/src/include/switch_resample.h (original) +++ freeswitch/trunk/src/include/switch_resample.h Wed Mar 4 22:39:35 2009 @@ -38,7 +38,7 @@ way comes along some day. =D */ -#define switch_normalize_volume(x) if(x > 4) x = 4; if (x < -4) x = -4; +#define switch_normalize_volume(x) if (x > 4) x = 4; if (x < -4) x = -4; #ifndef SWITCH_RESAMPLE_H #define SWITCH_RESAMPLE_H

1 0

[commit] r12442 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: mrene Date: Wed Mar 4 22:30:15 2009 New Revision: 12442 Log: update Modified: freeswitch/trunk/src/include/switch_xml_config.h freeswitch/trunk/src/switch_xml_config.c Modified: freeswitch/trunk/src/include/switch_xml_config.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml_config.h (original) +++ freeswitch/trunk/src/include/switch_xml_config.h Wed Mar 4 22:30:15 2009 @@ -87,7 +87,7 @@ * \param options instrutions on how to parse the elements * \see switch_xml_config_item_t */ -switch_status_t switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *options); +SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *instructions); #endif /* !defined(SWITCH_XML_CONFIG_H) */ Modified: freeswitch/trunk/src/switch_xml_config.c ============================================================================== --- freeswitch/trunk/src/switch_xml_config.c (original) +++ freeswitch/trunk/src/switch_xml_config.c Wed Mar 4 22:30:15 2009 @@ -77,13 +77,13 @@ case SWITCH_CONFIG_STRING: { switch_xml_config_string_options_t *string_options = (switch_xml_config_string_options_t*)item->data; - if (options->length > 0) { + if (string_options->length > 0) { /* We have a preallocated buffer */ char *dest = (char*)item->ptr; if (value) { switch_copy_string(dest, value, string_options->length); - } else if (options->defaultvalue){ - switch_copy_string(dest, value, string_options->length); + } else if (item->defaultvalue){ + switch_copy_string(dest, item->defaultvalue, string_options->length); } } else { char **dest = (char**)item->ptr; @@ -145,7 +145,7 @@ case SWITCH_CONFIG_FLAG: { int32_t *dest = (int32_t*)item->ptr; - int index = (int)item->data; + int index = (int)(intptr_t)item->data; if (value) { if (switch_true(value)) { *dest |= (1 << index); @@ -164,7 +164,7 @@ case SWITCH_CONFIG_FLAGARRAY: { int8_t *dest = (int8_t*)item->ptr; - int index = (int)item->data; + int index = (int)(intptr_t)item->data; if (value) { dest[index] = !!switch_true(value); } else {

1 0

[commit] r12441 - freeswitch/trunk/src
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: mrene Date: Wed Mar 4 22:23:54 2009 New Revision: 12441 Log: update Modified: freeswitch/trunk/src/switch_xml_config.c Modified: freeswitch/trunk/src/switch_xml_config.c ============================================================================== --- freeswitch/trunk/src/switch_xml_config.c (original) +++ freeswitch/trunk/src/switch_xml_config.c Wed Mar 4 22:23:54 2009 @@ -34,7 +34,7 @@ #include <switch.h> -SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *options) +SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *instructions) { switch_xml_config_item_t *item; switch_xml_t node; @@ -50,7 +50,7 @@ file_count++; } - for (item = options; item->key; item++) { + for (item = instructions; item->key; item++) { const char *value = switch_event_get_header(event, item->key); if (reload && !item->reloadable) { @@ -77,7 +77,7 @@ case SWITCH_CONFIG_STRING: { switch_xml_config_string_options_t *string_options = (switch_xml_config_string_options_t*)item->data; - if (string_options->length > 0) { + if (options->length > 0) { /* We have a preallocated buffer */ char *dest = (char*)item->ptr; if (value) { @@ -122,18 +122,18 @@ break; case SWITCH_CONFIG_ENUM: { - switch_xml_config_enum_item_t *options = (switch_xml_config_enum_item_t*)item->data; + switch_xml_config_enum_item_t *enum_options = (switch_xml_config_enum_item_t*)item->data; int *dest = (int*)item->ptr; if (value) { - for (;options->key; options++) { - if (!strcasecmp(value, options->key)) { - *dest = options->value; + for (;enum_options->key; enum_options++) { + if (!strcasecmp(value, enum_options->key)) { + *dest = enum_options->value; break; } } - if (!options->key) { /* if (!found) */ + if (!enum_options->key) { /* if (!found) */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s]\n", value, item->key); }

1 0