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

Merge pull request #6 in FS/freeswitch from ~FRANCOIS/fs-6568:master to master 

* commit 'e3b0d7219e1ea269ccd7c5f04747ad21f62c73b2':
  Fix BLF confusion when dealing with the same extension in multiple domains
This commit is contained in:
Anthony Minessale II 2014-07-18 12:27:19 -05:00
parent aa434fd460 e3b0d7219e
commit 83a4305003
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mod/endpoints/mod_sofia/sofia_presence.c
View File

@ -877,15 +877,16 @@ static void do_dialog_probe(switch_event_t *event)
"sip_subscriptions.call_id='%q' "
"left join sip_registrations on sip_registrations.hostname=sip_dialogs.hostname and "
"sip_registrations.profile_name=sip_dialogs.profile_name and "
"(sip_dialogs.sip_from_user = sip_registrations.sip_user "
"and (sip_dialogs.sip_from_host = sip_registrations.orig_server_host or "
"(sip_dialogs.sip_from_user = sip_registrations.sip_user and sip_dialogs.sip_from_host = '%q' and "
"(sip_dialogs.sip_from_host = sip_registrations.orig_server_host or "
"sip_dialogs.sip_from_host = sip_registrations.sip_host) ) "
"where sip_dialogs.hostname='%q' and sip_dialogs.profile_name='%q' and "
"sip_dialogs.call_info_state != 'seized' and sip_dialogs.presence_id='%q@%q' or (sip_registrations.sip_user='%q' and "
"(sip_registrations.orig_server_host='%q' or sip_registrations.sub_host='%q' "
"or sip_registrations.presence_hosts like '%%%q%%'))",
probe_euser, probe_host,
sub_call_id, mod_sofia_globals.hostname, profile->name,
sub_call_id, probe_host,
mod_sofia_globals.hostname, profile->name,
probe_euser, probe_host,
probe_euser, probe_host, probe_host, probe_host);
switch_assert(sql);