From 43a18948d5239271b9e777c2ec4b7770ef0dcb15 Mon Sep 17 00:00:00 2001 From: Sarita Patra Date: Tue, 25 Oct 2022 21:25:23 -0700 Subject: [PATCH] pimd, pim6d: Fix rp-info OIF having PIM disabled interface Problem: frr(config)# show ip pim rp-info RP address group/prefix-list OIF I am RP Source Group-Type 109.0.0.3 224.0.0.0/4 ens192 no Static ASM frr(config)# int ens192 frr(config-if)# no ip pim frr(config) show ip pim rp-info RP address group/prefix-list OIF I am RP Source Group-Type 109.0.0.3 224.0.0.0/4 ens192 no Static ASM rp-info OIF is still having ens192 which is PIM disabled. Fixing this as part of this PR. Issue: #12044 Signed-off-by: Sarita Patra --- pimd/pim_rp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pimd/pim_rp.c b/pimd/pim_rp.c index 1dce6b3562..c3e6a303fc 100644 --- a/pimd/pim_rp.c +++ b/pimd/pim_rp.c @@ -950,10 +950,12 @@ void pim_rp_setup(struct pim_instance *pim) pim_find_or_track_nexthop(pim, nht_p, NULL, rp_info, NULL); if (!pim_ecmp_nexthop_lookup(pim, &rp_info->rp.source_nexthop, - nht_p, &rp_info->group, 1)) + nht_p, &rp_info->group, 1)) { if (PIM_DEBUG_PIM_NHT_RP) zlog_debug( "Unable to lookup nexthop for rp specified"); + pim_rp_nexthop_del(rp_info); + } } } -- 2.39.5