kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-17 01:02:12 +00:00
Code Issues Projects Releases Wiki Activity

fix regression from f60fdf653dd2d7f8d3eaa6a9086e1f68bd993c59

Browse Source
This commit is contained in:
Anthony Minessale 2011-02-04 08:56:30 -06:00
parent b6ac001276
commit 46f6c6e42d
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2774,7 +2774,7 @@ static switch_call_cause_t group_outgoing_channel(switch_core_session_t *session
switch_originate_flag_t myflags = SOF_NONE; switch_originate_flag_t myflags = SOF_NONE;
char *cid_name_override = NULL; char *cid_name_override = NULL;
char *cid_num_override = NULL; char *cid_num_override = NULL;
char *domain = NULL; char *domain = NULL, *dup_domain = NULL;
switch_channel_t *new_channel = NULL; switch_channel_t *new_channel = NULL;
unsigned int timelimit = 60; unsigned int timelimit = 60;
const char *skip, *var; const char *skip, *var;
@ -2788,6 +2788,7 @@ static switch_call_cause_t group_outgoing_channel(switch_core_session_t *session
*domain++ = '\0'; *domain++ = '\0';
} else { } else {
domain = switch_core_get_variable_pdup("domain", switch_core_session_get_pool(session)); domain = switch_core_get_variable_pdup("domain", switch_core_session_get_pool(session));
dup_domain = domain;
} }
if (!domain) { if (!domain) {
@ -2859,6 +2860,7 @@ static switch_call_cause_t group_outgoing_channel(switch_core_session_t *session
switch_safe_free(template); switch_safe_free(template);
switch_safe_free(group); switch_safe_free(group);
switch_safe_free(dup_domain);
if (cause == SWITCH_CAUSE_NONE) { if (cause == SWITCH_CAUSE_NONE) {
cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;

6
src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c
View File

@ -309,11 +309,13 @@ static switch_call_cause_t sip_outgoing_channel(switch_core_session_t *session,
switch_call_cause_t *cancel_cause) switch_call_cause_t *cancel_cause)
{ {
const char *profile; const char *profile;
char *dup_profile = NULL;
if (session) { if (session) {
profile = switch_channel_get_variable(switch_core_session_get_channel(session), "sip_profile"); profile = switch_channel_get_variable(switch_core_session_get_channel(session), "sip_profile");
} else { } else {
profile = switch_core_get_variable_pdup("sip_profile", switch_core_session_get_pool(session)); dup_profile = switch_core_get_variable_dup("sip_profile");
profile = dup_profile;
} }
if (zstr(profile)) { if (zstr(profile)) {
profile = "default"; profile = "default";
@ -323,6 +325,8 @@ static switch_call_cause_t sip_outgoing_channel(switch_core_session_t *session,
UNPROTECT_INTERFACE(sip_endpoint_interface); UNPROTECT_INTERFACE(sip_endpoint_interface);
switch_safe_free(dup_profile);
return switch_core_session_outgoing_channel(session, var_event, "sofia", outbound_profile, new_session, pool, SOF_NONE, cancel_cause); return switch_core_session_outgoing_channel(session, var_event, "sofia", outbound_profile, new_session, pool, SOF_NONE, cancel_cause);
} }