diff options
| author | Mobashshera Rasool <mrasool@vmware.com> | 2022-03-02 02:47:17 -0800 |
|---|---|---|
| committer | Mobashshera Rasool <mrasool@vmware.com> | 2022-03-10 03:24:52 -0800 |
| commit | e782863dfcfe489c363d1989f95968a8fd5020c6 (patch) | |
| tree | 721b1901b4ca4b68893afca71e64becea2fb6212 | |
| parent | a141ea61e7e884dbde6081eb6aeebcae8e7c9ad9 (diff) | |
pim6d: Replace pim_br_unknown with PIMADDR_ANY
Signed-off-by: Mobashshera Rasool <mrasool@vmware.com>
| -rw-r--r-- | pimd/pim_br.c | 4 | ||||
| -rw-r--r-- | pimd/pim_br.h | 2 | ||||
| -rw-r--r-- | pimd/pim_register.c | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/pimd/pim_br.c b/pimd/pim_br.c index 427409217d..6ec6b11e7b 100644 --- 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 522dc08500..7b87c0f1fd 100644 --- 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 c8c0b66ddb..8313c8d4f6 100644 --- 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, |