matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge pull request #11440 from opensourcerouting/fix/increase_flags_bgp_peer_to_uint64

Browse source 
bgpd: Increase peer->flags to uint64_t
This commit is contained in:
Russ White 2022-06-21 10:31:50 -04:00 committed by GitHub
parent 33d960c7ab 0ebabd4107
commit 088ec2b0a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bgpd/bgp_updgrp.c
View file

@ -414,8 +414,10 @@ static unsigned int updgrp_hash_key_make(const void *p)
if (bgp_debug_neighbor_events(peer)) {
zlog_debug(
"%pBP Update Group Hash: sort: %d UpdGrpFlags: %u UpdGrpAFFlags: %u",
peer, peer->sort, peer->flags & PEER_UPDGRP_FLAGS,
"%pBP Update Group Hash: sort: %d UpdGrpFlags: %" PRIu64
" UpdGrpAFFlags: %u",
peer, peer->sort,
(uint64_t)(peer->flags & PEER_UPDGRP_FLAGS),
flags & PEER_UPDGRP_AF_FLAGS);
zlog_debug(
"%pBP Update Group Hash: addpath: %u UpdGrpCapFlag: %u UpdGrpCapAFFlag: %u route_adv: %u change local as: %u",
@ -455,8 +457,10 @@ static unsigned int updgrp_hash_key_make(const void *p)
peer->shared_network &&
peer_afi_active_nego(peer, AFI_IP6));
zlog_debug(
"%pBP Update Group Hash: Lonesoul: %u ORF prefix: %u ORF old: %u max prefix out: %u",
peer, CHECK_FLAG(peer->flags, PEER_FLAG_LONESOUL),
"%pBP Update Group Hash: Lonesoul: %" PRIu64
" ORF prefix: %u ORF old: %u max prefix out: %u",
peer,
(uint64_t)CHECK_FLAG(peer->flags, PEER_FLAG_LONESOUL),
CHECK_FLAG(peer->af_cap[afi][safi],
PEER_CAP_ORF_PREFIX_SM_RCV),
CHECK_FLAG(peer->af_cap[afi][safi],

2
bgpd/bgpd.h
View file

@ -1281,7 +1281,7 @@ struct peer {
* peer-group, the peer-specific overrides (see flags_override and
* flags_invert) must be respected.
*/
uint32_t flags;
uint64_t flags;
#define PEER_FLAG_PASSIVE (1U << 0) /* passive mode */
#define PEER_FLAG_SHUTDOWN (1U << 1) /* shutdown */
#define PEER_FLAG_DONT_CAPABILITY (1U << 2) /* dont-capability */