diff options
Diffstat (limited to 'pimd/pim6_cmd.c')
| -rw-r--r-- | pimd/pim6_cmd.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/pimd/pim6_cmd.c b/pimd/pim6_cmd.c index ce26f912f4..f0ea4a03a1 100644 --- a/pimd/pim6_cmd.c +++ b/pimd/pim6_cmd.c @@ -652,8 +652,8 @@ DEFPY (interface_no_ipv6_mld_query_interval, "frr-routing:ipv6"); } -DEFPY (mld_group_watermark, - mld_group_watermark_cmd, +DEFPY (ipv6_mld_group_watermark, + ipv6_mld_group_watermark_cmd, "ipv6 mld watermark-warn (1-65535)$limit", IPV6_STR MLD_STR @@ -665,8 +665,8 @@ DEFPY (mld_group_watermark, return CMD_SUCCESS; } -DEFPY (no_mld_group_watermark, - no_mld_group_watermark_cmd, +DEFPY (no_ipv6_mld_group_watermark, + no_ipv6_mld_group_watermark_cmd, "no ipv6 mld watermark-warn [(1-65535)$limit]", NO_STR IPV6_STR @@ -1541,7 +1541,6 @@ DEFPY (show_ipv6_pim_nexthop_lookup, pim_addr vif_source; struct prefix grp; struct pim_nexthop nexthop; - char nexthop_addr_str[PIM_ADDRSTRLEN]; struct vrf *v; v = vrf_lookup_by_name(vrf ? vrf : VRF_DEFAULT_NAME); @@ -1564,10 +1563,8 @@ DEFPY (show_ipv6_pim_nexthop_lookup, return CMD_SUCCESS; } - pim_addr_dump("<nexthop?>", &nexthop.mrib_nexthop_addr, - nexthop_addr_str, sizeof(nexthop_addr_str)); - vty_out(vty, "Group %s --- Nexthop %s Interface %s\n", group_str, - nexthop_addr_str, nexthop.interface->name); + vty_out(vty, "Group %s --- Nexthop %pPAs Interface %s\n", group_str, + &nexthop.mrib_nexthop_addr, nexthop.interface->name); return CMD_SUCCESS; } @@ -1628,10 +1625,10 @@ void pim_cmd_init(void) install_element(INTERFACE_NODE, &interface_ipv6_mld_query_interval_cmd); install_element(INTERFACE_NODE, &interface_no_ipv6_mld_query_interval_cmd); - install_element(CONFIG_NODE, &mld_group_watermark_cmd); - install_element(VRF_NODE, &mld_group_watermark_cmd); - install_element(CONFIG_NODE, &no_mld_group_watermark_cmd); - install_element(VRF_NODE, &no_mld_group_watermark_cmd); + install_element(CONFIG_NODE, &ipv6_mld_group_watermark_cmd); + install_element(VRF_NODE, &ipv6_mld_group_watermark_cmd); + install_element(CONFIG_NODE, &no_ipv6_mld_group_watermark_cmd); + install_element(VRF_NODE, &no_ipv6_mld_group_watermark_cmd); install_element(INTERFACE_NODE, &interface_ipv6_mld_query_max_response_time_cmd); install_element(INTERFACE_NODE, |