retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

prevent exclusive hold on xml registry during visits to the phrase section 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11900 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2009-02-12 00:27:07 +00:00
parent e39a63d820
commit 93ec3d687a
7 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/include/switch_xml.h
View File

@ -331,8 +331,12 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_root(void);
///\return SWITCH_STATUS_SUCCESS if successful root and node will be assigned
SWITCH_DECLARE(switch_status_t) switch_xml_locate(const char *section,
const char *tag_name,
const char *key_name, const char *key_value, switch_xml_t *root, switch_xml_t *node,
switch_event_t *params);
const char *key_name,
const char *key_value,
switch_xml_t *root,
switch_xml_t *node,
switch_event_t *params,
switch_bool_t clone);
SWITCH_DECLARE(switch_status_t) switch_xml_locate_domain(const char *domain_name, switch_event_t *params, switch_xml_t *root, switch_xml_t *domain);

2
src/mod/applications/mod_commands/mod_commands.c
View File

@ -669,7 +669,7 @@ SWITCH_STANDARD_API(xml_locate_function)
switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "tag_attr_name", tag_attr_name);
switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "tag_attr_val", tag_attr_val);
if (switch_xml_locate(section, tag, tag_attr_name, tag_attr_val, &xml, &obj, params) != SWITCH_STATUS_SUCCESS) {
if (switch_xml_locate(section, tag, tag_attr_name, tag_attr_val, &xml, &obj, params, SWITCH_FALSE) != SWITCH_STATUS_SUCCESS) {
stream->write_function(stream, "can't find anything\n");
goto end;
}

3
src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c
View File

@ -206,8 +206,7 @@ static switch_status_t dialplan_xml_locate(switch_core_session_t *session, switc
switch_channel_event_set_data(channel, params);
switch_caller_profile_event_set_data(caller_profile, "Hunt", params);
status = switch_xml_locate("dialplan", NULL, NULL, NULL, root, node, params);
status = switch_xml_locate("dialplan", NULL, NULL, NULL, root, node, params, SWITCH_FALSE);
switch_event_destroy(&params);
return status;
}

2
src/mod/endpoints/mod_dingaling/mod_dingaling.c
View File

@ -2277,7 +2277,7 @@ static void do_vcard(ldl_handle_t *handle, char *to, char *from, char *id)
switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "from", from);
switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "object", "vcard");
if (switch_xml_locate("directory", "domain", "name", to_host, &xml, &domain, params) != SWITCH_STATUS_SUCCESS) {
if (switch_xml_locate("directory", "domain", "name", to_host, &xml, &domain, params, SWITCH_FALSE) != SWITCH_STATUS_SUCCESS) {
//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "can't find domain for [%s@%s]\n", to_user, to_host);
goto end;
}

4
src/mod/endpoints/mod_sofia/sofia.c
View File

@ -1653,7 +1653,7 @@ switch_status_t reconfig_sofia(sofia_profile_t *profile)
if (!switch_strlen_zero(dname)) {
if (!strcasecmp(dname, "all")) {
switch_xml_t xml_root, x_domains;
if (switch_xml_locate("directory", NULL, NULL, NULL, &xml_root, &x_domains, xml_params) == SWITCH_STATUS_SUCCESS) {
if (switch_xml_locate("directory", NULL, NULL, NULL, &xml_root, &x_domains, xml_params, SWITCH_FALSE) == SWITCH_STATUS_SUCCESS) {
for (x_domain_tag = switch_xml_child(x_domains, "domain"); x_domain_tag; x_domain_tag = x_domain_tag->next) {
dname = switch_xml_attr_soft(x_domain_tag, "name");
parse_domain_tag(profile, x_domain_tag, dname, parse, alias);
@ -2361,7 +2361,7 @@ switch_status_t config_sofia(int reload, char *profile_name)
if (!switch_strlen_zero(dname)) {
if (!strcasecmp(dname, "all")) {
switch_xml_t xml_root, x_domains;
if (switch_xml_locate("directory", NULL, NULL, NULL, &xml_root, &x_domains, xml_params) == SWITCH_STATUS_SUCCESS) {
if (switch_xml_locate("directory", NULL, NULL, NULL, &xml_root, &x_domains, xml_params, SWITCH_FALSE) == SWITCH_STATUS_SUCCESS) {
for (x_domain_tag = switch_xml_child(x_domains, "domain"); x_domain_tag; x_domain_tag = x_domain_tag->next) {
dname = switch_xml_attr_soft(x_domain_tag, "name");
parse_domain_tag(profile, x_domain_tag, dname, parse, alias);

2
src/switch_ivr_play_say.c
View File

@ -133,7 +133,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_phrase_macro(switch_core_session_t *s
}
switch_channel_event_set_data(channel, hint_data);
if (switch_xml_locate("phrases", NULL, NULL, NULL, &xml, &cfg, hint_data) != SWITCH_STATUS_SUCCESS) {
if (switch_xml_locate("phrases", NULL, NULL, NULL, &xml, &cfg, hint_data, SWITCH_TRUE) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of phrases failed.\n");
goto done;
}

24
src/switch_xml.c
View File

@ -1491,8 +1491,12 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_parse_file(const char *file)
SWITCH_DECLARE(switch_status_t) switch_xml_locate(const char *section,
const char *tag_name,
const char *key_name, const char *key_value, switch_xml_t * root, switch_xml_t * node,
switch_event_t *params)
const char *key_name,
const char *key_value,
switch_xml_t *root,
switch_xml_t *node,
switch_event_t *params,
switch_bool_t clone)
{
switch_xml_t conf = NULL;
switch_xml_t tag = NULL;
@ -1547,8 +1551,16 @@ SWITCH_DECLARE(switch_status_t) switch_xml_locate(const char *section,
}
if ((conf = switch_xml_find_child(xml, "section", "name", section)) && (tag = switch_xml_find_child(conf, tag_name, key_name, key_value))) {
*node = tag;
*root = xml;
if (clone) {
char *x = switch_xml_toxml(tag, SWITCH_FALSE);
switch_assert(x);
*root = switch_xml_parse_str(x, strlen(x));
*node = *root;
switch_xml_free(xml);
} else {
*node = tag;
*root = xml;
}
return SWITCH_STATUS_SUCCESS;
} else {
switch_xml_free(xml);
@ -1577,7 +1589,7 @@ SWITCH_DECLARE(switch_status_t) switch_xml_locate_domain(const char *domain_name
params = my_params;
}
status = switch_xml_locate("directory", "domain", "name", domain_name, root, domain, params);
status = switch_xml_locate("directory", "domain", "name", domain_name, root, domain, params, SWITCH_FALSE);
if (my_params) {
switch_event_destroy(&my_params);
}
@ -1914,7 +1926,7 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_open_cfg(const char *file_path, switch_x
assert(MAIN_XML_ROOT != NULL);
if (switch_xml_locate("configuration", "configuration", "name", file_path, &xml, &cfg, params) == SWITCH_STATUS_SUCCESS) {
if (switch_xml_locate("configuration", "configuration", "name", file_path, &xml, &cfg, params, SWITCH_FALSE) == SWITCH_STATUS_SUCCESS) {
*node = cfg;
}