Revert "bgpd: Show PfxSnt for show bgp <afi> <safi> command"

This reverts commit 776e7cf5ce.
This commit is contained in:
Donatas Abraitis 2020-04-24 10:00:13 +03:00
parent 7a54a2caf7
commit 9da4aaa36d

View File

@ -9050,12 +9050,10 @@ static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
vty_out(vty, "EstdCnt DropCnt ResetTime Reason\n"); vty_out(vty, "EstdCnt DropCnt ResetTime Reason\n");
else else
vty_out(vty, vty_out(vty,
"V AS MsgRcvd MsgSent TblVer InQ OutQ Up/Down State/PfxRcd PfxSnt\n"); "V AS MsgRcvd MsgSent TblVer InQ OutQ Up/Down State/PfxRcd\n");
} }
} }
paf = peer_af_find(peer, afi, pfx_rcd_safi);
count++; count++;
/* Works for both failed & successful cases */ /* Works for both failed & successful cases */
if (peer_dynamic_neighbor(peer)) if (peer_dynamic_neighbor(peer))
@ -9111,6 +9109,7 @@ static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
json_object_int_add(json_peer, "pfxRcd", json_object_int_add(json_peer, "pfxRcd",
peer->pcount[afi][pfx_rcd_safi]); peer->pcount[afi][pfx_rcd_safi]);
paf = peer_af_find(peer, afi, pfx_rcd_safi);
if (paf && PAF_SUBGRP(paf)) if (paf && PAF_SUBGRP(paf))
json_object_int_add(json_peer, json_object_int_add(json_peer,
"pfxSnt", "pfxSnt",
@ -9196,7 +9195,7 @@ static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
peer_uptime(peer->uptime, timebuf, peer_uptime(peer->uptime, timebuf,
BGP_UPTIME_LEN, 0, NULL)); BGP_UPTIME_LEN, 0, NULL));
if (peer->status == Established) { if (peer->status == Established)
if (peer->afc_recv[afi][safi]) if (peer->afc_recv[afi][safi])
vty_out(vty, " %12" PRIu32, vty_out(vty, " %12" PRIu32,
peer->pcount peer->pcount
@ -9204,12 +9203,7 @@ static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
[pfx_rcd_safi]); [pfx_rcd_safi]);
else else
vty_out(vty, " NoNeg"); vty_out(vty, " NoNeg");
else {
if (paf && PAF_SUBGRP(paf))
vty_out(vty, " %8" PRIu32,
(PAF_SUBGRP(paf))
->scount);
} else {
if (CHECK_FLAG(peer->flags, PEER_FLAG_SHUTDOWN)) if (CHECK_FLAG(peer->flags, PEER_FLAG_SHUTDOWN))
vty_out(vty, " Idle (Admin)"); vty_out(vty, " Idle (Admin)");
else if (CHECK_FLAG( else if (CHECK_FLAG(
@ -9220,8 +9214,6 @@ static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
vty_out(vty, " %12s", vty_out(vty, " %12s",
lookup_msg(bgp_status_msg, lookup_msg(bgp_status_msg,
peer->status, NULL)); peer->status, NULL));
vty_out(vty, " %8" PRIu32, 0);
} }
vty_out(vty, "\n"); vty_out(vty, "\n");
} }