diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2022-01-28 17:17:53 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2022-02-04 16:54:26 +0100 |
| commit | 2d51f27f028412ad089ff1f910f6489eb917631d (patch) | |
| tree | 0f7e43abd81a66868d7dfed4d325624f237ca209 /pimd/pim_bsm.c | |
| parent | Merge pull request #10469 from mjstapp/fix_dplane_netlink_groups (diff) | |
| download | frr-2d51f27f028412ad089ff1f910f6489eb917631d.tar.xz frr-2d51f27f028412ad089ff1f910f6489eb917631d.zip | |
pimd: Only remove bsr NHT if we actually have tracked something
I'm now seeing in my log file:
2022/01/28 11:20:05 PIM: [Q0PZ7-QBBN3] attempting to delete nonexistent NHT BSR entry 0.0.0.0
2022/01/28 11:20:05 PIM: [Q0PZ7-QBBN3] attempting to delete nonexistent NHT BSR entry 0.0.0.0
2022/01/28 11:20:06 PIM: [Q0PZ7-QBBN3] attempting to delete nonexistent NHT BSR entry 0.0.0.0
When I run pimd. Looking at the code there are 3 places where pim_bsm.c removes the
NHT BSR tracking. In 2 of them the code ensures that the address is already setup
in 1 place it is not. Fix.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to '')
| -rw-r--r-- | pimd/pim_bsm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pimd/pim_bsm.c b/pimd/pim_bsm.c index 238c19d2c..cd50cdd67 100644 --- a/pimd/pim_bsm.c +++ b/pimd/pim_bsm.c @@ -171,7 +171,8 @@ static int pim_on_bs_timer(struct thread *t) zlog_debug("%s: Bootstrap Timer expired for scope: %d", __func__, scope->sz_id); - pim_nht_bsr_del(scope->pim, scope->current_bsr); + if (scope->current_bsr.s_addr) + pim_nht_bsr_del(scope->pim, scope->current_bsr); /* Reset scope zone data */ scope->accept_nofwd_bsm = false; |