diff options
| author | Maria Matejka <mq@ucw.cz> | 2023-03-29 18:55:46 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2023-04-04 17:00:58 +0200 |
| commit | 2898f8f1771dedf4e385a5c0333da03e55d5decb (patch) | |
| tree | 1dea2011099d6df0fc1459ad8665c358fca73321 /proto | |
| parent | adbce76517f53e06243ed954b20172cc1313d5c3 (diff) | |
BGP: LLGR Staleness optimization dropped.
This brought unnecessary complexity into the decision procedures while the
performance aspects weren't worth it. It just saved one ea_list traversal
when many others are also done.
Diffstat (limited to 'proto')
| -rw-r--r-- | proto/bgp/attrs.c | 20 | ||||
| -rw-r--r-- | proto/bgp/bgp.h | 2 |
2 files changed, 1 insertions, 21 deletions
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c index a0d2f4d6..8dc5ac3e 100644 --- a/proto/bgp/attrs.c +++ b/proto/bgp/attrs.c @@ -2280,24 +2280,8 @@ bgp_get_neighbor(rte *r) static inline int rte_stale(rte *r) { - if (r->pflags & BGP_REF_STALE) - return 1; - - if (r->pflags & BGP_REF_NOT_STALE) - return 0; - - /* If staleness is unknown, compute and cache it */ eattr *a = ea_find(r->attrs, BGP_EA_ID(BA_COMMUNITY)); - if (a && int_set_contains(a->u.ptr, BGP_COMM_LLGR_STALE)) - { - r->pflags |= BGP_REF_STALE; - return 1; - } - else - { - r->pflags |= BGP_REF_NOT_STALE; - return 0; - } + return a && int_set_contains(a->u.ptr, BGP_COMM_LLGR_STALE); } int @@ -2702,8 +2686,6 @@ bgp_rte_modify_stale(struct rt_export_request *req, const net_addr *n, struct rt /* Mark the route as LLGR */ rte e0 = *r; bgp_set_attr_ptr(&e0.attrs, BA_COMMUNITY, flags, int_set_add(tmp_linpool, ad, BGP_COMM_LLGR_STALE)); - e0.pflags &= ~BGP_REF_NOT_STALE; - e0.pflags |= BGP_REF_STALE; /* We need to update the route but keep it stale. */ ASSERT_DIE(irh->stale_set == irh->stale_valid + 1); diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h index acd46f00..b1167820 100644 --- a/proto/bgp/bgp.h +++ b/proto/bgp/bgp.h @@ -220,8 +220,6 @@ struct bgp_channel_config { /* rte->pflags */ #define BGP_REF_SUPPRESSED 0x1 /* Used for deterministic MED comparison */ -#define BGP_REF_STALE 0x2 /* Route is LLGR_STATE */ -#define BGP_REF_NOT_STALE 0x4 /* Route is NOT LLGR_STATE */ struct bgp_af_caps { u32 afi; |