proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 22:29:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: Use uint32_t for maximum-prefix

Browse Source 
Currently we have unsigned long which is not what we defined
in CLI (1-4294967295).

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
This commit is contained in:
Donatas Abraitis 2019-10-04 00:30:28 +03:00
parent c93f27d52f
commit f6aea80e1d
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bgpd/bgp_route.c
View File

@ -2748,8 +2748,8 @@ int bgp_maximum_prefix_overflow(struct peer *peer, afi_t afi, safi_t safi,
return 0; return 0;
zlog_info( zlog_info(
"%%MAXPFXEXCEED: No. of %s prefix received from %s %ld exceed, " "%%MAXPFXEXCEED: No. of %s prefix received from %s %" PRIu32
"limit %ld", " exceed, limit %" PRIu32,
get_afi_safi_str(afi, safi, false), peer->host, get_afi_safi_str(afi, safi, false), peer->host,
peer->pcount[afi][safi], peer->pmax[afi][safi]); peer->pcount[afi][safi], peer->pmax[afi][safi]);
SET_FLAG(peer->af_sflags[afi][safi], PEER_STATUS_PREFIX_LIMIT); SET_FLAG(peer->af_sflags[afi][safi], PEER_STATUS_PREFIX_LIMIT);
@ -2810,7 +2810,8 @@ int bgp_maximum_prefix_overflow(struct peer *peer, afi_t afi, safi_t safi,
return 0; return 0;
zlog_info( zlog_info(
"%%MAXPFX: No. of %s prefix received from %s reaches %ld, max %ld", "%%MAXPFX: No. of %s prefix received from %s reaches %" PRIu32
", max %" PRIu32,
get_afi_safi_str(afi, safi, false), peer->host, get_afi_safi_str(afi, safi, false), peer->host,
peer->pcount[afi][safi], peer->pmax[afi][safi]); peer->pcount[afi][safi], peer->pmax[afi][safi]);
SET_FLAG(peer->af_sflags[afi][safi], SET_FLAG(peer->af_sflags[afi][safi],
@ -10976,7 +10977,7 @@ static int bgp_peer_counts(struct vty *vty, struct peer *peer, afi_t afi,
get_afi_safi_str(afi, safi, false)); get_afi_safi_str(afi, safi, false));
} }
vty_out(vty, "PfxCt: %ld\n", peer->pcount[afi][safi]); vty_out(vty, "PfxCt: %" PRIu32 "\n", peer->pcount[afi][safi]);
vty_out(vty, "\nCounts from RIB table walk:\n\n"); vty_out(vty, "\nCounts from RIB table walk:\n\n");
for (i = 0; i < PCOUNT_MAX; i++) for (i = 0; i < PCOUNT_MAX; i++)

13
bgpd/bgp_vty.c
View File

@ -8447,9 +8447,10 @@ static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
if (peer->status == Established) if (peer->status == Established)
if (peer->afc_recv[afi][safi]) if (peer->afc_recv[afi][safi])
vty_out(vty, " %12ld", vty_out(vty, " %12" PRIu32,
peer->pcount[afi] peer->pcount
[pfx_rcd_safi]); [afi]
[pfx_rcd_safi]);
else else
vty_out(vty, " NoNeg"); vty_out(vty, " NoNeg");
else { else {
@ -9345,11 +9346,13 @@ static void bgp_show_peer_afi(struct vty *vty, struct peer *p, afi_t afi,
filter->usmap.name); filter->usmap.name);
/* Receive prefix count */ /* Receive prefix count */
vty_out(vty, " %ld accepted prefixes\n", p->pcount[afi][safi]); vty_out(vty, " %" PRIu32 " accepted prefixes\n",
p->pcount[afi][safi]);
/* Maximum prefix */ /* Maximum prefix */
if (CHECK_FLAG(p->af_flags[afi][safi], PEER_FLAG_MAX_PREFIX)) { if (CHECK_FLAG(p->af_flags[afi][safi], PEER_FLAG_MAX_PREFIX)) {
vty_out(vty, " Maximum prefixes allowed %ld%s\n", vty_out(vty,
" Maximum prefixes allowed %" PRIu32 "%s\n",
p->pmax[afi][safi], p->pmax[afi][safi],
CHECK_FLAG(p->af_flags[afi][safi], CHECK_FLAG(p->af_flags[afi][safi],
PEER_FLAG_MAX_PREFIX_WARNING) PEER_FLAG_MAX_PREFIX_WARNING)

2
bgpd/bgpd.c
View File

@ -7348,7 +7348,7 @@ static void bgp_config_write_peer_af(struct vty *vty, struct bgp *bgp,
/* maximum-prefix. */ /* maximum-prefix. */
if (peergroup_af_flag_check(peer, afi, safi, PEER_FLAG_MAX_PREFIX)) { if (peergroup_af_flag_check(peer, afi, safi, PEER_FLAG_MAX_PREFIX)) {
vty_out(vty, " neighbor %s maximum-prefix %lu", addr, vty_out(vty, " neighbor %s maximum-prefix %" PRIu32, addr,
peer->pmax[afi][safi]); peer->pmax[afi][safi]);
if (peer->pmax_threshold[afi][safi] if (peer->pmax_threshold[afi][safi]

4
bgpd/bgpd.h
View File

@ -1152,10 +1152,10 @@ struct peer {
int rcvd_attr_printed; int rcvd_attr_printed;
/* Prefix count. */ /* Prefix count. */
unsigned long pcount[AFI_MAX][SAFI_MAX]; uint32_t pcount[AFI_MAX][SAFI_MAX];
/* Max prefix count. */ /* Max prefix count. */
unsigned long pmax[AFI_MAX][SAFI_MAX]; uint32_t pmax[AFI_MAX][SAFI_MAX];
uint8_t pmax_threshold[AFI_MAX][SAFI_MAX]; uint8_t pmax_threshold[AFI_MAX][SAFI_MAX];
uint16_t pmax_restart[AFI_MAX][SAFI_MAX]; uint16_t pmax_restart[AFI_MAX][SAFI_MAX];
#define MAXIMUM_PREFIX_THRESHOLD_DEFAULT 75 #define MAXIMUM_PREFIX_THRESHOLD_DEFAULT 75