From 375f1b38fdc0d6cfa99899cd76854555ed3ddc36 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 19 Dec 2006 17:51:36 +0000 Subject: [PATCH] xmas presence git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3721 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- .../endpoints/mod_dingaling/mod_dingaling.c | 5 +- src/mod/endpoints/mod_sofia/mod_sofia.c | 49 ++++++++++--------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/mod/endpoints/mod_dingaling/mod_dingaling.c b/src/mod/endpoints/mod_dingaling/mod_dingaling.c index 7c639df4e9..cb1aeca664 100644 --- 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 012cab4194..205c553c67 100644 --- 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); + 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,'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'",