From 019a82cbbc6efac781e92ae82f8c84e5e92d39d3 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Mon, 27 Nov 2017 09:25:32 -0500 Subject: zebra: Allow zebra_find_client to match on instance as well zebra_find_client needs to match on instance as well so protocols like ospfd will work correctly for notification. Modify the zebra_find_client code to accept the instance number and to pass it in appropriately. Signed-off-by: Doanld Sharp --- zebra/zebra_rib.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'zebra/zebra_rib.c') diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index b7b68b7272..791f319120 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -1033,8 +1033,9 @@ int rib_install_kernel(struct route_node *rn, struct route_entry *re, * know that they've lost */ if (old && old != re) - zsend_route_notify_owner(old->type, old->vrf_id, - p, ZAPI_ROUTE_BETTER_ADMIN_WON); + zsend_route_notify_owner(old->type, old->instance, + old->vrf_id, p, + ZAPI_ROUTE_BETTER_ADMIN_WON); /* * Make sure we update the FPM any time we send new information to @@ -1055,10 +1056,10 @@ int rib_install_kernel(struct route_node *rn, struct route_entry *re, else UNSET_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB); } - zsend_route_notify_owner(re->type, re->vrf_id, + zsend_route_notify_owner(re->type, re->instance, re->vrf_id, p, ZAPI_ROUTE_INSTALLED); } else - zsend_route_notify_owner(re->type, re->vrf_id, + zsend_route_notify_owner(re->type, re->instance, re->vrf_id, p, ZAPI_ROUTE_FAIL_INSTALL); return ret; -- cgit v1.2.3