From eee6117a6226a353f0d531661dec6d3f6641e6c4 Mon Sep 17 00:00:00 2001 From: Don Slice Date: Fri, 26 May 2017 15:13:08 +0000 Subject: [PATCH] bgpd: fix issue with ipv6 ecmp with vrfs Problem reported by customer that ipv6 wasn't installing ecmp paths when using vrfs. Found a vrf-unware call in bgp_zebra_announce that was the culprit. Testing of the fix looks good. Ticket: CM-15545 Signed-off-by: Don Slice --- bgpd/bgp_zebra.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c index d07fc65bd..1998dabc2 100644 --- a/bgpd/bgp_zebra.c +++ b/bgpd/bgp_zebra.c @@ -1509,7 +1509,8 @@ bgp_zebra_announce (struct prefix *p, struct bgp_info *info, struct bgp *bgp, if (!ifindex) { if (mpinfo->peer->conf_if || mpinfo->peer->ifname) - ifindex = ifname2ifindex (mpinfo->peer->conf_if ? mpinfo->peer->conf_if : mpinfo->peer->ifname); + ifindex = ifname2ifindex_vrf (mpinfo->peer->conf_if ? mpinfo->peer->conf_if : + mpinfo->peer->ifname, bgp->vrf_id); else if (mpinfo->peer->nexthop.ifp) ifindex = mpinfo->peer->nexthop.ifp->ifindex; } -- 2.39.2