From 6a1feacc45e1d5f020ff285f8851bd2dca70bfa2 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Fri, 10 Feb 2012 10:49:19 -0600 Subject: [PATCH] FS-3866 --resolve this should work now with send-message-query-on-register --- src/mod/endpoints/mod_sofia/sofia_presence.c | 9 +++++---- src/mod/endpoints/mod_sofia/sofia_reg.c | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c index 75b7b9f0d3..794627c4f4 100644 --- a/src/mod/endpoints/mod_sofia/sofia_presence.c +++ b/src/mod/endpoints/mod_sofia/sofia_presence.c @@ -455,7 +455,7 @@ static void actual_sofia_presence_mwi_event_handler(switch_event_t *event) if ((pname = switch_event_get_header(event, "sofia-profile"))) { profile = sofia_glue_find_profile(pname); } - + if (!profile) { if (!host || !(profile = sofia_glue_find_profile(host))) { char *sql; @@ -464,7 +464,7 @@ static void actual_sofia_presence_mwi_event_handler(switch_event_t *event) sql = switch_mprintf("select profile_name from sip_registrations where hostname='%q' and (sip_host='%s' or mwi_host='%s')", mod_sofia_globals.hostname, host, host); - + if (list_profiles_full(NULL, NULL, &matches, SWITCH_FALSE) == SWITCH_STATUS_SUCCESS) { switch_console_callback_match_node_t *m; @@ -492,6 +492,7 @@ static void actual_sofia_presence_mwi_event_handler(switch_event_t *event) } } + if (profile->domain_name && strcasecmp(profile->domain_name, host)) { host = profile->domain_name; } @@ -548,8 +549,8 @@ static void actual_sofia_presence_mwi_event_handler(switch_event_t *event) stream.data, mod_sofia_globals.hostname, profile->name, user, host); } else if (call_id) { sql = switch_mprintf("select sip_user,sip_host,contact,profile_name,network_ip,'%q' " - "from sip_registrations where hostname='%q' and profile_name='%q' and mwi_user='%q' and mwi_host='%q' and call_id='%q'", - mod_sofia_globals.hostname, profile->name, stream.data, user, host, call_id); + "from sip_registrations where hostname='%q' and profile_name='%q' and call_id='%q'", + stream.data, mod_sofia_globals.hostname, profile->name, call_id); } if (sql) { diff --git a/src/mod/endpoints/mod_sofia/sofia_reg.c b/src/mod/endpoints/mod_sofia/sofia_reg.c index 0a8b5e89e4..df094f093b 100644 --- a/src/mod/endpoints/mod_sofia/sofia_reg.c +++ b/src/mod/endpoints/mod_sofia/sofia_reg.c @@ -1651,7 +1651,7 @@ uint8_t sofia_reg_handle_register(nua_t *nua, sofia_profile_t *profile, nua_hand (reg_count == 1 && sofia_test_pflag(profile, PFLAG_MESSAGE_QUERY_ON_FIRST_REGISTER))) { if (switch_event_create(&s_mwi_event, SWITCH_EVENT_MESSAGE_QUERY) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(s_mwi_event, SWITCH_STACK_BOTTOM, "Message-Account", "sip:%s@%s", mwi_user, mwi_host); - switch_event_add_header_string(s_mwi_event, SWITCH_STACK_BOTTOM, "VM-Sofia-Pofile", profile->name); + switch_event_add_header_string(s_mwi_event, SWITCH_STACK_BOTTOM, "VM-Sofia-Profile", profile->name); switch_event_add_header_string(s_mwi_event, SWITCH_STACK_BOTTOM, "VM-Call-ID", call_id); } }