Merge pull request FRRouting#13822 from SaiGomathiN/regF

pim, pim6d: pimreg interface is not getting added in a certain scenario
opensourcerouting · Jun 24, 2023 · ab2f934 · ab2f934
2 parents 3cbc715 + fce0f28
commit ab2f934
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/pimd/pim_register.c b/pimd/pim_register.c
@@ -745,6 +745,7 @@ void pim_reg_del_on_couldreg_fail(struct interface *ifp)
 					    PIM_OIF_FLAG_PROTO_PIM, __func__);
 			EVENT_OFF(up->t_rs_timer);
 			up->reg_state = PIM_REG_NOINFO;
+			PIM_UPSTREAM_FLAG_UNSET_FHR(up->flags);
 		}
 	}
 }
diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
@@ -1713,6 +1713,7 @@ static void pim_upstream_register_stop_timer(struct event *t)
 				zlog_debug("%s: up %s RPF is not present",
 					   __func__, up->sg_str);
 			up->reg_state = PIM_REG_NOINFO;
+			PIM_UPSTREAM_FLAG_UNSET_FHR(up->flags);
 			return;
 		}