diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2022-03-02 10:42:17 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2022-03-02 10:42:17 +0100 |
| commit | 6564f5e5a56bb4edf0827878d76e381f1ecf910f (patch) | |
| tree | f8b0f51339c8251c960565a9cac7e16134e959da /pimd/pim_rpf.c | |
| parent | Merge pull request #10684 from mobash-rasool/join-prune (diff) | |
| parent | pimd: fix stray comment referencing INADDR_NONE (diff) | |
| download | frr-6564f5e5a56bb4edf0827878d76e381f1ecf910f.tar.xz frr-6564f5e5a56bb4edf0827878d76e381f1ecf910f.zip | |
Merge pull request #10657 from patrasar/pim_remove_in_addr_none
[manual merge to edit comment, didn't want to incur another cycle]
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'pimd/pim_rpf.c')
| -rw-r--r-- | pimd/pim_rpf.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/pimd/pim_rpf.c b/pimd/pim_rpf.c index c62a06f85..a99f5536b 100644 --- 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); |