- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12475 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: andrew Date: Thu Mar 5 15:54:16 2009 New Revision: 12475 Log: Rework how spawned outbound pids communicate their pid back to the outbound call process, try to improve some memory management Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c Thu Mar 5 15:54:16 2009 @@ -131,7 +131,6 @@ ei_x_buff buf; ei_x_new(&buf); ei_x_encode_list_header(&buf, 1); - ei_init_ref(ec, ref); ei_x_encode_ref(&buf, ref); ei_x_encode_empty_list(&buf); Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c Thu Mar 5 15:54:16 2009 @@ -700,7 +700,8 @@ static switch_status_t handle_ref_tuple(listener_t *listener, erlang_msg *msg, ei_x_buff *buf, ei_x_buff *rbuf) { erlang_ref ref; - erlang_pid *pid2, *pid = switch_core_alloc(listener->pool, sizeof(erlang_pid)); + erlang_pid *pid;/* = switch_core_alloc(listener->pool, sizeof(erlang_pid));*/ + void *p; char hash[100]; int arity; @@ -711,6 +712,14 @@ return SWITCH_STATUS_FALSE; } + if (!(pid = malloc(sizeof(erlang_pid)))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error\n"); + ei_x_encode_tuple_header(rbuf, 2); + ei_x_encode_atom(rbuf, "error"); + ei_x_encode_atom(rbuf, "badmem"); + return SWITCH_STATUS_SUCCESS; + } + if (ei_decode_pid(buf->buff, &buf->index, pid)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid pid in a reference/pid tuple\n"); return SWITCH_STATUS_FALSE; @@ -720,19 +729,36 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Hashed ref to %s\n", hash); - if ((pid2 = (erlang_pid *) switch_core_hash_find(listener->spawn_pid_hash, hash))) { - if (pid2 == NULL) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found unfilled slot for %s\n", hash); + if ((p = switch_core_hash_find(listener->spawn_pid_hash, hash))) { + if (p == &globals.TIMEOUT) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Handler for %s timed out\n", hash); + switch_core_hash_delete(listener->spawn_pid_hash, hash); + ei_x_encode_tuple_header(rbuf, 2); + ei_x_encode_atom(rbuf, "error"); + ei_x_encode_atom(rbuf, "timeout"); + } else if (p == &globals.WAITING) { + /* update the key to point at a pid */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found waiting slot for %s\n", hash); + switch_core_hash_delete(listener->spawn_pid_hash, hash); + switch_core_hash_insert(listener->spawn_pid_hash, hash, pid); + return SWITCH_STATUS_FALSE; /*no reply */ } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found filled slot for %s\n", hash); + ei_x_encode_tuple_header(rbuf, 2); + ei_x_encode_atom(rbuf, "error"); + ei_x_encode_atom(rbuf, "duplicate_response"); } } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No slot for %s\n", hash); - switch_core_hash_insert(listener->spawn_pid_hash, hash, pid); + /* nothin in the hash */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Empty slot for %s\n", hash); + ei_x_encode_tuple_header(rbuf, 2); + ei_x_encode_atom(rbuf, "error"); + ei_x_encode_atom(rbuf, "invalid_ref"); } - /* no reply */ - return SWITCH_STATUS_FALSE; + free(pid); /* don't need it */ + + return SWITCH_STATUS_SUCCESS; } @@ -758,8 +784,7 @@ break; case ERL_REFERENCE_EXT : case ERL_NEW_REFERENCE_EXT : - handle_ref_tuple(listener, msg, buf, rbuf); - return 0; + ret = handle_ref_tuple(listener, msg, buf, rbuf); default : switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "WEEEEEEEE %d\n", type); /* some other kind of erlang term */ Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Thu Mar 5 15:54:16 2009 @@ -413,7 +413,12 @@ if (type != ERL_STRING_EXT && type != ERL_BINARY_EXT) /* XXX no unicode or character codes > 255 */ return NULL; - char *xmlstr = switch_core_alloc(ptr->listener->pool, size + 1); + char *xmlstr; + + if (!(xmlstr = malloc(size + 1))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error\n"); + return NULL; + } ei_decode_string_or_binary(rep->buff, &rep->index, size, xmlstr); @@ -431,7 +436,7 @@ /*switch_safe_free(rep->buff);*/ /*switch_safe_free(rep);*/ - /*switch_safe_free(xmlstr);*/ + free(xmlstr); return xml; } @@ -811,7 +816,6 @@ switch_mutex_unlock(globals.listener_mutex); switch_core_hash_init(&listener->fetch_reply_hash, listener->pool); - switch_core_hash_init(&listener->spawn_pid_hash, listener->pool); switch_assert(listener != NULL); @@ -1071,6 +1075,7 @@ else { char hash[100]; int i = 0; + void *p = NULL; session_element->session = session; erlang_pid *pid; erlang_ref ref; @@ -1081,12 +1086,16 @@ /* attach the session to the listener */ add_session_elem_to_listener(listener,session_element); + ei_init_ref(listener->ec, &ref); + ei_hash_ref(&ref, hash); + /* insert the waiting marker */ + switch_core_hash_insert(listener->spawn_pid_hash, hash, &globals.WAITING); + if (!strcmp(function, "!")) { /* send a message to request a pid */ ei_x_buff rbuf; ei_x_new_with_version(&rbuf); - ei_init_ref(listener->ec, &ref); ei_x_encode_tuple_header(&rbuf, 3); ei_x_encode_atom(&rbuf, "new_pid"); ei_x_encode_ref(&rbuf, &ref); @@ -1107,23 +1116,27 @@ */ } - ei_hash_ref(&ref, hash); - - while (!(pid = (erlang_pid *) switch_core_hash_find(listener->spawn_pid_hash, hash))) { + /* loop until either we timeout or we get a value that's not the waiting marker */ + while (!(p = switch_core_hash_find(listener->spawn_pid_hash, hash)) || p == &globals.WAITING) { if (i > 50) { /* half a second timeout */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Timed out when waiting for outbound pid\n"); switch_core_session_rwunlock(session); remove_session_elem_from_listener(listener,session_element); + switch_core_hash_insert(listener->spawn_pid_hash, hash, &globals.TIMEOUT); /* TODO lock this? */ return NULL; } i++; switch_yield(10000); /* 10ms */ } + switch_core_hash_delete(listener->spawn_pid_hash, hash); + + pid = (erlang_pid *) p; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got pid!\n"); session_element->process.type = ERLANG_PID; memcpy(&session_element->process.pid, pid, sizeof(erlang_pid)); + free(pid); /* malloced in handle_ref_tuple */ switch_set_flag(session_element, LFLAG_SESSION_ALIVE); switch_clear_flag(session_element, LFLAG_OUTBOUND_INIT); switch_clear_flag(session_element, LFLAG_WAITING_FOR_PID); @@ -1222,6 +1235,7 @@ } if (module && function) { + switch_core_hash_init(&listener->spawn_pid_hash, listener->pool); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Creating new spawned session for listener\n"); session_element=attach_call_to_spawned_process(listener, module, function, session); } else { Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h Thu Mar 5 15:54:16 2009 @@ -136,6 +136,8 @@ unsigned int reference0; unsigned int reference1; unsigned int reference2; + char TIMEOUT; /* marker for a timed out request */ + char WAITING; /* marker for a request waiting for a response */ switch_mutex_t *ref_mutex; }; typedef struct globals_struct globals_t;

1 0

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

05 Mar '09

Author: mrene Date: Thu Mar 5 15:39:21 2009 New Revision: 12474 Log: generic parses fixes 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 15:39:21 2009 @@ -40,7 +40,8 @@ switch_size_t count = 0; if (!*event) { - switch_event_create(event, SWITCH_EVENT_REQUEST_PARAMS); + /* SWITCH_EVENT_CLONE will not insert any generic event headers */ + switch_event_create(event, SWITCH_EVENT_CLONE); switch_assert(*event); } @@ -74,13 +75,17 @@ SWITCH_DECLARE(switch_status_t) switch_xml_config_parse_event(switch_event_t *event, int count, int reload, switch_xml_config_item_t *instructions) { switch_xml_config_item_t *item; - int file_count = 0, matched_count = 0; + int matched_count = 0; 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 (value) { + matched_count++; + } + if (reload && !switch_test_flag(item, CONFIG_RELOADABLE)) { continue; } @@ -283,14 +288,14 @@ callback(item, (reload ? CONFIG_RELOAD : CONFIG_LOAD), changed); } } - - if (file_count > matched_count) { + + if (count != matched_count) { /* User made a mistake, find it */ switch_event_header_t *header; for (header = event->headers; header; header = header->next) { switch_bool_t found = SWITCH_FALSE; for (item = instructions; item->key; item++) { - if (strcasecmp(header->name, item->key)) { + if (!strcasecmp(header->name, item->key)) { found = SWITCH_TRUE; break; } @@ -298,7 +303,7 @@ if (!found) { /* Tell the user */ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Configuration parameter [%s] is unfortunately not valid, you might want to double-check that.\n", header->name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Configuration parameter [%s] is unfortunately not valid, you might want to double-check that.\n", header->name); } } }

1 0

[commit] r12473 - freeswitch/trunk/src/mod/loggers/mod_console
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: mrene Date: Thu Mar 5 15:38:32 2009 New Revision: 12473 Log: Add docs and complete to mod_console Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Thu Mar 5 15:38:32 2009 @@ -328,8 +328,9 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); - SWITCH_ADD_API(api_interface, "console", "Console", console_api_function, ""); - + SWITCH_ADD_API(api_interface, "console", "Console", console_api_function, "loglevel [level]|colorize [on|off]"); + switch_console_set_complete("add console loglevel"); + switch_console_set_complete("add console colorize"); /* setup my logger function */ switch_log_bind_logger(switch_console_logger, SWITCH_LOG_DEBUG, SWITCH_TRUE);

1 0

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

05 Mar '09

Author: brian Date: Thu Mar 5 15:34:13 2009 New Revision: 12472 Log: add sessions since start up to heartbeat event Modified: freeswitch/trunk/src/switch_core.c Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Thu Mar 5 15:34:13 2009 @@ -75,6 +75,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Session-Count", "%u", switch_core_session_count()); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Session-Per-Sec", "%u", runtime.sps); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Session-Since-Startup", "%" SWITCH_SIZE_T_FMT, switch_core_session_id() - 1); switch_event_fire(&event); } }

1 0

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

05 Mar '09

Author: mrene Date: Thu Mar 5 15:09:46 2009 New Revision: 12471 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 Thu Mar 5 15:09:46 2009 @@ -41,7 +41,7 @@ if (!*event) { switch_event_create(event, SWITCH_EVENT_REQUEST_PARAMS); - switch_assert(event); + switch_assert(*event); } for (node = xml; node; node = node->next) { @@ -58,7 +58,7 @@ SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *instructions) { - switch_event_t *event; + switch_event_t *event = NULL; switch_status_t result; int count = switch_event_import_xml(xml, "name", "value", &event); @@ -165,14 +165,14 @@ /* We have a preallocated buffer */ char *dest = (char*)item->ptr; - if (strncasecmp(dest, newstring, string_options->length)) { + if (!dest || strncasecmp(dest, newstring, string_options->length)) { switch_copy_string(dest, newstring, string_options->length); changed = SWITCH_TRUE; } } else { char **dest = (char**)item->ptr; - if (strcasecmp(*dest, newstring)) { + if (!*dest || strcasecmp(*dest, newstring)) { if (string_options->pool) { *dest = switch_core_strdup(string_options->pool, newstring); } else {

1 0

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

05 Mar '09

Author: mrene Date: Thu Mar 5 14:51:23 2009 New Revision: 12470 Log: fix gcc visibility 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 Thu Mar 5 14:51:23 2009 @@ -58,7 +58,7 @@ char *validation_regex; /*< Enforce validation using this regular expression */ } switch_xml_config_string_options_t; -extern switch_xml_config_string_options_t switch_config_string_strdup; /*< String options structure for strdup, no validation */ +SWITCH_DECLARE_DATA extern switch_xml_config_string_options_t switch_config_string_strdup; /*< String options structure for strdup, no validation */ typedef struct { switch_bool_t enforce_min; 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 14:51:23 2009 @@ -32,7 +32,7 @@ #include <switch.h> -switch_xml_config_string_options_t switch_config_string_strdup = { NULL, 0, NULL }; +SWITCH_DECLARE_DATA switch_xml_config_string_options_t switch_config_string_strdup = { NULL, 0, NULL }; SWITCH_DECLARE(switch_size_t) switch_event_import_xml(switch_xml_t xml, const char *keyname, const char *valuename, switch_event_t **event) {

1 0

[commit] r12469 - in freeswitch/trunk/src: . include mod/applications/mod_skel
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: mrene Date: Thu Mar 5 14:18:27 2009 New Revision: 12469 Log: replace reloadable bool by a flags structure and add required flag Modified: freeswitch/trunk/src/include/switch_xml_config.h freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c 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 Thu Mar 5 14:18:27 2009 @@ -58,6 +58,8 @@ char *validation_regex; /*< Enforce validation using this regular expression */ } switch_xml_config_string_options_t; +extern switch_xml_config_string_options_t switch_config_string_strdup; /*< String options structure for strdup, no validation */ + typedef struct { switch_bool_t enforce_min; int min; @@ -74,6 +76,11 @@ CONFIG_SHUTDOWN } switch_config_callback_type_t; +typedef enum { + CONFIG_RELOADABLE = (1 << 0), + CONFIG_REQUIRED = (1 << 1) +} switch_config_flags_t; + typedef switch_status_t (*switch_xml_config_callback_t)(switch_xml_config_item_t *data, switch_config_callback_type_t callback_type, switch_bool_t changed); /*! @@ -82,16 +89,16 @@ 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 */ + switch_config_flags_t flags; /*< 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 */ -} ; - +}; -#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, _functiondata) { _key, _type, _reloadable, _ptr, _defaultvalue, _functiondata, _data } +#define SWITCH_CONFIG_ITEM(_key, _type, _flags, _ptr, _defaultvalue, _data) { _key, _type, _flags, _ptr, _defaultvalue, _data, NULL } +#define SWITCH_CONFIG_ITEM_STRING_STRDUP(_key, _flags, _ptr, _defaultvalue) { _key, SWITCH_CONFIG_STRING, _flags, _ptr, _defaultvalue, &switch_config_string_strdup, NULL } +#define SWITCH_CONFIG_ITEM_CALLBACK(_key, _type, _flags, _ptr, _defaultvalue, _data, _functiondata) { _key, _type, _flags, _ptr, _defaultvalue, _functiondata, _data } #define SWITCH_CONFIG_ITEM_END() { NULL, SWITCH_CONFIG_LAST, 0, NULL ,NULL, NULL, NULL } /*! Modified: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c (original) +++ freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c Thu Mar 5 14:18:27 2009 @@ -83,10 +83,10 @@ static switch_xml_config_item_t instructions[] = { /* parameter name type reloadable pointer default value options structure */ - SWITCH_CONFIG_ITEM("codec-negotiation-str", SWITCH_CONFIG_STRING, SWITCH_TRUE, &globals.codec_negotiation_str, "greedy", &config_opt_codec_negotiation), - SWITCH_CONFIG_ITEM("codec-negotiation", SWITCH_CONFIG_ENUM, SWITCH_TRUE, &globals.codec_negotiation, (void*)CODEC_NEGOTIATION_GREEDY, &config_opt_codec_negotiation_enum), - SWITCH_CONFIG_ITEM_CALLBACK("sip-trace", SWITCH_CONFIG_BOOL, SWITCH_TRUE, &globals.sip_trace, (void*)SWITCH_FALSE, config_callback_siptrace, NULL ), - SWITCH_CONFIG_ITEM("integer", SWITCH_CONFIG_INT, SWITCH_FALSE, &globals.integer, (void*)100, &config_opt_integer), + SWITCH_CONFIG_ITEM("codec-negotiation-str", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE, &globals.codec_negotiation_str, "greedy", &config_opt_codec_negotiation), + SWITCH_CONFIG_ITEM("codec-negotiation", SWITCH_CONFIG_ENUM, CONFIG_RELOADABLE, &globals.codec_negotiation, (void*)CODEC_NEGOTIATION_GREEDY, &config_opt_codec_negotiation_enum), + SWITCH_CONFIG_ITEM_CALLBACK("sip-trace", SWITCH_CONFIG_BOOL, CONFIG_RELOADABLE, &globals.sip_trace, (void*)SWITCH_FALSE, config_callback_siptrace, NULL ), + SWITCH_CONFIG_ITEM("integer", SWITCH_CONFIG_INT, CONFIG_RELOADABLE | CONFIG_REQUIRED, &globals.integer, (void*)100, &config_opt_integer), SWITCH_CONFIG_ITEM_END() }; 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 14:18:27 2009 @@ -32,6 +32,8 @@ #include <switch.h> +switch_xml_config_string_options_t switch_config_string_strdup = { NULL, 0, NULL }; + SWITCH_DECLARE(switch_size_t) switch_event_import_xml(switch_xml_t xml, const char *keyname, const char *valuename, switch_event_t **event) { switch_xml_t node; @@ -79,10 +81,15 @@ switch_bool_t changed = SWITCH_FALSE; switch_xml_config_callback_t callback = (switch_xml_config_callback_t)item->function; - if (reload && !item->reloadable) { + if (reload && !switch_test_flag(item, CONFIG_RELOADABLE)) { continue; } + if (!value && switch_test_flag(item, CONFIG_REQUIRED)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Required parameter [%s] is missing\n", item->key); + return SWITCH_STATUS_FALSE; + } + switch(item->type) { case SWITCH_CONFIG_INT: {

1 0

[commit] r12468 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: mrene Date: Thu Mar 5 13:48:15 2009 New Revision: 12468 Log: Sofia logger goes to LOG_CONSOLE 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 Thu Mar 5 13:48:15 2009 @@ -928,9 +928,9 @@ static void logger(void *logarg, char const *fmt, va_list ap) { if (fmt && ap) { - switch_log_vprintf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, fmt, ap); + switch_log_vprintf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE, fmt, ap); } else if (fmt && !ap) { - switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "%s", fmt); + switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE, "%s", fmt); } }

1 0

[commit] r12467 - in freeswitch/trunk/src: . include mod/applications/mod_skel
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: mrene Date: Thu Mar 5 10:57:26 2009 New Revision: 12467 Log: Lets make the parser free its stuff on shutdown, and let the callbacks do something if required Modified: freeswitch/trunk/src/include/switch_xml_config.h freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c 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 Thu Mar 5 10:57:26 2009 @@ -68,7 +68,13 @@ 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, switch_bool_t changed); +typedef enum { + CONFIG_LOAD, + CONFIG_RELOAD, + CONFIG_SHUTDOWN +} switch_config_callback_type_t; + +typedef switch_status_t (*switch_xml_config_callback_t)(switch_xml_config_item_t *data, switch_config_callback_type_t callback_type, switch_bool_t changed); /*! * \brief A configuration instruction read by switch_xml_config_parse @@ -114,6 +120,13 @@ * \param event [out] event (if *event is NOT NULL, the headers will be appended to the existing event) */ SWITCH_DECLARE(switch_size_t) switch_event_import_xml(switch_xml_t xml, const char *keyname, const char *valuename, switch_event_t **event); + + +/*! + * \brief Free any memory allocated by the configuration + * \param instructions instrutions on how to parse the elements + */ +SWITCH_DECLARE(void) switch_xml_config_cleanup(switch_xml_config_item_t *instructions); #endif /* !defined(SWITCH_XML_CONFIG_H) */ /* For Emacs: Modified: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c (original) +++ freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c Thu Mar 5 10:57:26 2009 @@ -55,14 +55,15 @@ int integer; } globals; -static switch_status_t config_callback_siptrace(switch_xml_config_item_t *data, switch_bool_t changed) +static switch_status_t config_callback_siptrace(switch_xml_config_item_t *data, switch_config_callback_type_t callback_type, switch_bool_t changed) { switch_bool_t value = *(switch_bool_t*)data->ptr; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "In siptrace callback: value %s changed %s\n", value ? "true" : "false", changed ? "true" : "false"); + /* - if (changed) { + if ((callback_type == CONFIG_LOG || callback_type == CONFIG_RELOAD) && changed) { nua_set_params(((sofia_profile_t*)data->functiondata)->nua, TPTAG_LOG(value), TAG_END()); } */ @@ -143,6 +144,8 @@ Macro expands to: switch_status_t mod_skel_shutdown() */ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skel_shutdown) { + /* Cleanup dynamically allocated config settings */ + switch_xml_config_cleanup(instructions); return SWITCH_STATUS_SUCCESS; } 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 10:57:26 2009 @@ -273,7 +273,7 @@ } if (callback) { - callback(item, changed); + callback(item, (reload ? CONFIG_RELOAD : CONFIG_LOAD), changed); } } @@ -299,6 +299,36 @@ return SWITCH_STATUS_SUCCESS; } + +SWITCH_DECLARE(void) switch_xml_config_cleanup(switch_xml_config_item_t *instructions) +{ + switch_xml_config_item_t *item; + + for (item = instructions; item->key; item++) { + switch_xml_config_callback_t callback = (switch_xml_config_callback_t)item->function; + + switch (item->type) { + case SWITCH_CONFIG_STRING: + { + char **ptr = (char**)item->ptr; + switch_xml_config_string_options_t *string_options = (switch_xml_config_string_options_t*)item->data; + /* if (using_strdup) */ + if (string_options && !string_options->pool && !string_options->length) { + switch_safe_free(*ptr); + } + } + break; + default: + break; + } + + if (callback) { + callback(item, CONFIG_SHUTDOWN, SWITCH_FALSE); + } + + } +} + /* For Emacs: * Local Variables: * mode:c

1 0

[commit] r12466 - in freeswitch/trunk/src: . mod/applications/mod_conference
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: anthm Date: Thu Mar 5 10:53:31 2009 New Revision: 12466 Log: MODAPP-226 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/switch_ivr.c Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Mar 5 10:53:31 2009 @@ -1563,7 +1563,7 @@ while (switch_test_flag(member, MFLAG_RUNNING) && switch_channel_ready(channel)) { - if (switch_channel_test_flag(channel, CF_SERVICE)) { + if (switch_channel_test_app_flag(channel, CF_APP_TAGGED)) { switch_yield(100000); continue; } @@ -1878,7 +1878,7 @@ } if (restarting) { - switch_channel_clear_flag(channel, CF_SERVICE); + switch_channel_clear_app_flag(channel, CF_APP_TAGGED); } /* Fair WARNING, If you expect the caller to hear anything or for digit handling to be processed, */ @@ -2094,9 +2094,9 @@ if (switch_core_session_private_event_count(member->session)) { - switch_channel_set_flag(channel, CF_SERVICE); + switch_channel_set_app_flag(channel, CF_APP_TAGGED); switch_ivr_parse_all_events(member->session); - switch_channel_clear_flag(channel, CF_SERVICE); + switch_channel_clear_app_flag(channel, CF_APP_TAGGED); switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); switch_core_session_set_read_codec(member->session, &member->read_codec); } @@ -3697,7 +3697,7 @@ if (setup_media(member, new_conference)) { switch_clear_flag_locked(member, MFLAG_RUNNING); } else { - switch_channel_set_flag(channel, CF_SERVICE); + switch_channel_set_app_flag(channel, CF_APP_TAGGED); switch_set_flag_locked(member, MFLAG_RESTART); } } Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu Mar 5 10:53:31 2009 @@ -975,9 +975,10 @@ switch_ivr_parse_all_events(session); } - + if (eff_timeout) { digit_elapsed = (uint32_t) ((switch_micro_time_now() - digit_started) / 1000); + if (digit_elapsed >= eff_timeout) { status = SWITCH_STATUS_TIMEOUT; break; @@ -987,7 +988,7 @@ if (switch_channel_has_dtmf(channel)) { switch_dtmf_t dtmf = { 0 }; switch_size_t y; - + if (eff_timeout) { eff_timeout = digit_timeout; digit_started = switch_micro_time_now(); @@ -1006,6 +1007,7 @@ buf[x++] = dtmf.digit; buf[x] = '\0'; + if (x >= buflen || x >= maxdigits) { return SWITCH_STATUS_SUCCESS; }

1 0