diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2021-11-22 14:30:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-22 14:30:18 +0100 |
| commit | cfbf74a9a13493044fb963eaee41360f31edca46 (patch) | |
| tree | 07185a9ffc592c1e2c1988a570628c0d39f90712 /pimd/pim_zebra.c | |
| parent | Merge pull request #10102 from idryzhov/match-ip-nexthop (diff) | |
| parent | pimd: fix event order for forward_stop() (diff) | |
| download | frr-cfbf74a9a13493044fb963eaee41360f31edca46.tar.xz frr-cfbf74a9a13493044fb963eaee41360f31edca46.zip | |
Merge pull request #10088 from opensourcerouting/pim-forward-stop
pimd: fix stale forwarding entries left around after join goes away
Diffstat (limited to 'pimd/pim_zebra.c')
| -rw-r--r-- | pimd/pim_zebra.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c index e01ee4b81..3a08c6aee 100644 --- a/pimd/pim_zebra.c +++ b/pimd/pim_zebra.c @@ -845,14 +845,14 @@ void pim_forward_start(struct pim_ifchannel *ch) mask, __func__); } -void pim_forward_stop(struct pim_ifchannel *ch, bool install_it) +void pim_forward_stop(struct pim_ifchannel *ch) { struct pim_upstream *up = ch->upstream; if (PIM_DEBUG_PIM_TRACE) { - zlog_debug("%s: (S,G)=%s oif=%s install_it: %d installed: %d", + zlog_debug("%s: (S,G)=%s oif=%s installed: %d", __func__, ch->sg_str, ch->interface->name, - install_it, up->channel_oil->installed); + up->channel_oil->installed); } /* @@ -865,9 +865,6 @@ void pim_forward_stop(struct pim_ifchannel *ch, bool install_it) else pim_channel_del_oif(up->channel_oil, ch->interface, PIM_OIF_FLAG_PROTO_PIM, __func__); - - if (install_it && !up->channel_oil->installed) - pim_upstream_mroute_add(up->channel_oil, __func__); } void pim_zebra_zclient_update(struct vty *vty) |