Merge pull request #8682 from idryzhov/fix-default-originate

ospfd, ospf6d: fix "default-information originate" in non-existing vrf
This commit is contained in:
Donald Sharp 2021-05-19 07:03:47 -04:00 committed by GitHub
commit 942f6d35d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 0 deletions

View File

@ -156,6 +156,16 @@ static void ospf6_set_redist_vrf_bitmaps(struct ospf6 *ospf6, bool set)
vrf_bitmap_unset(zclient->redist[AFI_IP6][type],
ospf6->vrf_id);
}
red_list = ospf6->redist[DEFAULT_ROUTE];
if (red_list) {
if (set)
vrf_bitmap_set(zclient->default_information[AFI_IP6],
ospf6->vrf_id);
else
vrf_bitmap_unset(zclient->default_information[AFI_IP6],
ospf6->vrf_id);
}
}
/* Disable OSPF6 VRF instance */

View File

@ -2182,6 +2182,16 @@ static void ospf_set_redist_vrf_bitmaps(struct ospf *ospf, bool set)
vrf_bitmap_unset(zclient->redist[AFI_IP][type],
ospf->vrf_id);
}
red_list = ospf->redist[DEFAULT_ROUTE];
if (red_list) {
if (set)
vrf_bitmap_set(zclient->default_information[AFI_IP],
ospf->vrf_id);
else
vrf_bitmap_unset(zclient->default_information[AFI_IP],
ospf->vrf_id);
}
}
/* Enable OSPF VRF instance */