March 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

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

05 Mar '09

Author: mrene Date: Thu Mar 5 00:08:45 2009 New Revision: 12456 Log: OCD - going to bed 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 Thu Mar 5 00:08:45 2009 @@ -35,26 +35,26 @@ /*! \brief Type of value to parse */ typedef enum { - SWITCH_CONFIG_INT, /*< (ptr=int* default=int data=NULL) Integer */ - SWITCH_CONFIG_STRING, /*< (ptr=[char* or char ** (for alloc)] default=char* data=switch_xml_config_string_options_t*) Zero-terminated C-string */ - SWITCH_CONFIG_YESNO, /*< (ptr=switch_bool_t* default=switch_bool_t data=NULL) Yes and no */ - SWITCH_CONFIG_CUSTOM, /*< (ptr=<custom function data> default=<custom function data> data=switch_xml_config_callback_t) Custom, get value through function pointer */ - SWITCH_CONFIG_ENUM, /*< (ptr=int* default=int data=switch_xml_config_enum_item_t*) */ - SWITCH_CONFIG_FLAG, /*< (ptr=int32_t* default=switch_bool_t data=int (flag index) */ - SWITCH_CONFIG_FLAGARRAY, /*< (ptr=int8_t* default=switch_bool_t data=int (flag index) */ + SWITCH_CONFIG_INT, /*< (ptr=int* default=int data=NULL) Integer */ + SWITCH_CONFIG_STRING, /*< (ptr=[char* or char ** (for alloc)] default=char* data=switch_xml_config_string_options_t*) Zero-terminated C-string */ + SWITCH_CONFIG_YESNO, /*< (ptr=switch_bool_t* default=switch_bool_t data=NULL) Yes and no */ + SWITCH_CONFIG_CUSTOM, /*< (ptr=<custom function data> default=<custom function data> data=switch_xml_config_callback_t) Custom, get value through function pointer */ + SWITCH_CONFIG_ENUM, /*< (ptr=int* default=int data=switch_xml_config_enum_item_t*) */ + SWITCH_CONFIG_FLAG, /*< (ptr=int32_t* default=switch_bool_t data=int (flag index) */ + SWITCH_CONFIG_FLAGARRAY, /*< (ptr=int8_t* default=switch_bool_t data=int (flag index) */ /* No more past that line */ SWITCH_CONFIG_LAST } switch_xml_config_type_t; -typedef struct { - char *key; /*< The item's key or NULL if this is the last one in the list */ - int value; /*< The item's value */ +typedef struct { + char *key; /*< The item's key or NULL if this is the last one in the list */ + int value; /*< The item's value */ } switch_xml_config_enum_item_t; typedef struct { - switch_memory_pool_t *pool; /*< If set, the string will be allocated on the pool (unless the length param is > 0, then you misread this file)*/ - switch_size_t length; /*< Length of the char array, or 0 if memory has to be allocated dynamically*/ + switch_memory_pool_t *pool; /*< If set, the string will be allocated on the pool (unless the length param is > 0, then you misread this file)*/ + switch_size_t length; /*< Length of the char array, or 0 if memory has to be allocated dynamically*/ } switch_xml_config_string_options_t; struct switch_xml_config_item; @@ -66,14 +66,14 @@ * \brief A configuration instruction read by switch_xml_config_parse */ struct switch_xml_config_item { - char *key; /*< The key of the element, or NULL to indicate the end of the list */ - switch_xml_config_type_t type; /*< The type of variable */ - switch_bool_t reloadable; /*< True if the var can be changed on reload */ - void *ptr; /*< Ptr to the var to be changed */ - void *defaultvalue; /*< Default value */ - void *data; /*< Custom data (depending on the type) */ + char *key; /*< The key of the element, or NULL to indicate the end of the list */ + switch_xml_config_type_t type; /*< The type of variable */ + switch_bool_t reloadable; /*< True if the var can be changed on reload */ + 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 to be called after the var is parsed */ - void *functiondata; /*< Custom data passed to the callback */ + void *functiondata; /*< Custom data passed to the callback */ } ; @@ -85,7 +85,7 @@ * \brief Parses all the xml elements, following a ruleset defined by an array of switch_xml_config_item_t * \param xml The first element of the list to parse * \param reload true to skip all non-reloadable options - * \param options instrutions on how to parse the elements + * \param instructions instrutions on how to parse the elements * \see switch_xml_config_item_t */ SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *instructions);

1 0

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

05 Mar '09

Author: mrene Date: Thu Mar 5 00:00:36 2009 New Revision: 12455 Log: I like casts 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 Thu Mar 5 00:00:36 2009 @@ -160,7 +160,7 @@ { int32_t *dest = (int32_t*)item->ptr; int index = (int)(intptr_t)item->data; - int8_t currentval = !!(*dest & index); + int8_t currentval = (int8_t)!!(*dest & index); int8_t newval = 0; if (value) {

1 0

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

05 Mar '09

Author: mrene Date: Wed Mar 4 23:59:54 2009 New Revision: 12454 Log: 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:59:54 2009 @@ -49,12 +49,12 @@ typedef struct { char *key; /*< The item's key or NULL if this is the last one in the list */ - switch_size_t value; /*< The item's value */ + int value; /*< The item's value */ } switch_xml_config_enum_item_t; typedef struct { switch_memory_pool_t *pool; /*< If set, the string will be allocated on the pool (unless the length param is > 0, then you misread this file)*/ - int length; /*< Length of the char array, or 0 if memory has to be allocated dynamically*/ + switch_size_t length; /*< Length of the char array, or 0 if memory has to be allocated dynamically*/ } switch_xml_config_string_options_t; struct switch_xml_config_item;

1 0

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

05 Mar '09

Author: mrene Date: Wed Mar 4 23:58:12 2009 New Revision: 12453 Log: its getting late 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:58:12 2009 @@ -78,7 +78,7 @@ #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_CALLBACK (_key, _type, _reloadable, _ptr, _defaultvalue, _data, _functiondata) { _key, _type, _reloadable, _ptr, _defaultvalue, _data, _functiondata } #define SWITCH_CONFIG_ITEM_END () { NULL, SWITCH_CONFIG_LAST, 0, NULL ,NULL, NULL, NULL } /*!

1 0

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

05 Mar '09

Author: mrene Date: Wed Mar 4 23:50:11 2009 New Revision: 12452 Log: Shut up MikeJ's code analyzer 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:50:11 2009 @@ -132,7 +132,7 @@ { switch_xml_config_enum_item_t *enum_options = (switch_xml_config_enum_item_t*)item->data; int *dest = (int*)item->ptr; - int newval; + int newval = 0; if (value) { for (;enum_options->key; enum_options++) {

1 0

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

05 Mar '09

Author: mrene Date: Wed Mar 4 23:47:43 2009 New Revision: 12451 Log: final 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:47:43 2009 @@ -85,8 +85,9 @@ 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) { + const char *newstring = NULL; /* We have a preallocated buffer */ char *dest = (char*)item->ptr; if (value) {

1 0

[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