From 37664928bdf161dc212d61984a754464bc0b8322 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 14 Sep 2017 11:15:52 -0400 Subject: pimd: Allow igmp join messages to return more detailed errors Start the conversion of pim configuration commands to use the ferr side channel to allow more detailed information to be returned to cli commands. Signed-off-by: Donald Sharp --- pimd/pim_cmd.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'pimd/pim_cmd.c') diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index ab6212710..4066614f4 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -28,6 +28,7 @@ #include "hash.h" #include "nexthop.h" #include "vrf.h" +#include "ferr.h" #include "pimd.h" #include "pim_mroute.h" @@ -5839,13 +5840,8 @@ DEFUN (interface_ip_igmp_join, return CMD_WARNING_CONFIG_FAILED; } - result = pim_if_igmp_join_add(ifp, group_addr, source_addr); - if (result) { - vty_out(vty, - "%% Failure joining IGMP group %s source %s on interface %s: %d\n", - group_str, source_str, ifp->name, result); - return CMD_WARNING_CONFIG_FAILED; - } + CMD_FERR_RETURN(pim_if_igmp_join_add(ifp, group_addr, source_addr), + "Failure joining IGMP group: $ERR"); return CMD_SUCCESS; } -- cgit v1.2.3