From: vivek Date: Wed, 18 Mar 2020 02:25:13 +0000 (-0700) Subject: zebra: Install nexthop's weight for IPv4 routes with IPv6 next hops X-Git-Tag: base_7.4~212^2 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F6021%2Fhead;p=mirror%2Ffrr.git zebra: Install nexthop's weight for IPv4 routes with IPv6 next hops Ensure that any weight associated with the next hop is installed for IPv4 routes with IPv6 next hops too. Updates: lib, zebra: Allow for installation of a weighted nexthop Signed-off-by: Vivek Venkatraman --- diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c index e40bf45f59..2cc520bbce 100644 --- a/zebra/rt_netlink.c +++ b/zebra/rt_netlink.c @@ -1340,6 +1340,8 @@ static void _netlink_route_build_multipath(const char *routedesc, int bytelen, bytelen); rtnh->rtnh_len += sizeof(struct rtattr) + bytelen; rtnh->rtnh_ifindex = nexthop->ifindex; + if (nexthop->weight) + rtnh->rtnh_hops = nexthop->weight - 1; if (nexthop->rmap_src.ipv4.s_addr != INADDR_ANY) *src = &nexthop->rmap_src;