proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 11:18:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: re-eval JD on sources when a STAR_OIF is removed

Browse Source 
When a inherited OIL becomes empty join-desired can go to false. So
we need to re-run join-desired evaluation on any inherited OIL changes.

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
This commit is contained in:
Anuradha Karuppiah 2019-11-15 11:43:27 -08:00
parent d86632fba3
commit 1537a66871
4 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pimd/pim_ifchannel.c
View File

@ -162,9 +162,9 @@ void pim_ifchannel_delete(struct pim_ifchannel *ch)
for (ALL_LIST_ELEMENTS_RO(ch->upstream->sources, for (ALL_LIST_ELEMENTS_RO(ch->upstream->sources,
up_node, child)) up_node, child))
pim_channel_del_oif(child->channel_oil, pim_channel_del_inherited_oif(
child->channel_oil,
ch->interface, ch->interface,
PIM_OIF_FLAG_PROTO_STAR,
__func__); __func__);
} }
} }
@ -305,9 +305,8 @@ void pim_ifchannel_ifjoin_switch(const char *caller, struct pim_ifchannel *ch,
*/ */
if (c_oil->oil.mfcc_ttls if (c_oil->oil.mfcc_ttls
[pim_ifp->mroute_vif_index]) [pim_ifp->mroute_vif_index])
pim_channel_del_oif( pim_channel_del_inherited_oif(
c_oil, ch->interface, c_oil, ch->interface,
PIM_OIF_FLAG_PROTO_STAR,
__func__); __func__);
} }
} }
@ -1182,24 +1181,19 @@ void pim_ifchannel_local_membership_del(struct interface *ifp,
child->sg_str); child->sg_str);
ch = pim_ifchannel_find(ifp, &child->sg); ch = pim_ifchannel_find(ifp, &child->sg);
if (c_oil
&& !pim_upstream_evaluate_join_desired_interface(
child, ch, starch))
pim_channel_del_oif(c_oil, ifp,
PIM_OIF_FLAG_PROTO_STAR,
__func__);
/* /*
* If the S,G has no if channel and the c_oil still * If the S,G has no if channel and the c_oil still
* has output here then the *,G was supplying the * has output here then the *,G was supplying the
* implied * implied
* if channel. So remove it. * if channel. So remove it.
*/ */
if (!chchannel && c_oil if (!pim_upstream_evaluate_join_desired_interface(
&& c_oil->oil.mfcc_ttls[pim_ifp->mroute_vif_index]) child, ch, starch) ||
pim_channel_del_oif(c_oil, ifp, (!chchannel &&
PIM_OIF_FLAG_PROTO_STAR, c_oil->oil.mfcc_ttls[pim_ifp->mroute_vif_index])) {
pim_channel_del_inherited_oif(c_oil, ifp,
__func__); __func__);
}
/* Child node removal/ref count-- will happen as part of /* Child node removal/ref count-- will happen as part of
* parent' delete_no_info */ * parent' delete_no_info */

3
pimd/pim_join.c
View File

@ -337,10 +337,9 @@ int pim_joinprune_recv(struct interface *ifp, struct pim_neighbor *neigh,
"%s: SGRpt flag is set, del inherit oif from up %s", "%s: SGRpt flag is set, del inherit oif from up %s",
__PRETTY_FUNCTION__, __PRETTY_FUNCTION__,
up->sg_str); up->sg_str);
pim_channel_del_oif( pim_channel_del_inherited_oif(
up->channel_oil, up->channel_oil,
starg_ch->interface, starg_ch->interface,
PIM_OIF_FLAG_PROTO_STAR,
__func__); __func__);
} }
} }

15
pimd/pim_oil.c
View File

@ -352,6 +352,21 @@ int pim_channel_del_oif(struct channel_oil *channel_oil, struct interface *oif,
return 0; return 0;
} }
void pim_channel_del_inherited_oif(struct channel_oil *c_oil,
struct interface *oif, const char *caller)
{
struct pim_upstream *up = c_oil->up;
pim_channel_del_oif(c_oil, oif, PIM_OIF_FLAG_PROTO_STAR,
caller);
/* if an inherited OIF is being removed join-desired can change
* if the inherited OIL is now empty and KAT is running
*/
if (up && up->sg.src.s_addr != INADDR_ANY &&
pim_upstream_empty_inherited_olist(up))
pim_upstream_update_join_desired(up->pim, up);
}
static bool pim_channel_eval_oif_mute(struct channel_oil *c_oil, static bool pim_channel_eval_oif_mute(struct channel_oil *c_oil,
struct pim_interface *pim_ifp) struct pim_interface *pim_ifp)

3
pimd/pim_oil.h
View File

@ -136,4 +136,7 @@ void pim_channel_update_oif_mute(struct channel_oil *c_oil,
struct pim_interface *pim_ifp); struct pim_interface *pim_ifp);
void pim_channel_oil_upstream_deref(struct channel_oil *c_oil); void pim_channel_oil_upstream_deref(struct channel_oil *c_oil);
void pim_channel_del_inherited_oif(struct channel_oil *c_oil,
struct interface *oif, const char *caller);
#endif /* PIM_OIL_H */ #endif /* PIM_OIL_H */