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

Merge pull request #4296 from adharkar/frr-master-fib_prefix

Browse Source 
Zebra: Add "show ip/ipv6 fib <prefix> [json]" CLI
This commit is contained in:
Donald Sharp 2019-05-14 21:46:38 -04:00 committed by GitHub
commit 543c749625
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 74 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
zebra/zebra_vty.c
View File

@ -62,7 +62,7 @@ static int do_show_ip_route(struct vty *vty, const char *vrf_name, afi_t afi,
bool supernets_only, int type,
unsigned short ospf_instance_id);
static void vty_show_ip_route_detail(struct vty *vty, struct route_node *rn,
int mcast);
int mcast, bool use_fib);
static void vty_show_ip_route_summary(struct vty *vty,
struct route_table *table);
static void vty_show_ip_route_summary_prefix(struct vty *vty,
@ -154,7 +154,7 @@ DEFUN (show_ip_rpf_addr,
re = rib_match_ipv4_multicast(VRF_DEFAULT, addr, &rn);
if (re)
vty_show_ip_route_detail(vty, rn, 1);
vty_show_ip_route_detail(vty, rn, 1, false);
else
vty_out(vty, "%% No match for RPF lookup\n");
@ -186,14 +186,24 @@ static char re_status_output_char(struct route_entry *re, struct nexthop *nhop)
/* New RIB. Detailed information for IPv4 route. */
static void vty_show_ip_route_detail(struct vty *vty, struct route_node *rn,
int mcast)
int mcast, bool use_fib)
{
struct route_entry *re;
struct nexthop *nexthop;
char buf[SRCDEST2STR_BUFFER];
struct zebra_vrf *zvrf;
rib_dest_t *dest;
dest = rib_dest_from_rnode(rn);
RNODE_FOREACH_RE (rn, re) {
/*
* If re not selected for forwarding, skip re
* for "show ip/ipv6 fib <prefix>"
*/
if (use_fib && re != dest->selected_fib)
continue;
const char *mcast_info = "";
if (mcast) {
rib_table_info_t *info = srcdest_rnode_table_info(rn);
@ -749,17 +759,26 @@ static void vty_show_ip_route(struct vty *vty, struct route_node *rn,
}
static void vty_show_ip_route_detail_json(struct vty *vty,
struct route_node *rn)
struct route_node *rn, bool use_fib)
{
json_object *json = NULL;
json_object *json_prefix = NULL;
struct route_entry *re;
char buf[BUFSIZ];
rib_dest_t *dest;
dest = rib_dest_from_rnode(rn);
json = json_object_new_object();
json_prefix = json_object_new_array();
RNODE_FOREACH_RE (rn, re) {
/*
* If re not selected for forwarding, skip re
* for "show ip/ipv6 fib <prefix> json"
*/
if (use_fib && re != dest->selected_fib)
continue;
vty_show_ip_route(vty, rn, re, json_prefix);
}
@ -1177,12 +1196,12 @@ DEFPY (show_route_detail,
show_route_detail_cmd,
"show\
<\
ip$ipv4 route [vrf <NAME$vrf_name|all$vrf_all>]\
ip$ipv4 <fib$fib|route> [vrf <NAME$vrf_name|all$vrf_all>]\
<\
A.B.C.D$address\
|A.B.C.D/M$prefix\
>\
|ipv6$ipv6 route [vrf <NAME$vrf_name|all$vrf_all>]\
|ipv6$ipv6 <fib$fib|route> [vrf <NAME$vrf_name|all$vrf_all>]\
<\
X:X::X:X$address\
|X:X::X:X/M$prefix\
@ -1191,12 +1210,14 @@ DEFPY (show_route_detail,
[json$json]",
SHOW_STR
IP_STR
"IPv6 forwarding table\n"
"IP routing table\n"
VRF_FULL_CMD_HELP_STR
"Network in the IP routing table to display\n"
"IP prefix <network>/<length>, e.g., 35.0.0.0/8\n"
IP6_STR
"IP routing table\n"
"IPv6 forwarding table\n"
"IPv6 routing table\n"
VRF_FULL_CMD_HELP_STR
"IPv6 Address\n"
"IPv6 prefix\n"
@ -1206,6 +1227,9 @@ DEFPY (show_route_detail,
struct route_table *table;
struct prefix p;
struct route_node *rn;
bool use_fib = !!fib;
rib_dest_t *dest;
bool network_found = false;
if (address_str)
prefix_str = address_str;
@ -1231,13 +1255,35 @@ DEFPY (show_route_detail,
continue;
}
dest = rib_dest_from_rnode(rn);
if (use_fib && !dest->selected_fib) {
route_unlock_node(rn);
continue;
}
network_found = true;
if (json)
vty_show_ip_route_detail_json(vty, rn);
vty_show_ip_route_detail_json(vty, rn,
use_fib);
else
vty_show_ip_route_detail(vty, rn, 0);
vty_show_ip_route_detail(vty, rn, 0, use_fib);
route_unlock_node(rn);
}
if (!network_found) {
if (json)
vty_out(vty, "{}\n");
else {
if (use_fib)
vty_out(vty,
"%% Network not in FIB\n");
else
vty_out(vty,
"%% Network not in RIB\n");
}
return CMD_WARNING;
}
} else {
vrf_id_t vrf_id = VRF_DEFAULT;
@ -1249,20 +1295,30 @@ DEFPY (show_route_detail,
return CMD_SUCCESS;
rn = route_node_match(table, &p);
if (!rn) {
vty_out(vty, "%% Network not in table\n");
return CMD_WARNING;
}
if (!address_str && rn->p.prefixlen != p.prefixlen) {
vty_out(vty, "%% Network not in table\n");
route_unlock_node(rn);
if (rn)
dest = rib_dest_from_rnode(rn);
if (!rn || (!address_str && rn->p.prefixlen != p.prefixlen) ||
(use_fib && dest && !dest->selected_fib)) {
if (json)
vty_out(vty, "{}\n");
else {
if (use_fib)
vty_out(vty,
"%% Network not in FIB\n");
else
vty_out(vty,
"%% Network not in table\n");
}
if (rn)
route_unlock_node(rn);
return CMD_WARNING;
}
if (json)
vty_show_ip_route_detail_json(vty, rn);
vty_show_ip_route_detail_json(vty, rn, use_fib);
else
vty_show_ip_route_detail(vty, rn, 0);
vty_show_ip_route_detail(vty, rn, 0, use_fib);
route_unlock_node(rn);
}