kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix regression from e52e44e39c probably keeping the user channel from propigating variables into the real channel

This commit is contained in:
Anthony Minessale 2011-11-15 07:55:31 -06:00
parent 7ba5197009
commit adfbee993e
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mod/applications/mod_dptools/mod_dptools.c
View File

@ -3161,7 +3161,7 @@ static switch_call_cause_t user_outgoing_channel(switch_core_session_t *session,
switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags, switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags,
switch_call_cause_t *cancel_cause) switch_call_cause_t *cancel_cause)
{ {
switch_xml_t xml = NULL, x_user = NULL, x_param, x_params; switch_xml_t x_user = NULL, x_param, x_params;
char *user = NULL, *domain = NULL, *dup_domain = NULL; char *user = NULL, *domain = NULL, *dup_domain = NULL;
const char *dest = NULL; const char *dest = NULL;
switch_call_cause_t cause = SWITCH_CAUSE_NONE; switch_call_cause_t cause = SWITCH_CAUSE_NONE;
@ -3327,7 +3327,7 @@ static switch_call_cause_t user_outgoing_channel(switch_core_session_t *session,
} }
} }
if (new_channel && xml) { if (new_channel && x_user) {
if ((x_params = switch_xml_child(x_user, "variables"))) { if ((x_params = switch_xml_child(x_user, "variables"))) {
for (x_param = switch_xml_child(x_params, "variable"); x_param; x_param = x_param->next) { for (x_param = switch_xml_child(x_params, "variable"); x_param; x_param = x_param->next) {
const char *pvar = switch_xml_attr(x_param, "name"); const char *pvar = switch_xml_attr(x_param, "name");
@ -3343,8 +3343,6 @@ static switch_call_cause_t user_outgoing_channel(switch_core_session_t *session,
switch_xml_free(x_user); switch_xml_free(x_user);
} }
switch_xml_free(xml);
if (params) { if (params) {
switch_event_destroy(&params); switch_event_destroy(&params);
} }