From: Philippe Guibert Date: Mon, 8 Oct 2018 12:15:12 +0000 (+0200) Subject: bgpd: in case nexthop is ipv6, set nh attribute flag in mpls vpn case X-Git-Tag: frr-7.1-dev~285^2 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F3145%2Fhead;p=mirror%2Ffrr.git bgpd: in case nexthop is ipv6, set nh attribute flag in mpls vpn case In mpls vpn import/export, the nexthop attribute should also be recognised for ipv6 too. Signed-off-by: Philippe Guibert --- diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c index 276945cbf6..63a24fc4c7 100644 --- a/bgpd/bgp_mplsvpn.c +++ b/bgpd/bgp_mplsvpn.c @@ -1088,6 +1088,8 @@ static void vpn_leak_to_vrf_update_onevrf(struct bgp *bgp_vrf, /* to */ */ uint8_t nhfamily = NEXTHOP_FAMILY(info_vpn->attr->mp_nexthop_len); + if (nhfamily != AF_UNSPEC) + static_attr.flag |= ATTR_FLAG_BIT(BGP_ATTR_NEXT_HOP); memset(&nexthop_orig, 0, sizeof(nexthop_orig)); nexthop_orig.family = nhfamily; @@ -1107,7 +1109,6 @@ static void vpn_leak_to_vrf_update_onevrf(struct bgp *bgp_vrf, /* to */ static_attr.mp_nexthop_len = info_vpn->attr->mp_nexthop_len; } - static_attr.flag |= ATTR_FLAG_BIT(BGP_ATTR_NEXT_HOP); break; case AF_INET6: /* save */