kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-13 12:40:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of git.freeswitch.org:freeswitch

Browse Source
This commit is contained in:
Andrew Thompson 2010-08-03 18:06:02 -04:00
commit 810ce12791
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c
View File

@ -704,7 +704,7 @@ int nua_notify_client_request(nua_client_request_t *cr,
if (sr->sr_usage == du) { if (sr->sr_usage == du) {
/* If subscribe has not been responded, don't terminate usage by NOTIFY */ /* If subscribe has not been responded, don't terminate usage by NOTIFY */
sr->sr_terminating = 1; sr->sr_terminating = 1;
nua_client_set_terminating(cr, 0); // nua_client_set_terminating(cr, 0);
break; break;
} }
} }

4
src/mod/endpoints/mod_sofia/sofia_presence.c
View File

@ -1026,7 +1026,7 @@ static char *translate_rpid(char *in)
} }
if (!strcasecmp(in, "unknown")) { if (!strcasecmp(in, "unknown")) {
r = "online"; r = NULL;
goto end; goto end;
} }
@ -1238,8 +1238,6 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
rpid = "unknown"; rpid = "unknown";
} }
prpid = translate_rpid(rpid);
if (!strcasecmp(proto, SOFIA_CHAT_PROTO)) { if (!strcasecmp(proto, SOFIA_CHAT_PROTO)) {
clean_id = switch_mprintf("sip:%s@%s", sub_to_user, sub_to_host); clean_id = switch_mprintf("sip:%s@%s", sub_to_user, sub_to_host);
} else { } else {