matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

pimd: Modify 'show ip multicast' to be VRF aware

Browse source 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-05-17 15:08:39 -04:00
parent afa2b17920
commit ecca97acb3
1 changed files with 52 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
pimd/pim_cmd.c
View file

@ -3640,13 +3640,21 @@ static void show_multicast_interfaces(struct vty *vty)
{ {
struct listnode *node; struct listnode *node;
struct interface *ifp; struct interface *ifp;
struct pim_instance *pim;
struct vrf *vrf;
vty_out(vty, "\n"); vty_out(vty, "\n");
vty_out(vty, vty_out(vty,
"Interface Address ifi Vif PktsIn PktsOut BytesIn BytesOut\n"); "Interface Address ifi Vif PktsIn PktsOut BytesIn BytesOut VRF\n");
for (ALL_LIST_ELEMENTS_RO(vrf_iflist(pimg->vrf_id), node, ifp)) { RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
{
pim = vrf->info;
if (!pim)
continue;
for (ALL_LIST_ELEMENTS_RO(vrf_iflist(pim->vrf_id), node, ifp)) {
struct pim_interface *pim_ifp; struct pim_interface *pim_ifp;
struct in_addr ifaddr; struct in_addr ifaddr;
struct sioc_vif_req vreq; struct sioc_vif_req vreq;
@ -3659,9 +3667,9 @@ static void show_multicast_interfaces(struct vty *vty)
memset(&vreq, 0, sizeof(vreq)); memset(&vreq, 0, sizeof(vreq));
vreq.vifi = pim_ifp->mroute_vif_index; vreq.vifi = pim_ifp->mroute_vif_index;
if (ioctl(pimg->mroute_socket, SIOCGETVIFCNT, &vreq)) { if (ioctl(pim->mroute_socket, SIOCGETVIFCNT, &vreq)) {
zlog_warn( zlog_warn(
"ioctl(SIOCGETVIFCNT=%lu) failure for interface %s vif_index=%d: errno=%d: %s\n", "ioctl(SIOCGETVIFCNT=%lu) failure for interface %s vif_index=%d: errno=%d: %s",
(unsigned long)SIOCGETVIFCNT, ifp->name, (unsigned long)SIOCGETVIFCNT, ifp->name,
pim_ifp->mroute_vif_index, errno, pim_ifp->mroute_vif_index, errno,
safe_strerror(errno)); safe_strerror(errno));
@ -3669,12 +3677,16 @@ static void show_multicast_interfaces(struct vty *vty)
ifaddr = pim_ifp->primary_address; ifaddr = pim_ifp->primary_address;
vty_out(vty, "%-9s %-15s %3d %3d %7lu %7lu %10lu %10lu\n", vty_out(vty,
"%-12s %-15s %3d %3d %7lu %7lu %10lu %10lu\n",
ifp->name, inet_ntoa(ifaddr), ifp->ifindex, ifp->name, inet_ntoa(ifaddr), ifp->ifindex,
pim_ifp->mroute_vif_index, (unsigned long)vreq.icount, pim_ifp->mroute_vif_index,
(unsigned long)vreq.ocount, (unsigned long)vreq.ibytes, (unsigned long)vreq.icount,
(unsigned long)vreq.ocount,
(unsigned long)vreq.ibytes,
(unsigned long)vreq.obytes); (unsigned long)vreq.obytes);
} }
}
} }
DEFUN (show_ip_multicast, DEFUN (show_ip_multicast,
@ -3684,11 +3696,23 @@ DEFUN (show_ip_multicast,
IP_STR IP_STR
"Multicast global information\n") "Multicast global information\n")
{ {
struct vrf *vrf;
struct pim_instance *pim;
time_t now = pim_time_monotonic_sec(); time_t now = pim_time_monotonic_sec();
char uptime[10]; char uptime[10];
vty_out(vty, "Mroute socket descriptor: %d\n", pimg->mroute_socket); vty_out(vty, "Mroute socket descriptor:");
RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
{
pim = vrf->info;
if (!pim)
continue;
vty_out(vty, " %d(%s)", pim->mroute_socket, pim->vrf->name);
}
vty_out(vty, "\n");
pim_time_uptime(uptime, sizeof(uptime), pim_time_uptime(uptime, sizeof(uptime),
now - pimg->mroute_socket_creation); now - pimg->mroute_socket_creation);
@ -5504,6 +5528,8 @@ DEFUN (interface_ip_pim_sm,
} }
pim_ifp = ifp->info; pim_ifp = ifp->info;
vty_out(vty, "PIM vrf: %s", pim_ifp->pim->vrf->name);
pim_if_create_pimreg(pim_ifp->pim); pim_if_create_pimreg(pim_ifp->pim);
return CMD_SUCCESS; return CMD_SUCCESS;