From: Philippe Guibert <philippe.guibert@6wind.com>
Date: Mon, 23 Apr 2018 13:31:04 +0000 (+0200)
Subject: zebra: handle notification in case pbr ipset, or iptables is removed
X-Git-Tag: frr-5.0~3^2~27
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=0a9073647662f299cbc09668026f17cda1e98ca6;p=mirror%2Ffrr.git

zebra: handle notification in case pbr ipset, or iptables is removed

In cast the removal of an iptable or an ipset pbr context is done,
then a notification is sent back to the relevant daemon that sent the
message.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
---

diff --git a/zebra/zebra_pbr.c b/zebra/zebra_pbr.c
index 69b14d9d2e..166b04dc96 100644
--- a/zebra/zebra_pbr.c
+++ b/zebra/zebra_pbr.c
@@ -564,8 +564,10 @@ void kernel_pbr_ipset_add_del_status(struct zebra_pbr_ipset *ipset,
 		zsend_ipset_notify_owner(ipset, ZAPI_IPSET_FAIL_INSTALL);
 		break;
 	case SOUTHBOUND_DELETE_SUCCESS:
+		zsend_ipset_notify_owner(ipset, ZAPI_IPSET_REMOVED);
+		break;
 	case SOUTHBOUND_DELETE_FAILURE:
-		/* TODO : handling of delete event */
+		zsend_ipset_notify_owner(ipset, ZAPI_IPSET_REMOVED);
 		break;
 	}
 }
@@ -587,8 +589,12 @@ void kernel_pbr_ipset_entry_add_del_status(
 					       ZAPI_IPSET_ENTRY_FAIL_INSTALL);
 		break;
 	case SOUTHBOUND_DELETE_SUCCESS:
+		zsend_ipset_entry_notify_owner(ipset,
+					       ZAPI_IPSET_ENTRY_REMOVED);
+		break;
 	case SOUTHBOUND_DELETE_FAILURE:
-		/* TODO : handling of delete event */
+		zsend_ipset_entry_notify_owner(ipset,
+					       ZAPI_IPSET_ENTRY_REMOVED);
 		break;
 	}
 }
@@ -607,8 +613,12 @@ void kernel_pbr_iptable_add_del_status(struct zebra_pbr_iptable *iptable,
 		zsend_iptable_notify_owner(iptable, ZAPI_IPTABLE_FAIL_INSTALL);
 		break;
 	case SOUTHBOUND_DELETE_SUCCESS:
+		zsend_iptable_notify_owner(iptable,
+					   ZAPI_IPTABLE_REMOVED);
+		break;
 	case SOUTHBOUND_DELETE_FAILURE:
-		/* TODO : handling of delete event */
+		zsend_iptable_notify_owner(iptable,
+					   ZAPI_IPTABLE_REMOVED);
 		break;
 	}
 }