mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-09 04:49:05 +00:00
merge MODAPP-50 (modified for changes in api)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6353 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
1 parent
665e954ba0
commit
c5cc708fe7
3 files changed
+12
-4
No files matched your search
@@ -3127,7 +3127,7 @@ static switch_status_t conf_api_sub_bgdial(conference_obj_t * conference, switch
|
||||
static switch_status_t conf_api_sub_transfer(conference_obj_t * conference, switch_stream_handle_t *stream, int argc, char **argv)
|
||||
{
|
||||
switch_status_t ret_status = SWITCH_STATUS_SUCCESS;
|
||||
char *params = NULL;
|
||||
char *params = NULL, *chanvars = NULL;
|
||||
assert(conference != NULL);
|
||||
assert(stream != NULL);
|
||||
|
||||
@@ -3170,8 +3170,9 @@ static switch_status_t conf_api_sub_transfer(conference_obj_t * conference, swit
|
||||
profile_name = "default";
|
||||
}
|
||||
params = switch_mprintf("conf_name=%s&profile_name=%s", conf_name, profile_name);
|
||||
chanvars = switch_channel_build_param_string(channel, NULL, params);
|
||||
/* Open the config from the xml registry */
|
||||
if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, params))) {
|
||||
if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, chanvars))) {
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name);
|
||||
goto done;
|
||||
}
|
||||
@@ -3243,6 +3244,8 @@ static switch_status_t conf_api_sub_transfer(conference_obj_t * conference, swit
|
||||
|
||||
done:
|
||||
switch_safe_free(params);
|
||||
switch_safe_free(chanvars);
|
||||
|
||||
return ret_status;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user