diff options
| -rw-r--r-- | pbrd/pbr_vty.c | 5 | ||||
| -rw-r--r-- | pimd/pim_iface.c | 13 |
2 files changed, 9 insertions, 9 deletions
diff --git a/pbrd/pbr_vty.c b/pbrd/pbr_vty.c index c4e36ebd46..ee9ee32f8b 100644 --- a/pbrd/pbr_vty.c +++ b/pbrd/pbr_vty.c @@ -199,6 +199,11 @@ DEFPY(pbr_map_match_ip_proto, pbr_map_match_ip_proto_cmd, return CMD_WARNING_CONFIG_FAILED; if (!no) { + if (!ip_proto) { + vty_out(vty, "Unable to convert (null) to proto id\n"); + return CMD_WARNING; + } + p = getprotobyname(ip_proto); if (!p) { vty_out(vty, "Unable to convert %s to proto id\n", diff --git a/pimd/pim_iface.c b/pimd/pim_iface.c index b1beb45630..cc1ca77d65 100644 --- a/pimd/pim_iface.c +++ b/pimd/pim_iface.c @@ -40,9 +40,8 @@ #include "pim6_mld.h" -#if PIM_IPV == 4 -static void pim_if_igmp_join_del_all(struct interface *ifp); -#endif +static void pim_if_gm_join_del_all(struct interface *ifp); + static int gm_join_sock(const char *ifname, ifindex_t ifindex, pim_addr group_addr, pim_addr source_addr, struct pim_interface *pim_ifp); @@ -189,11 +188,9 @@ void pim_if_delete(struct interface *ifp) assert(pim_ifp); pim_ifp->pim->mcast_if_count--; -#if PIM_IPV == 4 if (pim_ifp->gm_join_list) { - pim_if_igmp_join_del_all(ifp); + pim_if_gm_join_del_all(ifp); } -#endif pim_ifchannel_delete_all(ifp); #if PIM_IPV == 4 @@ -1380,9 +1377,8 @@ int pim_if_gm_join_del(struct interface *ifp, pim_addr group_addr, return 0; } -#if PIM_IPV == 4 __attribute__((unused)) -static void pim_if_igmp_join_del_all(struct interface *ifp) +static void pim_if_gm_join_del_all(struct interface *ifp) { struct pim_interface *pim_ifp; struct listnode *node; @@ -1402,7 +1398,6 @@ static void pim_if_igmp_join_del_all(struct interface *ifp) for (ALL_LIST_ELEMENTS(pim_ifp->gm_join_list, node, nextnode, ij)) pim_if_gm_join_del(ifp, ij->group_addr, ij->source_addr); } -#endif /* PIM_IPV == 4 */ /* RFC 4601 |