pim6d: Replace pim_br_unknown with PIMADDR_ANY

Signed-off-by: Mobashshera Rasool <mrasool@vmware.com>

diff --git a/pimd/pim_br.c b/pimd/pim_br.c
index 427409217deb8f346dc5f088000bbd66981097c9..6ec6b11e7bcf4b36c54ebbbff1a8c546e9b5b50a 100644 (file)
--- a/pimd/pim_br.c
+++ b/pimd/pim_br.c
@@ -33,8 +33,6 @@ struct pim_br {
        pim_addr pmbr;
 };
 
-pim_addr pim_br_unknown = {.s_addr = 0};
-
 static struct list *pim_br_list = NULL;
 
 pim_addr pim_br_get_pmbr(pim_sgaddr *sg)
@@ -47,7 +45,7 @@ pim_addr pim_br_get_pmbr(pim_sgaddr *sg)
                        return pim_br->pmbr;
        }
 
-       return pim_br_unknown;
+       return PIMADDR_ANY;
 }
 
 void pim_br_set_pmbr(pim_sgaddr *sg, pim_addr br)

diff --git a/pimd/pim_br.h b/pimd/pim_br.h
index 522dc085007a47c67c60a1602805f882c2892a7e..7b87c0f1fda8c744d017c564fd6bf8fe04f3c66b 100644 (file)
--- a/pimd/pim_br.h
+++ b/pimd/pim_br.h
@@ -27,6 +27,4 @@ void pim_br_clear_pmbr(pim_sgaddr *sg);
 
 void pim_br_init(void);
 
-extern pim_addr pim_br_unknown;
-
 #endif

diff --git a/pimd/pim_register.c b/pimd/pim_register.c
index c8c0b66ddb218f634ae1df7eb8d8cfd381f7a587..8313c8d4f61c73abf3be1a1ffb757e8c27fcac3d 100644 (file)
--- a/pimd/pim_register.c
+++ b/pimd/pim_register.c
@@ -414,7 +414,7 @@ int pim_register_recv(struct interface *ifp, pim_addr dest_addr,
                                        "%s: Received Register message with Border bit set",
                                        __func__);
 
-                       if (!pim_addr_cmp(pimbr, pim_br_unknown))
+                       if (pim_addr_is_any(pimbr))
                                pim_br_set_pmbr(&sg, src_addr);
                        else if (pim_addr_cmp(src_addr, pimbr)) {
                                pim_register_stop_send(ifp, &sg, dest_addr,