diff --git a/pimd/pim_rp.c b/pimd/pim_rp.c index d59124cebd..e2ee6656d1 100644 --- a/pimd/pim_rp.c +++ b/pimd/pim_rp.c @@ -1066,6 +1066,14 @@ struct pim_rpf *pim_rp_g(struct pim_instance *pim, pim_addr group) if (rp_info) { pim_addr nht_p; + if (pim_addr_is_any(rp_info->rp.rpf_addr)) { + if (PIM_DEBUG_PIM_NHT_RP) + zlog_debug( + "%s: Skipping NHT Register since RP is not configured for the group %pPA", + __func__, &group); + return &rp_info->rp; + } + /* Register addr with Zebra NHT */ nht_p = rp_info->rp.rpf_addr; if (PIM_DEBUG_PIM_NHT_RP)