mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-10-16 08:14:13 +00:00
Merge branch 'master' into smgmaster
This commit is contained in:
commit
84abc3021b
279 files changed
+24309
-10586
No files matched your search
@@ -3989,7 +3989,26 @@ static switch_call_cause_t sofia_outgoing_channel(switch_core_session_t *session
|
||||
switch_channel_set_variable_printf(nchannel, "sip_local_network_addr", "%s", profile->extsipip ? profile->extsipip : profile->sipip);
|
||||
switch_channel_set_variable(nchannel, "sip_profile_name", profile_name);
|
||||
|
||||
switch_split_user_domain(switch_core_session_strdup(nsession, tech_pvt->dest), NULL, &tech_pvt->remote_ip);
|
||||
if (switch_stristr("fs_path", tech_pvt->dest)) {
|
||||
char *remote_host = NULL;
|
||||
const char *s;
|
||||
|
||||
if ((s = switch_stristr("fs_path=", tech_pvt->dest))) {
|
||||
s += 8;
|
||||
}
|
||||
|
||||
if (s) {
|
||||
remote_host = switch_core_session_strdup(nsession, s);
|
||||
switch_url_decode(remote_host);
|
||||
}
|
||||
if (!zstr(remote_host)) {
|
||||
switch_split_user_domain(remote_host, NULL, &tech_pvt->remote_ip);
|
||||
}
|
||||
}
|
||||
|
||||
if (zstr(tech_pvt->remote_ip)) {
|
||||
switch_split_user_domain(switch_core_session_strdup(nsession, tech_pvt->dest), NULL, &tech_pvt->remote_ip);
|
||||
}
|
||||
|
||||
if (dest_to) {
|
||||
if (strchr(dest_to, '@')) {
|
||||
@@ -4025,7 +4044,7 @@ static switch_call_cause_t sofia_outgoing_channel(switch_core_session_t *session
|
||||
dest_num = p + 5;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
if (profile->pres_type) {
|
||||
char *sql;
|
||||
@@ -4046,6 +4065,7 @@ static switch_call_cause_t sofia_outgoing_channel(switch_core_session_t *session
|
||||
sofia_glue_actually_execute_sql(profile, sql, profile->ireg_mutex);
|
||||
switch_safe_free(sql);
|
||||
}
|
||||
#endif
|
||||
|
||||
caller_profile = switch_caller_profile_clone(nsession, outbound_profile);
|
||||
|
||||
|
||||
Reference in new issue
Block a user