From fba31af2b56c01438452c45cd75337071229e84f Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Sun, 19 Nov 2017 19:38:55 -0500 Subject: [PATCH 1/2] zebra: Fix 'show ip rpf' to actually work Rework of do_show_ip_route caused the 'show ip rpf' cli to stop working. This put's it back into working order. Signed-off-by: Donald Sharp --- zebra/zebra_vty.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index 73f0717124..edc9db043d 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -311,7 +311,7 @@ DEFUN (show_ip_rpf, { int uj = use_json(argc, argv); return do_show_ip_route(vty, VRF_DEFAULT_NAME, AFI_IP, SAFI_MULTICAST, - false, uj, 0, NULL, false, -1, 0); + false, uj, 0, NULL, false, 0, 0); } DEFUN (show_ip_rpf_addr, From d6792f9d7d7b51426a385f962688e96f641db351 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Sun, 19 Nov 2017 19:44:01 -0500 Subject: [PATCH 2/2] zebra: When uninstalling a non-unicast route mark it so The rib_uninstall_kernel for non-UNICAST routes when it is marking a route as no-longer installed should actually mark it as uninstalled. Signed-off-by: Donald Sharp --- zebra/zebra_rib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index b5c2bc6dae..5e0baf807d 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -1060,7 +1060,7 @@ int rib_uninstall_kernel(struct route_node *rn, struct route_entry *re) if (info->safi != SAFI_UNICAST) { for (ALL_NEXTHOPS(re->nexthop, nexthop)) - SET_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB); + UNSET_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB); return ret; }