diff options
author | Jafar Al-Gharaibeh <Jafaral@users.noreply.github.com> | 2019-04-04 06:02:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-04 06:02:32 +0200 |
commit | dbf2f94c2cfd713b54f31becb9582c219463d507 (patch) | |
tree | 6897f394f2511aa36ca0ed2f47aaa08ecc54379f /pimd/pim_mroute.c | |
parent | Merge pull request #4070 from donaldsharp/static_fixup (diff) | |
parent | pimd: pim_nexthop_lookup should return true/false (diff) | |
download | frr-dbf2f94c2cfd713b54f31becb9582c219463d507.tar.xz frr-dbf2f94c2cfd713b54f31becb9582c219463d507.zip |
Merge pull request #4060 from donaldsharp/pim_cherrybomb
Pim cherrybomb
Diffstat (limited to 'pimd/pim_mroute.c')
-rw-r--r-- | pimd/pim_mroute.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c index 999a1eb58..a2d50aba5 100644 --- a/pimd/pim_mroute.c +++ b/pimd/pim_mroute.c @@ -513,8 +513,7 @@ static int pim_mroute_msg_wrvifwhole(int fd, struct interface *ifp, if (!PIM_UPSTREAM_FLAG_TEST_FHR(up->flags)) { // No if channel, but upstream we are at the RP. if (pim_nexthop_lookup(pim_ifp->pim, &source, - up->upstream_register, 0) - == 0) { + up->upstream_register, 0)) { pim_register_stop_send(source.interface, &sg, pim_ifp->primary_address, up->upstream_register); @@ -531,8 +530,8 @@ static int pim_mroute_msg_wrvifwhole(int fd, struct interface *ifp, } else { if (I_am_RP(pim_ifp->pim, up->sg.grp)) { if (pim_nexthop_lookup(pim_ifp->pim, &source, - up->upstream_register, 0) - == 0) + up->upstream_register, + 0)) pim_register_stop_send( source.interface, &sg, pim_ifp->primary_address, |