summaryrefslogtreecommitdiffstats
path: root/pimd/pim_mroute.c
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2022-03-02 10:42:17 +0100
committerDavid Lamparter <equinox@opensourcerouting.org>2022-03-02 10:42:17 +0100
commit6564f5e5a56bb4edf0827878d76e381f1ecf910f (patch)
treef8b0f51339c8251c960565a9cac7e16134e959da /pimd/pim_mroute.c
parentMerge pull request #10684 from mobash-rasool/join-prune (diff)
parentpimd: fix stray comment referencing INADDR_NONE (diff)
downloadfrr-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_mroute.c')
-rw-r--r--pimd/pim_mroute.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c
index af6f59824..f381a764c 100644
--- a/pimd/pim_mroute.c
+++ b/pimd/pim_mroute.c
@@ -163,7 +163,7 @@ static int pim_mroute_msg_nocache(int fd, struct interface *ifp,
* the Interface type is SSM we don't need to
* do anything here
*/
- if (!rpg || pim_rpf_addr_is_inaddr_none(rpg)) {
+ if (!rpg || pim_rpf_addr_is_inaddr_any(rpg)) {
if (PIM_DEBUG_MROUTE_DETAIL)
zlog_debug(
"%s: Interface is not configured correctly to handle incoming packet: Could be !pim_ifp, !SM, !RP",
@@ -300,8 +300,8 @@ static int pim_mroute_msg_wholepkt(int fd, struct interface *ifp,
rpg = pim_ifp ? RP(pim_ifp->pim, sg.grp) : NULL;
- if ((pim_rpf_addr_is_inaddr_none(rpg)) || (!pim_ifp)
- || (!(PIM_I_am_DR(pim_ifp)))) {
+ if ((pim_rpf_addr_is_inaddr_any(rpg)) || (!pim_ifp) ||
+ (!(PIM_I_am_DR(pim_ifp)))) {
if (PIM_DEBUG_MROUTE) {
zlog_debug("%s: Failed Check send packet", __func__);
}