From 0ebabd4107bae8e37a7331b3a095839bec378cee Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Mon, 20 Jun 2022 11:46:15 +0300 Subject: [PATCH] bgpd: Increase peer->flags to uint64_t We will hit the limit soon, let's increase this in advance. Signed-off-by: Donatas Abraitis --- bgpd/bgp_updgrp.c | 12 ++++++++---- bgpd/bgpd.h | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/bgpd/bgp_updgrp.c b/bgpd/bgp_updgrp.c index c5d049f363..443c5d8a13 100644 --- a/bgpd/bgp_updgrp.c +++ b/bgpd/bgp_updgrp.c @@ -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], diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h index 98e59bcc85..a6a13a9a6e 100644 --- a/bgpd/bgpd.h +++ b/bgpd/bgpd.h @@ -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 */