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

zebra: Only show route nexthop group ID when asked

Browse Source 
In lieu of the fact that we probably shouldn't change show
command output too much, changing this to only give nhe_id
output when the user explicitly asks for it. Probably only
going to be used for debugging for now anyway.

Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com>
This commit is contained in:
Stephen Worley 2019-08-26 18:20:45 -04:00
parent 4d21c7c086
commit 61d9ffe168
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
zebra/zebra_vty.c
View File

@ -64,7 +64,7 @@ static int do_show_ip_route(struct vty *vty, const char *vrf_name, afi_t afi,
bool supernets_only, int type, bool supernets_only, int type,
unsigned short ospf_instance_id); unsigned short ospf_instance_id);
static void vty_show_ip_route_detail(struct vty *vty, struct route_node *rn, static void vty_show_ip_route_detail(struct vty *vty, struct route_node *rn,
int mcast, bool use_fib); int mcast, bool use_fib, bool show_ng);
static void vty_show_ip_route_summary(struct vty *vty, static void vty_show_ip_route_summary(struct vty *vty,
struct route_table *table); struct route_table *table);
static void vty_show_ip_route_summary_prefix(struct vty *vty, static void vty_show_ip_route_summary_prefix(struct vty *vty,
@ -156,7 +156,7 @@ DEFUN (show_ip_rpf_addr,
re = rib_match_ipv4_multicast(VRF_DEFAULT, addr, &rn); re = rib_match_ipv4_multicast(VRF_DEFAULT, addr, &rn);
if (re) if (re)
vty_show_ip_route_detail(vty, rn, 1, false); vty_show_ip_route_detail(vty, rn, 1, false, false);
else else
vty_out(vty, "%% No match for RPF lookup\n"); vty_out(vty, "%% No match for RPF lookup\n");
@ -188,7 +188,7 @@ static char re_status_output_char(struct route_entry *re, struct nexthop *nhop)
/* New RIB. Detailed information for IPv4 route. */ /* New RIB. Detailed information for IPv4 route. */
static void vty_show_ip_route_detail(struct vty *vty, struct route_node *rn, static void vty_show_ip_route_detail(struct vty *vty, struct route_node *rn,
int mcast, bool use_fib) int mcast, bool use_fib, bool show_ng)
{ {
struct route_entry *re; struct route_entry *re;
struct nexthop *nexthop; struct nexthop *nexthop;
@ -260,7 +260,9 @@ static void vty_show_ip_route_detail(struct vty *vty, struct route_node *rn,
tm->tm_hour); tm->tm_hour);
vty_out(vty, " ago\n"); vty_out(vty, " ago\n");
vty_out(vty, " Nexthop Group ID: %u\n", re->nhe_id); if (show_ng)
vty_out(vty, " Nexthop Group ID: %u\n", re->nhe_id);
for (ALL_NEXTHOPS_PTR(re->ng, nexthop)) { for (ALL_NEXTHOPS_PTR(re->ng, nexthop)) {
char addrstr[32]; char addrstr[32];
@ -1557,7 +1559,7 @@ DEFPY (show_route_detail,
|X:X::X:X/M$prefix\ |X:X::X:X/M$prefix\
>\ >\
>\ >\
[json$json]", [json$json] [nexthop-group$ng]",
SHOW_STR SHOW_STR
IP_STR IP_STR
"IPv6 forwarding table\n" "IPv6 forwarding table\n"
@ -1571,7 +1573,8 @@ DEFPY (show_route_detail,
VRF_FULL_CMD_HELP_STR VRF_FULL_CMD_HELP_STR
"IPv6 Address\n" "IPv6 Address\n"
"IPv6 prefix\n" "IPv6 prefix\n"
JSON_STR) JSON_STR
"Nexthop Group Information\n")
{ {
afi_t afi = ipv4 ? AFI_IP : AFI_IP6; afi_t afi = ipv4 ? AFI_IP : AFI_IP6;
struct route_table *table; struct route_table *table;
@ -1580,6 +1583,7 @@ DEFPY (show_route_detail,
bool use_fib = !!fib; bool use_fib = !!fib;
rib_dest_t *dest; rib_dest_t *dest;
bool network_found = false; bool network_found = false;
bool show_ng = !!ng;
if (address_str) if (address_str)
prefix_str = address_str; prefix_str = address_str;
@ -1613,10 +1617,10 @@ DEFPY (show_route_detail,
network_found = true; network_found = true;
if (json) if (json)
vty_show_ip_route_detail_json(vty, rn, vty_show_ip_route_detail_json(vty, rn, use_fib);
use_fib);
else else
vty_show_ip_route_detail(vty, rn, 0, use_fib); vty_show_ip_route_detail(vty, rn, 0, use_fib,
show_ng);
route_unlock_node(rn); route_unlock_node(rn);
} }
@ -1668,7 +1672,7 @@ DEFPY (show_route_detail,
if (json) if (json)
vty_show_ip_route_detail_json(vty, rn, use_fib); vty_show_ip_route_detail_json(vty, rn, use_fib);
else else
vty_show_ip_route_detail(vty, rn, 0, use_fib); vty_show_ip_route_detail(vty, rn, 0, use_fib, show_ng);
route_unlock_node(rn); route_unlock_node(rn);
} }