From: Stephen Worley <sworley@cumulusnetworks.com>
Date: Thu, 17 Sep 2020 19:34:36 +0000 (-0400)
Subject: pbrd: cleanup pbr ifp info if not sent to zebra
X-Git-Tag: frr-7.5~11^2~12
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=f513b3724a97a2829d10d3402d7e82fa1681a22c;p=matthieu%2Ffrr.git

pbrd: cleanup pbr ifp info if not sent to zebra

Properly cleanup the pbr interface data if nothing actually
gets sent to zebra, since we will never get the callback
notification from zapi to issue final deletion.

Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com>
---

diff --git a/pbrd/pbr_map.c b/pbrd/pbr_map.c
index fe2778c877..b282db999d 100644
--- a/pbrd/pbr_map.c
+++ b/pbrd/pbr_map.c
@@ -721,12 +721,23 @@ void pbr_map_policy_delete(struct pbr_map *pbrm, struct pbr_map_interface *pmi)
 {
 	struct listnode *node;
 	struct pbr_map_sequence *pbrms;
+	bool sent = false;
 
 
 	for (ALL_LIST_ELEMENTS_RO(pbrm->seqnumbers, node, pbrms))
-		pbr_send_pbr_map(pbrms, pmi, false, false);
+		if (!pbr_send_pbr_map(pbrms, pmi, false, true))
+			sent = true; /* rule removal sent to zebra */
 
 	pmi->delete = true;
+
+	/*
+	 * If we actually sent something for deletion, wait on zapi callback
+	 * before clearing data.
+	 */
+	if (sent)
+		return;
+
+	pbr_map_final_interface_deletion(pbrm, pmi);
 }
 
 /*