proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-04-28 17:42:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13526 from opensourcerouting/fix/show_table_version_per_subgrp

Browse Source 
bgpd: Show the real table version for a decent peer subgroup
This commit is contained in:
Russ White 2023-05-16 10:14:04 -04:00 committed by GitHub
commit 18978d1280
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bgpd/bgp_vty.c
View File

@ -11620,8 +11620,11 @@ static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
&peer->ibuf->count, &peer->ibuf->count,
memory_order_relaxed); memory_order_relaxed);
json_object_int_add(json_peer, "tableVersion", json_object_int_add(
peer->version[afi][safi]); json_peer, "tableVersion",
(paf && PAF_SUBGRP(paf))
? paf->subgroup->version
: 0);
json_object_int_add(json_peer, "outq", json_object_int_add(json_peer, "outq",
outq_count); outq_count);
json_object_int_add(json_peer, "inq", json_object_int_add(json_peer, "inq",
@ -11799,8 +11802,10 @@ static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
" %9u %9u %8" PRIu64 " %4zu %4zu %8s", " %9u %9u %8" PRIu64 " %4zu %4zu %8s",
PEER_TOTAL_RX(peer), PEER_TOTAL_RX(peer),
PEER_TOTAL_TX(peer), PEER_TOTAL_TX(peer),
peer->version[afi][safi], inq_count, (paf && PAF_SUBGRP(paf))
outq_count, ? paf->subgroup->version
: 0,
inq_count, outq_count,
peer_uptime(peer->uptime, timebuf, peer_uptime(peer->uptime, timebuf,
BGP_UPTIME_LEN, 0, NULL)); BGP_UPTIME_LEN, 0, NULL));

1
bgpd/bgpd.h
View File

@ -1119,7 +1119,6 @@ struct peer {
/* BGP peer group. */ /* BGP peer group. */
struct peer_group *group; struct peer_group *group;
uint64_t version[AFI_MAX][SAFI_MAX];
/* BGP peer_af structures, per configured AF on this peer */ /* BGP peer_af structures, per configured AF on this peer */
struct peer_af *peer_af_array[BGP_AF_MAX]; struct peer_af *peer_af_array[BGP_AF_MAX];

2
tests/topotests/evpn_pim_1/spine/bgp.summ.json
View File

@ -8,7 +8,6 @@
"192.168.1.2":{ "192.168.1.2":{
"remoteAs":65002, "remoteAs":65002,
"version":4, "version":4,
"tableVersion":0,
"outq":0, "outq":0,
"inq":0, "inq":0,
"pfxRcd":3, "pfxRcd":3,
@ -21,7 +20,6 @@
"192.168.2.3":{ "192.168.2.3":{
"remoteAs":65003, "remoteAs":65003,
"version":4, "version":4,
"tableVersion":0,
"outq":0, "outq":0,
"inq":0, "inq":0,
"pfxRcd":3, "pfxRcd":3,