MODENDP-207

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12792 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c
index 2d8579a0872271252d606572634ff3483ff02bc1..645e82db2cf2ef76ae020fc3f822fcce50826954 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -210,7 +210,8 @@ void sofia_presence_cancel(void)
        if ((sql = switch_mprintf(
                                                          "select proto,sip_user,sip_host,sub_to_user,sub_to_host,event,contact,call_id,full_from,"
                                                          "full_via,expires,user_agent,accept,profile_name"
-                                                         ",-1,'unavailable','unavailable' from sip_subscriptions where event='presence'"))) {
+                                                         ",-1,'unavailable','unavailable' from sip_subscriptions where event='presence' and hostname='%q'", 
+                                                         mod_sofia_globals.hostname))) {
                switch_mutex_lock(mod_sofia_globals.hash_mutex);
                for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) {
                        switch_hash_this(hi, NULL, NULL, &val);

diff --git a/src/mod/endpoints/mod_sofia/sofia_reg.c b/src/mod/endpoints/mod_sofia/sofia_reg.c
index a166c58c1f8c8206a35bac8f75bec71206c39b61..1e3fb0422decce08e72b2ccfdcec13479e24eb83 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_reg.c
+++ b/src/mod/endpoints/mod_sofia/sofia_reg.c
@@ -597,8 +597,11 @@ void sofia_reg_check_expire(sofia_profile_t *profile, time_t now, int reboot)
 
 
        if (now) {
-               switch_snprintf(sql, sizeof(sql), "select call_id,sip_user,sip_host,contact,status,rpid,expires,user_agent,server_user,server_host,profile_name"
-                                               " from sip_registrations where status like '%%AUTO-NAT%%' or status like '%%UDP-NAT%%'");
+               switch_snprintf(sql, sizeof(sql), "select call_id,sip_user,sip_host,contact,status,rpid,"
+                                               "expires,user_agent,server_user,server_host,profile_name"
+                                               " from sip_registrations where (status like '%%AUTO-NAT%%' "
+                                               "or status like '%%UDP-NAT%%') and hostname='%s'", mod_sofia_globals.hostname);
+
                sofia_glue_execute_sql_callback(profile, SWITCH_TRUE, NULL, sql, sofia_reg_nat_callback, profile);
        }