mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-07 22:29:23 +00:00
pimd: Abstract a RPF change for upstream handling
Abstract the RPF change for upstream handling code so that we do not have two copies of the code. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp
parent
7438923168
commit
cc67ccf9f3
@ -300,59 +300,9 @@ static int pim_update_upstream_nh_helper(struct hash_backet *backet, void *arg)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rpf_result == PIM_RPF_CHANGED) {
|
if (rpf_result == PIM_RPF_CHANGED)
|
||||||
struct pim_neighbor *nbr;
|
pim_zebra_upstream_rpf_changed(pim, up, &old);
|
||||||
|
|
||||||
nbr = pim_neighbor_find(old.source_nexthop.interface,
|
|
||||||
old.rpf_addr.u.prefix4);
|
|
||||||
if (nbr)
|
|
||||||
pim_jp_agg_remove_group(nbr->upstream_jp_agg, up);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* We have detected a case where we might need to rescan
|
|
||||||
* the inherited o_list so do it.
|
|
||||||
*/
|
|
||||||
if (up->channel_oil && up->channel_oil->oil_inherited_rescan) {
|
|
||||||
pim_upstream_inherited_olist_decide(pim, up);
|
|
||||||
up->channel_oil->oil_inherited_rescan = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (up->join_state == PIM_UPSTREAM_JOINED) {
|
|
||||||
/*
|
|
||||||
* If we come up real fast we can be here
|
|
||||||
* where the mroute has not been installed
|
|
||||||
* so install it.
|
|
||||||
*/
|
|
||||||
if (up->channel_oil && !up->channel_oil->installed)
|
|
||||||
pim_mroute_add(up->channel_oil,
|
|
||||||
__PRETTY_FUNCTION__);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* RFC 4601: 4.5.7. Sending (S,G) Join/Prune Messages
|
|
||||||
*
|
|
||||||
* Transitions from Joined State
|
|
||||||
*
|
|
||||||
* RPF'(S,G) changes not due to an Assert
|
|
||||||
*
|
|
||||||
* The upstream (S,G) state machine remains in Joined
|
|
||||||
* state. Send Join(S,G) to the new upstream
|
|
||||||
* neighbor, which is the new value of RPF'(S,G).
|
|
||||||
* Send Prune(S,G) to the old upstream neighbor, which
|
|
||||||
* is the old value of RPF'(S,G). Set the Join
|
|
||||||
* Timer (JT) to expire after t_periodic seconds.
|
|
||||||
*/
|
|
||||||
pim_jp_agg_switch_interface(&old, &up->rpf, up);
|
|
||||||
|
|
||||||
pim_upstream_join_timer_restart(up, &old);
|
|
||||||
} /* up->join_state == PIM_UPSTREAM_JOINED */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* FIXME can join_desired actually be changed by
|
|
||||||
* pim_rpf_update() returning PIM_RPF_CHANGED ?
|
|
||||||
*/
|
|
||||||
pim_upstream_update_join_desired(pim, up);
|
|
||||||
|
|
||||||
} /* PIM_RPF_CHANGED */
|
|
||||||
|
|
||||||
if (PIM_DEBUG_PIM_NHT) {
|
if (PIM_DEBUG_PIM_NHT) {
|
||||||
zlog_debug("%s: NHT upstream %s(%s) old ifp %s new ifp %s",
|
zlog_debug("%s: NHT upstream %s(%s) old ifp %s new ifp %s",
|
||||||
|
|||||||
114
pimd/pim_zebra.c
114
pimd/pim_zebra.c
@ -449,6 +449,62 @@ void pim_zebra_update_all_interfaces(struct pim_instance *pim)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void pim_zebra_upstream_rpf_changed(struct pim_instance *pim,
|
||||||
|
struct pim_upstream *up,
|
||||||
|
struct pim_rpf *old)
|
||||||
|
{
|
||||||
|
struct pim_neighbor *nbr;
|
||||||
|
|
||||||
|
nbr = pim_neighbor_find(old->source_nexthop.interface,
|
||||||
|
old->rpf_addr.u.prefix4);
|
||||||
|
if (nbr)
|
||||||
|
pim_jp_agg_remove_group(nbr->upstream_jp_agg, up);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* We have detected a case where we might need
|
||||||
|
* to rescan the inherited o_list so do it.
|
||||||
|
*/
|
||||||
|
if (up->channel_oil->oil_inherited_rescan) {
|
||||||
|
pim_upstream_inherited_olist_decide(pim, up);
|
||||||
|
up->channel_oil->oil_inherited_rescan = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (up->join_state == PIM_UPSTREAM_JOINED) {
|
||||||
|
/*
|
||||||
|
* If we come up real fast we can be here
|
||||||
|
* where the mroute has not been installed
|
||||||
|
* so install it.
|
||||||
|
*/
|
||||||
|
if (!up->channel_oil->installed)
|
||||||
|
pim_mroute_add(up->channel_oil, __PRETTY_FUNCTION__);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* RFC 4601: 4.5.7. Sending (S,G)
|
||||||
|
* Join/Prune Messages
|
||||||
|
*
|
||||||
|
* Transitions from Joined State
|
||||||
|
*
|
||||||
|
* RPF'(S,G) changes not due to an Assert
|
||||||
|
*
|
||||||
|
* The upstream (S,G) state machine remains
|
||||||
|
* in Joined state. Send Join(S,G) to the new
|
||||||
|
* upstream neighbor, which is the new value
|
||||||
|
* of RPF'(S,G). Send Prune(S,G) to the old
|
||||||
|
* upstream neighbor, which is the old value
|
||||||
|
* of RPF'(S,G). Set the Join Timer (JT) to
|
||||||
|
* expire after t_periodic seconds.
|
||||||
|
*/
|
||||||
|
pim_jp_agg_switch_interface(old, &up->rpf, up);
|
||||||
|
|
||||||
|
pim_upstream_join_timer_restart(up, old);
|
||||||
|
} /* up->join_state == PIM_UPSTREAM_JOINED */
|
||||||
|
|
||||||
|
/* FIXME can join_desired actually be changed by
|
||||||
|
pim_rpf_update()
|
||||||
|
returning PIM_RPF_CHANGED ? */
|
||||||
|
pim_upstream_update_join_desired(pim, up);
|
||||||
|
}
|
||||||
|
|
||||||
static void scan_upstream_rpf_cache(struct pim_instance *pim)
|
static void scan_upstream_rpf_cache(struct pim_instance *pim)
|
||||||
{
|
{
|
||||||
struct listnode *up_node;
|
struct listnode *up_node;
|
||||||
@ -472,62 +528,8 @@ static void scan_upstream_rpf_cache(struct pim_instance *pim)
|
|||||||
if (rpf_result == PIM_RPF_FAILURE)
|
if (rpf_result == PIM_RPF_FAILURE)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (rpf_result == PIM_RPF_CHANGED) {
|
if (rpf_result == PIM_RPF_CHANGED)
|
||||||
struct pim_neighbor *nbr;
|
pim_zebra_upstream_rpf_changed(pim, up, &old);
|
||||||
|
|
||||||
nbr = pim_neighbor_find(old.source_nexthop.interface,
|
|
||||||
old.rpf_addr.u.prefix4);
|
|
||||||
if (nbr)
|
|
||||||
pim_jp_agg_remove_group(nbr->upstream_jp_agg,
|
|
||||||
up);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* We have detected a case where we might need
|
|
||||||
* to rescan
|
|
||||||
* the inherited o_list so do it.
|
|
||||||
*/
|
|
||||||
if (up->channel_oil->oil_inherited_rescan) {
|
|
||||||
pim_upstream_inherited_olist_decide(pim, up);
|
|
||||||
up->channel_oil->oil_inherited_rescan = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (up->join_state == PIM_UPSTREAM_JOINED) {
|
|
||||||
/*
|
|
||||||
* If we come up real fast we can be here
|
|
||||||
* where the mroute has not been installed
|
|
||||||
* so install it.
|
|
||||||
*/
|
|
||||||
if (!up->channel_oil->installed)
|
|
||||||
pim_mroute_add(up->channel_oil,
|
|
||||||
__PRETTY_FUNCTION__);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* RFC 4601: 4.5.7. Sending (S,G)
|
|
||||||
* Join/Prune Messages
|
|
||||||
*
|
|
||||||
* Transitions from Joined State
|
|
||||||
*
|
|
||||||
* RPF'(S,G) changes not due to an Assert
|
|
||||||
*
|
|
||||||
* The upstream (S,G) state machine remains
|
|
||||||
* in Joined state. Send Join(S,G) to the new
|
|
||||||
* upstream neighbor, which is the new value
|
|
||||||
* of RPF'(S,G). Send Prune(S,G) to the old
|
|
||||||
* upstream neighbor, which is the old value
|
|
||||||
* of RPF'(S,G). Set the Join Timer (JT) to
|
|
||||||
* expire after t_periodic seconds.
|
|
||||||
*/
|
|
||||||
pim_jp_agg_switch_interface(&old, &up->rpf, up);
|
|
||||||
|
|
||||||
pim_upstream_join_timer_restart(up, &old);
|
|
||||||
} /* up->join_state == PIM_UPSTREAM_JOINED */
|
|
||||||
|
|
||||||
/* FIXME can join_desired actually be changed by
|
|
||||||
pim_rpf_update()
|
|
||||||
returning PIM_RPF_CHANGED ? */
|
|
||||||
pim_upstream_update_join_desired(pim, up);
|
|
||||||
|
|
||||||
} /* PIM_RPF_CHANGED */
|
|
||||||
|
|
||||||
} /* for (qpim_upstream_list) */
|
} /* for (qpim_upstream_list) */
|
||||||
|
|
||||||
|
|||||||
@ -48,4 +48,7 @@ void sched_rpf_cache_refresh(struct pim_instance *pim);
|
|||||||
struct zclient *pim_zebra_zclient_get(void);
|
struct zclient *pim_zebra_zclient_get(void);
|
||||||
|
|
||||||
void pim_zebra_update_all_interfaces(struct pim_instance *pim);
|
void pim_zebra_update_all_interfaces(struct pim_instance *pim);
|
||||||
|
void pim_zebra_upstream_rpf_changed(struct pim_instance *pim,
|
||||||
|
struct pim_upstream *up,
|
||||||
|
struct pim_rpf *old);
|
||||||
#endif /* PIM_ZEBRA_H */
|
#endif /* PIM_ZEBRA_H */
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user