xmas presence

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

diff --git a/src/mod/endpoints/mod_dingaling/mod_dingaling.c b/src/mod/endpoints/mod_dingaling/mod_dingaling.c
index 7c639df4e9efe4e7864b012c11bee6c60c3ab32a..cb1aeca664d8522b7ece93b19706e00200c1a0e1 100644 (file)
--- a/src/mod/endpoints/mod_dingaling/mod_dingaling.c
+++ b/src/mod/endpoints/mod_dingaling/mod_dingaling.c
@@ -306,7 +306,8 @@ static void pres_event_handler(switch_event_t *event)
        }
 
        switch(event->event_id) {
-       case SWITCH_EVENT_PRESENCE_PROBE: {
+       case SWITCH_EVENT_PRESENCE_PROBE: 
+        if (proto && !strcasecmp(proto, MDL_CHAT_PROTO)) {
                char *sql;
             switch_core_db_t *db;
             char *errmsg;
@@ -323,7 +324,7 @@ static void pres_event_handler(switch_event_t *event)
                 switch_core_db_close(db);
                 switch_safe_free(sql);
             }
-    }
+        }
         return;
        case SWITCH_EVENT_PRESENCE_IN:
                if (!status) {

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index 012cab419454762bcc8fdfb1d3ffea1821a867dc..205c553c674e8d9439cc40f85ea2730a3d969fb6 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -5326,34 +5326,35 @@ static void pres_event_handler(switch_event_t *event)
 
 
        switch(event->event_id) {
-    case SWITCH_EVENT_PRESENCE_PROBE: {
-        switch_core_db_t *db;
-        char *to = switch_event_get_header(event, "to");
-        char *user, *host;
+    case SWITCH_EVENT_PRESENCE_PROBE: 
+        if (proto && !strcasecmp(proto, SOFIA_CHAT_PROTO)) {
+            switch_core_db_t *db;
+            char *to = switch_event_get_header(event, "to");
+            char *user, *host;
+
+            if (!to || !(user = strdup(to))) {
+                return;
+            }
 
-        if (!to || !(user = strdup(to))) {
-            return;
-        }
+            if (!(db = switch_core_db_open_file(profile->dbname))) {
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB %s\n", profile->dbname);
+                switch_safe_free(user);
+                return;
+            }
 
-        if (!(db = switch_core_db_open_file(profile->dbname))) {
-            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB %s\n", profile->dbname);
+            if ((host = strchr(user, '@'))) {
+                *host++ = '\0';
+            }
+            if (user && host && 
+                (sql = switch_mprintf("select user,host,'Registered','unknown','' from sip_registrations where user='%q' and host='%q'", user, host))) {
+                switch_mutex_lock(profile->ireg_mutex);
+                switch_core_db_exec(db, sql, resub_callback, profile, &errmsg);
+                switch_mutex_unlock(profile->ireg_mutex);
+                switch_safe_free(sql);
+            }
             switch_safe_free(user);
-            return;
+            switch_core_db_close(db);
         }
-
-        if ((host = strchr(user, '@'))) {
-            *host++ = '\0';
-        }
-        if (user && host && 
-            (sql = switch_mprintf("select user,host,'Registered','unknown','' from sip_registrations where user='%q' and host='%q'", user, host))) {
-            switch_mutex_lock(profile->ireg_mutex);
-            switch_core_db_exec(db, sql, resub_callback, profile, &errmsg);
-            switch_mutex_unlock(profile->ireg_mutex);
-            switch_safe_free(sql);
-        }
-        switch_safe_free(user);
-        switch_core_db_close(db);
-    }
         return;
        case SWITCH_EVENT_PRESENCE_IN:
                sql = switch_mprintf("select 1,'%q','%q',* from sip_subscriptions where proto='%q' and event='%q' and sub_to_user='%q' and sub_to_host='%q'",