diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2024-09-18 07:23:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-18 07:23:56 -0400 |
| commit | 174d46d7fc3b5ac3eefe032d039e0b9e591d92c3 (patch) | |
| tree | 5405b110a3c8fa1b76062b9f60703c7aea67ec66 /bgpd | |
| parent | 7a7ae8879f5d089e7efac205d58891eae7515535 (diff) | |
| parent | 80c8b988b087fe86f813c7f2aabee9b90c6b6037 (diff) | |
Merge pull request #16852 from sri-mohan1/srib-24-frr-a
bgpd: changes for code maintainability
Diffstat (limited to 'bgpd')
| -rw-r--r-- | bgpd/bgp_attr.h | 2 | ||||
| -rw-r--r-- | bgpd/bgp_attr_evpn.c | 8 | ||||
| -rw-r--r-- | bgpd/bgp_bmp.c | 4 | ||||
| -rw-r--r-- | bgpd/bgp_btoa.c | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/bgpd/bgp_attr.h b/bgpd/bgp_attr.h index 213de45c55..a8ca8c1fa6 100644 --- a/bgpd/bgp_attr.h +++ b/bgpd/bgp_attr.h @@ -353,7 +353,7 @@ struct transit { __builtin_choose_expr((X) >= 1 && (X) <= 64, 1ULL << ((X)-1), (void)0) #define BGP_CLUSTER_LIST_LENGTH(attr) \ - (((attr)->flag & ATTR_FLAG_BIT(BGP_ATTR_CLUSTER_LIST)) \ + (CHECK_FLAG((attr)->flag, ATTR_FLAG_BIT(BGP_ATTR_CLUSTER_LIST)) \ ? bgp_attr_get_cluster((attr))->length \ : 0) diff --git a/bgpd/bgp_attr_evpn.c b/bgpd/bgp_attr_evpn.c index fc7548d9bf..a3ffe61eb8 100644 --- a/bgpd/bgp_attr_evpn.c +++ b/bgpd/bgp_attr_evpn.c @@ -218,7 +218,8 @@ uint32_t bgp_attr_mac_mobility_seqnum(struct attr *attr) continue; flags = *pnt++; - if (flags & ECOMMUNITY_EVPN_SUBTYPE_MACMOBILITY_FLAG_STICKY) + if (CHECK_FLAG(flags, + ECOMMUNITY_EVPN_SUBTYPE_MACMOBILITY_FLAG_STICKY)) SET_FLAG(attr->evpn_flags, ATTR_EVPN_FLAG_STICKY); else UNSET_FLAG(attr->evpn_flags, ATTR_EVPN_FLAG_STICKY); @@ -258,11 +259,12 @@ void bgp_attr_evpn_na_flag(struct attr *attr, bool *proxy) sub_type == ECOMMUNITY_EVPN_SUBTYPE_ND) { val = *pnt++; - if (val & ECOMMUNITY_EVPN_SUBTYPE_ND_ROUTER_FLAG) + if (CHECK_FLAG(val, + ECOMMUNITY_EVPN_SUBTYPE_ND_ROUTER_FLAG)) SET_FLAG(attr->evpn_flags, ATTR_EVPN_FLAG_ROUTER); - if (val & ECOMMUNITY_EVPN_SUBTYPE_PROXY_FLAG) + if (CHECK_FLAG(val, ECOMMUNITY_EVPN_SUBTYPE_PROXY_FLAG)) *proxy = true; break; diff --git a/bgpd/bgp_bmp.c b/bgpd/bgp_bmp.c index 44a4c0f00b..556738a606 100644 --- a/bgpd/bgp_bmp.c +++ b/bgpd/bgp_bmp.c @@ -2543,9 +2543,9 @@ DEFPY(bmp_monitor_cfg, bmp_monitor_cmd, prev = bt->afimon[afi][safi]; if (no) - bt->afimon[afi][safi] &= ~flag; + UNSET_FLAG(bt->afimon[afi][safi], flag); else - bt->afimon[afi][safi] |= flag; + SET_FLAG(bt->afimon[afi][safi], flag); if (prev == bt->afimon[afi][safi]) return CMD_SUCCESS; diff --git a/bgpd/bgp_btoa.c b/bgpd/bgp_btoa.c index 1d5034efd2..32823cc376 100644 --- a/bgpd/bgp_btoa.c +++ b/bgpd/bgp_btoa.c @@ -69,7 +69,7 @@ static void attr_parse(struct stream *s, uint16_t len) flag = stream_getc(s); type = stream_getc(s); - if (flag & BGP_ATTR_FLAG_EXTLEN) + if (CHECK_FLAG(flag, BGP_ATTR_FLAG_EXTLEN)) length = stream_getw(s); else length = stream_getc(s); |