[Asterisk-code-review] res pjsip: Fix prune on boot to remove only contacts for the... (asterisk[master])

[Joshua Colp]

Joshua Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/6228 )

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

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
---
M res/res_pjsip/location.c
1 file changed, 4 insertions(+), 1 deletion(-)

Approvals:
  Joshua Colp: Looks good to me, but someone else must approve; Approved for Submit
  George Joseph: Looks good to me, approved



diff --git a/res/res_pjsip/location.c b/res/res_pjsip/location.c
index 557aeb6..2273273 100644
--- a/res/res_pjsip/location.c
+++ b/res/res_pjsip/location.c
@@ -460,7 +460,10 @@
 {
 	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);
 	}
 

-- 
To view, visit https://gerrit.asterisk.org/6228
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I8e439d0d1c266ffdfd7b73d1e5e466180a689bd0
Gerrit-Change-Number: 6228
Gerrit-PatchSet: 1
Gerrit-Owner: Richard Mudgett <rmudgett at digium.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20170816/6d998139/attachment.html>