proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-04-29 14:33:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib, bgpd: bmp was not specifying l2vpn afi

Browse Source 
The l2vpn afi was not being properly displayed
when a show run was being issued.  Add a
afi2str_lower function and use it.

Fixes: #12867
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2023-02-23 14:22:33 -05:00
parent 4b0d6b4244
commit 0884f1644b
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bgpd/bgp_bmp.c
View File

@ -2498,14 +2498,13 @@ static int bmp_config_write(struct bgp *bgp, struct vty *vty)
vty_out(vty, " bmp mirror\n"); vty_out(vty, " bmp mirror\n");
FOREACH_AFI_SAFI (afi, safi) { FOREACH_AFI_SAFI (afi, safi) {
const char *afi_str = (afi == AFI_IP) ? "ipv4" : "ipv6";
if (bt->afimon[afi][safi] & BMP_MON_PREPOLICY) if (bt->afimon[afi][safi] & BMP_MON_PREPOLICY)
vty_out(vty, " bmp monitor %s %s pre-policy\n", vty_out(vty, " bmp monitor %s %s pre-policy\n",
afi_str, safi2str(safi)); afi2str_lower(afi), safi2str(safi));
if (bt->afimon[afi][safi] & BMP_MON_POSTPOLICY) if (bt->afimon[afi][safi] & BMP_MON_POSTPOLICY)
vty_out(vty, " bmp monitor %s %s post-policy\n", vty_out(vty,
afi_str, safi2str(safi)); " bmp monitor %s %s post-policy\n",
afi2str_lower(afi), safi2str(safi));
} }
frr_each (bmp_listeners, &bt->listeners, bl) frr_each (bmp_listeners, &bt->listeners, bl)
vty_out(vty, " \n bmp listener %pSU port %d\n", vty_out(vty, " \n bmp listener %pSU port %d\n",

17
lib/prefix.c
View File

@ -123,6 +123,23 @@ afi_t family2afi(int family)
return 0; return 0;
} }
const char *afi2str_lower(afi_t afi)
{
switch (afi) {
case AFI_IP:
return "ipv4";
case AFI_IP6:
return "ipv6";
case AFI_L2VPN:
return "l2vpn";
case AFI_MAX:
case AFI_UNSPEC:
return "bad-value";
}
assert(!"Reached end of function we should never reach");
}
const char *afi2str(afi_t afi) const char *afi2str(afi_t afi)
{ {
switch (afi) { switch (afi) {

1
lib/prefix.h
View File

@ -383,6 +383,7 @@ extern afi_t family2afi(int);
extern const char *family2str(int family); extern const char *family2str(int family);
extern const char *safi2str(safi_t safi); extern const char *safi2str(safi_t safi);
extern const char *afi2str(afi_t afi); extern const char *afi2str(afi_t afi);
extern const char *afi2str_lower(afi_t afi);
static inline afi_t prefix_afi(union prefixconstptr pu) static inline afi_t prefix_afi(union prefixconstptr pu)
{ {