diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2023-07-04 22:11:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-04 22:11:11 +0300 |
| commit | 9a0bb7bcd1ac5b025b93667309a1b979be5c493f (patch) | |
| tree | 3294c7026c8cf77b9e3f3f09695bfc7434a35671 /ospfd/ospf_zebra.c | |
| parent | c75c96a02ffbf2dc267e2135c5b2f5967dcba986 (diff) | |
| parent | 161972c9fe108ffe3de851a537d9b34efeb09e31 (diff) | |
Merge pull request #13333 from donaldsharp/vrf_bitmap_cleanup
*: Rearrange vrf_bitmap_X api to reduce memory footprint
Diffstat (limited to 'ospfd/ospf_zebra.c')
| -rw-r--r-- | ospfd/ospf_zebra.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c index 96d474fe86..abc580b13e 100644 --- a/ospfd/ospf_zebra.c +++ b/ospfd/ospf_zebra.c @@ -814,16 +814,16 @@ int ospf_is_type_redistributed(struct ospf *ospf, int type, unsigned short instance) { return (DEFAULT_ROUTE_TYPE(type) - ? vrf_bitmap_check(zclient->default_information[AFI_IP], - ospf->vrf_id) - : ((instance - && redist_check_instance( + ? vrf_bitmap_check( + &zclient->default_information[AFI_IP], + ospf->vrf_id) + : ((instance && + redist_check_instance( &zclient->mi_redist[AFI_IP][type], - instance)) - || (!instance - && vrf_bitmap_check( - zclient->redist[AFI_IP][type], - ospf->vrf_id)))); + instance)) || + (!instance && + vrf_bitmap_check(&zclient->redist[AFI_IP][type], + ospf->vrf_id)))); } int ospf_redistribute_update(struct ospf *ospf, struct ospf_redist *red, |