From 5db53311ecd358b094c80641e281c0bd78f0f07b Mon Sep 17 00:00:00 2001 From: Renato Westphal Date: Thu, 10 Sep 2020 21:27:48 -0300 Subject: [PATCH] staticd: fix display of the "nexthop-vrf" parameter of static routes When the static route VRF and its nexthop VRF are inactive in the kernel, both VRFs will have the same ID (VRF_UNKNOWN) even though they might not be the same. This can cause "sh run" to not display the "nexthop-vrf" parameter correctly when necessary. Change the code to compare VRFs by their names to fix this problem. Signed-off-by: Renato Westphal --- staticd/static_vty.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/staticd/static_vty.c b/staticd/static_vty.c index 9ebc134820..4821671554 100644 --- a/staticd/static_vty.c +++ b/staticd/static_vty.c @@ -423,7 +423,8 @@ int static_config(struct vty *vty, struct static_vrf *svrf, afi_t afi, nh->snh_label.label, buf, sizeof(buf), 0)); - if (nh->nh_vrf_id != GET_STABLE_VRF_ID(info)) + if (!strmatch(nh->nh_vrfname, + info->svrf->vrf->name)) vty_out(vty, " nexthop-vrf %s", nh->nh_vrfname); -- 2.39.5