Ede_Vau
/
frr
mirror of https://github.com/FRRouting/frr.git
1
1
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #9164 from pguibert6WIND/flowspec_vrflite_shortcut 

bgpd: flowspec redirect vrf uses vrf table instead of allocated table id
This commit is contained in:
Russ White 2021-08-03 09:31:17 -04:00 committed by GitHub
parent cdc549b51a 7afeaffa12
commit 67831eeebb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bgpd/bgp_pbr.c
View File

@ -2292,6 +2292,7 @@ static void bgp_pbr_policyroute_add_to_zebra_unit(struct bgp *bgp,
struct bgp_pbr_rule *bpr;
bool bpr_found = false;
bool bpme_found = false;
struct vrf *vrf = NULL;
if (!bpf)
return;
@ -2313,6 +2314,8 @@ static void bgp_pbr_policyroute_add_to_zebra_unit(struct bgp *bgp,
bpa = hash_get(bgp->pbr_action_hash, &temp3,
bgp_pbr_action_alloc_intern);
if (nh)
vrf = vrf_lookup_by_id(nh->vrf_id);
if (bpa->fwmark == 0) {
/* drop is handled by iptable */
if (nh && nh->type == NEXTHOP_TYPE_BLACKHOLE) {
@ -2320,7 +2323,14 @@ static void bgp_pbr_policyroute_add_to_zebra_unit(struct bgp *bgp,
bpa->installed = true;
} else {
bpa->fwmark = bgp_zebra_tm_get_id();
bpa->table_id = bpa->fwmark;
/* if action is redirect-vrf, then
* use directly table_id of vrf
*/
if (nh && vrf && !vrf_is_backend_netns()
&& bpf->vrf_id != vrf->vrf_id)
bpa->table_id = vrf->data.l.table_id;
else
bpa->table_id = bpa->fwmark;
bpa->installed = false;
}
bpa->bgp = bgp;

7
bgpd/bgp_zebra.c
View File

@ -3316,6 +3316,13 @@ void bgp_zebra_announce_default(struct bgp *bgp, struct nexthop *nh,
&& nh->type != NEXTHOP_TYPE_IPV6)
|| nh->vrf_id == VRF_UNKNOWN)
return;
/* in vrf-lite, no default route has to be announced
* the table id of vrf is directly used to divert traffic
*/
if (!vrf_is_backend_netns() && bgp->vrf_id != nh->vrf_id)
return;
memset(&p, 0, sizeof(struct prefix));
if (afi != AFI_IP && afi != AFI_IP6)
return;