[Freeswitch-trunk] [commit] r3725 - in freeswitch/trunk/src/mod/endpoints: mod_dingaling mod_sofia

[Freeswitch SVN]

Author: anthm
Date: Tue Dec 19 13:45:14 2006
New Revision: 3725

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c
   freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c

Log:
xmas presence

Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c	Tue Dec 19 13:45:14 2006
@@ -307,7 +307,7 @@
 
 	switch(event->event_id) {
 	case SWITCH_EVENT_PRESENCE_PROBE: 
-        if (proto && !strcasecmp(proto, MDL_CHAT_PROTO)) {
+        if (proto) {
         	char *sql;
             switch_core_db_t *db;
             char *errmsg;

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	Tue Dec 19 13:45:14 2006
@@ -5327,26 +5327,33 @@
 
 	switch(event->event_id) {
     case SWITCH_EVENT_PRESENCE_PROBE: 
-        if (proto && !strcasecmp(proto, SOFIA_CHAT_PROTO)) {
+        if (proto) {
             switch_core_db_t *db;
             char *to = switch_event_get_header(event, "to");
-            char *user, *host;
+            char *user, *euser, *host, *p;
 
             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 ((host = strchr(user, '@'))) {
                 *host++ = '\0';
             }
-            if (user && host && 
-                (sql = switch_mprintf("select user,host,status,rpid,'' from sip_registrations where user='%q' and host='%q'", user, host))) {
+            euser = user;
+            if ((p = strchr(euser, '+'))) {
+                euser = (p+1);
+            }
+
+            if (euser && host && 
+                (sql = switch_mprintf("select user,host,status,rpid,'' from sip_registrations where user='%q' and host='%q'", euser, host)) &&
+                (profile = (sofia_profile_t *) switch_core_hash_find(globals.profile_hash, host))) {
+                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);
+                    switch_safe_free(sql);
+                    return;
+                }
+
                 switch_mutex_lock(profile->ireg_mutex);
                 switch_core_db_exec(db, sql, resub_callback, profile, &errmsg);
                 switch_mutex_unlock(profile->ireg_mutex);