bgpd: fix prefix VRF leaking with 'network import-check' (4/5)

[mirror_frr.git] / bgpd / bgp_attr.c

diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index 06fff413782dc860143b9f10f097ffdd166f6c45..47775e141201792b324c01bbfb0fc803ff3dc4e8 100644 (file)
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -866,6 +866,7 @@ bool attrhash_cmp(const void *p1, const void *p2)
                    && attr1->df_pref == attr2->df_pref
                    && attr1->df_alg == attr2->df_alg
                    && attr1->nh_ifindex == attr2->nh_ifindex
+                   && attr1->nh_flag == attr2->nh_flag
                    && attr1->nh_lla_ifindex == attr2->nh_lla_ifindex
                    && attr1->distance == attr2->distance
                    && srv6_l3vpn_same(attr1->srv6_l3vpn, attr2->srv6_l3vpn)
@@ -3986,6 +3987,8 @@ size_t bgp_packet_mpattr_prefix_size(afi_t afi, safi_t safi,
        else if (afi == AFI_L2VPN && safi == SAFI_EVPN)
                size += 232; // TODO: Maximum possible for type-2, type-3 and
                             // type-5
+       else if (safi == SAFI_FLOWSPEC)
+               size = ((struct prefix_fs *)p)->prefix.prefixlen;
        return size;
 }