Merge pull request #10657 from patrasar/pim_remove_in_addr_none

[mirror_frr.git] / pimd / pim_rpf.c

diff --git a/pimd/pim_rpf.c b/pimd/pim_rpf.c
index c62a06f85c838ddfc7fe2d186017a67b75764f08..a99f5536b7f92053841e7bae29ccd520b877f254 100644 (file)
--- a/pimd/pim_rpf.c
+++ b/pimd/pim_rpf.c
@@ -67,7 +67,7 @@ bool pim_nexthop_lookup(struct pim_instance *pim, struct pim_nexthop *nexthop,
         * 255.255.255.255 address, since
         * it will never work
         */
-       if (addr.s_addr == INADDR_NONE)
+       if (pim_addr_is_any(addr))
                return false;
 #endif
 
@@ -393,19 +393,6 @@ static pim_addr pim_rpf_find_rpf_addr(struct pim_upstream *up)
        return rpf_addr;
 }
 
-int pim_rpf_addr_is_inaddr_none(struct pim_rpf *rpf)
-{
-       switch (rpf->rpf_addr.family) {
-       case AF_INET:
-               return rpf->rpf_addr.u.prefix4.s_addr == INADDR_NONE;
-       case AF_INET6:
-               zlog_warn("%s: v6 Unimplmeneted", __func__);
-               return 1;
-       default:
-               return 0;
-       }
-}
-
 int pim_rpf_addr_is_inaddr_any(struct pim_rpf *rpf)
 {
        pim_addr rpf_addr = pim_addr_from_prefix(&rpf->rpf_addr);