Merge pull request #6409 from ton31337/feature/missing_to_7.4

[7.4] bgpd two fixes
This commit is contained in:
Donald Sharp 2020-05-15 07:47:05 -04:00 committed by GitHub
commit 848a8ed789
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions

View File

@ -10567,8 +10567,8 @@ DEFUN(show_ip_bgp_statistics_all, show_ip_bgp_statistics_all_cmd,
{
bool uj = use_json(argc, argv);
struct bgp *bgp = NULL;
safi_t safi;
afi_t afi;
safi_t safi = SAFI_UNICAST;
afi_t afi = AFI_IP6;
int idx = 0;
struct json_object *json_all = NULL;
struct json_object *json_afi_safi = NULL;
@ -10626,8 +10626,8 @@ DEFUN (show_ip_bgp_l2vpn_evpn_statistics,
"BGP RIB advertisement statistics\n"
JSON_STR)
{
afi_t afi;
safi_t safi;
afi_t afi = AFI_IP6;
safi_t safi = SAFI_UNICAST;
struct bgp *bgp = NULL;
int idx = 0, ret;
bool uj = use_json(argc, argv);
@ -10666,8 +10666,8 @@ DEFUN(show_ip_bgp_afi_safi_statistics, show_ip_bgp_afi_safi_statistics_cmd,
BGP_SAFI_WITH_LABEL_HELP_STR
"BGP RIB advertisement statistics\n" JSON_STR)
{
afi_t afi;
safi_t safi;
afi_t afi = AFI_IP6;
safi_t safi = SAFI_UNICAST;
struct bgp *bgp = NULL;
int idx = 0, ret;
bool uj = use_json(argc, argv);

View File

@ -9087,7 +9087,7 @@ static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
}
}
paf = peer_af_find(peer, afi, pfx_rcd_safi);
paf = peer_af_find(peer, afi, safi);
filter = &peer->filter[afi][safi];
count++;