sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

res_pjsip: Fix prune_on_boot to remove only contacts for the host. 

* Check that the contact's reg_server matches the host's name before
deleting any prune_on_boot contacts.  We don't want to delete reliable
transport contacts made with other servers if the ps_contacts database
table is shared with other servers.

Thanks to Ross Beer for pointing out that the original prune logic would
delete reliable transport contacts from other servers.

ASTERISK-27147

Change-Id: I8e439d0d1c266ffdfd7b73d1e5e466180a689bd0
This commit is contained in:
Richard Mudgett 2017-08-15 11:14:20 -05:00
parent 15fbcc74d8
commit 9e2b2a9837
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
res/res_pjsip/location.c
View File

@ -460,7 +460,10 @@ static int prune_boot_contacts_cb(void *obj, void *arg, int flags)
{
struct ast_sip_contact *contact = obj;
if (contact->prune_on_boot) {
if (contact->prune_on_boot
&& !strcmp(contact->reg_server, ast_config_AST_SYSTEM_NAME ?: "")) {
ast_verb(3, "Removed contact '%s' from AOR '%s' due to system boot\n",
contact->uri, contact->aor);
ast_sip_location_delete_contact(contact);
}