proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-10 04:39:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2540 from LabNConsulting/working/master/bgp-twice-leaked-nht

Browse Source 
bgpd: don't nexthop-track twice-leaked routes that came from zebra
This commit is contained in:
Russ White 2018-06-26 11:17:32 -04:00 committed by GitHub
commit 4bca4c6f0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
bgpd/bgp_mplsvpn.c
View File

@ -466,6 +466,7 @@ leak_update(
{ {
struct prefix *p = &bn->p; struct prefix *p = &bn->p;
struct bgp_info *bi; struct bgp_info *bi;
struct bgp_info *bi_ultimate;
struct bgp_info *new; struct bgp_info *new;
char buf_prefix[PREFIX_STRLEN]; char buf_prefix[PREFIX_STRLEN];
@ -476,6 +477,26 @@ leak_update(
source_bi->type, source_bi->sub_type); source_bi->type, source_bi->sub_type);
} }
/*
* Routes that are redistributed into BGP from zebra do not get
* nexthop tracking. However, if those routes are subsequently
* imported to other RIBs within BGP, the leaked routes do not
* carry the original BGP_ROUTE_REDISTRIBUTE sub_type. Therefore,
* in order to determine if the route we are currently leaking
* should have nexthop tracking, we must find the ultimate
* parent so we can check its sub_type.
*
* As of now, source_bi may at most be a second-generation route
* (only one hop back to ultimate parent for vrf-vpn-vrf scheme).
* Using a loop here supports more complex intra-bgp import-export
* schemes that could be implemented in the future.
*
*/
for (bi_ultimate = source_bi;
bi_ultimate->extra && bi_ultimate->extra->parent;
bi_ultimate = bi_ultimate->extra->parent)
;
/* /*
* match parent * match parent
*/ */
@ -528,7 +549,7 @@ leak_update(
bgp_nexthop = bi->extra->bgp_orig; bgp_nexthop = bi->extra->bgp_orig;
/* No nexthop tracking for redistributed routes */ /* No nexthop tracking for redistributed routes */
if (source_bi->sub_type == BGP_ROUTE_REDISTRIBUTE) if (bi_ultimate->sub_type == BGP_ROUTE_REDISTRIBUTE)
nh_valid = 1; nh_valid = 1;
else else
/* /*
@ -591,7 +612,7 @@ leak_update(
* their originating protocols will do the tracking and * their originating protocols will do the tracking and
* withdraw those routes if the nexthops become unreachable * withdraw those routes if the nexthops become unreachable
*/ */
if (source_bi->sub_type == BGP_ROUTE_REDISTRIBUTE) if (bi_ultimate->sub_type == BGP_ROUTE_REDISTRIBUTE)
nh_valid = 1; nh_valid = 1;
else else
/* /*