From c15ee980a7f6199094d863d81e13d321ee0c2d58 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 3 Aug 2010 13:43:29 -0500 Subject: [PATCH 1/2] SFSIP-219 --- libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c b/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c index c22804b33c..6064333ba3 100644 --- a/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c +++ b/libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c @@ -704,7 +704,7 @@ int nua_notify_client_request(nua_client_request_t *cr, if (sr->sr_usage == du) { /* If subscribe has not been responded, don't terminate usage by NOTIFY */ sr->sr_terminating = 1; - nua_client_set_terminating(cr, 0); + // nua_client_set_terminating(cr, 0); break; } } From 7d058402dfbb0d15701bab54f92e463de9b3c02d Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 3 Aug 2010 13:55:08 -0500 Subject: [PATCH 2/2] remove 'online' element from rpid --- src/mod/endpoints/mod_sofia/sofia_presence.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c index 0e23d55622..95f22205d1 100644 --- a/src/mod/endpoints/mod_sofia/sofia_presence.c +++ b/src/mod/endpoints/mod_sofia/sofia_presence.c @@ -1026,7 +1026,7 @@ static char *translate_rpid(char *in) } if (!strcasecmp(in, "unknown")) { - r = "online"; + r = NULL; goto end; } @@ -1238,8 +1238,6 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char * rpid = "unknown"; } - prpid = translate_rpid(rpid); - if (!strcasecmp(proto, SOFIA_CHAT_PROTO)) { clean_id = switch_mprintf("sip:%s@%s", sub_to_user, sub_to_host); } else {