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

pimd: Add 'show ip mroute fill' command

Browse Source 
When displaying the mroute table, add ability to fill
in all the missing data that for human eyes can be assumed.
This will allow people using grep over the command
can get more information.

sharpd@robot ~> sudo vtysh -c "show ip mroute fill"
Source          Group           Proto  Input      Output     TTL  Uptime
*               229.1.1.1       STATIC dum0       enp3s0     1    00:11:07 Default-IP-Routing-Table
*               229.1.1.1       STATIC dum0       virbr0     1    00:01:47 Default-IP-Routing-Table
sharpd@robot ~>

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-09-28 08:05:20 -04:00
parent 67c0a9206c
commit 45b7b09283
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pimd/pim_cmd.c
View File

@ -4451,7 +4451,8 @@ DEFUN (show_ip_multicast_vrf_all,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
static void show_mroute(struct pim_instance *pim, struct vty *vty, u_char uj) static void show_mroute(struct pim_instance *pim, struct vty *vty,
bool fill, u_char uj)
{ {
struct listnode *node; struct listnode *node;
struct channel_oil *c_oil; struct channel_oil *c_oil;
@ -4704,11 +4705,9 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty, u_char uj)
continue; continue;
ifp_out = pim_if_find_by_vif_index(pim, oif_vif_index); ifp_out = pim_if_find_by_vif_index(pim, oif_vif_index);
pim_time_uptime( pim_time_uptime(oif_uptime, sizeof(oif_uptime),
oif_uptime, sizeof(oif_uptime), now -
now s_route->c_oil.oif_creation[oif_vif_index]);
- s_route->c_oil
.oif_creation[oif_vif_index]);
found_oif = 1; found_oif = 1;
if (ifp_out) if (ifp_out)
@ -4751,7 +4750,7 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty, u_char uj)
src_str, grp_str, proto, in_ifname, src_str, grp_str, proto, in_ifname,
out_ifname, ttl, oif_uptime, out_ifname, ttl, oif_uptime,
pim->vrf->name); pim->vrf->name);
if (first) { if (first && !fill) {
src_str[0] = '\0'; src_str[0] = '\0';
grp_str[0] = '\0'; grp_str[0] = '\0';
in_ifname[0] = '\0'; in_ifname[0] = '\0';
@ -4777,36 +4776,47 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty, u_char uj)
DEFUN (show_ip_mroute, DEFUN (show_ip_mroute,
show_ip_mroute_cmd, show_ip_mroute_cmd,
"show ip mroute [vrf NAME] [json]", "show ip mroute [vrf NAME] [fill] [json]",
SHOW_STR SHOW_STR
IP_STR IP_STR
MROUTE_STR MROUTE_STR
VRF_CMD_HELP_STR VRF_CMD_HELP_STR
"Fill in Assumed data\n"
JSON_STR) JSON_STR)
{ {
u_char uj = use_json(argc, argv); u_char uj = use_json(argc, argv);
bool fill = false;
int idx = 2; int idx = 2;
struct vrf *vrf = pim_cmd_lookup_vrf(vty, argv, argc, &idx); struct vrf *vrf = pim_cmd_lookup_vrf(vty, argv, argc, &idx);
if (!vrf) if (!vrf)
return CMD_WARNING; return CMD_WARNING;
show_mroute(vrf->info, vty, uj); if (argv_find(argv, argc, "fill", &idx))
fill = true;
show_mroute(vrf->info, vty, fill, uj);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN (show_ip_mroute_vrf_all, DEFUN (show_ip_mroute_vrf_all,
show_ip_mroute_vrf_all_cmd, show_ip_mroute_vrf_all_cmd,
"show ip mroute vrf all [json]", "show ip mroute vrf all [fill] [json]",
SHOW_STR SHOW_STR
IP_STR IP_STR
MROUTE_STR MROUTE_STR
VRF_CMD_HELP_STR VRF_CMD_HELP_STR
"Fill in Assumed data\n"
JSON_STR) JSON_STR)
{ {
u_char uj = use_json(argc, argv); u_char uj = use_json(argc, argv);
int idx = 4;
struct vrf *vrf; struct vrf *vrf;
bool first = true; bool first = true;
bool fill = false;
if (argv_find(argv, argc, "fill", &idx))
fill = true;
if (uj) if (uj)
vty_out(vty, "{ "); vty_out(vty, "{ ");
@ -4818,7 +4828,7 @@ DEFUN (show_ip_mroute_vrf_all,
first = false; first = false;
} else } else
vty_out(vty, "VRF: %s\n", vrf->name); vty_out(vty, "VRF: %s\n", vrf->name);
show_mroute(vrf->info, vty, uj); show_mroute(vrf->info, vty, fill, uj);
} }
if (uj) if (uj)
vty_out(vty, "}\n"); vty_out(vty, "}\n");