Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 13:37:17 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

pimd: Re-align pim_msg_get_jp_group_size

Browse source 
This function was/is heavily indented, let's refactor
this a bit.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2024-01-12 12:00:45 -05:00
parent 8006207a92
commit 413c0ebe5b
1 changed files with 64 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
pimd/pim_msg.c
View file

@ -185,84 +185,78 @@ size_t pim_msg_get_jp_group_size(struct list *sources)
size += sizeof(pim_encoded_source) * sources->count; size += sizeof(pim_encoded_source) * sources->count;
js = listgetdata(listhead(sources)); js = listgetdata(listhead(sources));
if (js && pim_addr_is_any(js->up->sg.src) && js->is_join) { if (!js || !pim_addr_is_any(js->up->sg.src) || !js->is_join)
struct pim_upstream *child, *up; return size;
struct listnode *up_node;
up = js->up; struct pim_upstream *child, *up;
if (PIM_DEBUG_PIM_PACKETS) struct listnode *up_node;
zlog_debug(
"%s: Considering (%s) children for (S,G,rpt) prune",
__func__, up->sg_str);
for (ALL_LIST_ELEMENTS_RO(up->sources, up_node, child)) { up = js->up;
/* if (PIM_DEBUG_PIM_PACKETS)
* PIM VXLAN is weird zlog_debug("%s: Considering (%s) children for (S,G,rpt) prune",
* It auto creates the S,G and populates a bunch __func__, up->sg_str);
* of flags that make it look like a SPT prune should
* be sent. But this regularly scheduled join for (ALL_LIST_ELEMENTS_RO(up->sources, up_node, child)) {
* for the *,G in the VXLAN setup can happen at /*
* scheduled times *before* the null register * PIM VXLAN is weird
* is received by the RP to cause it to initiate * It auto creates the S,G and populates a bunch
* the S,G joins toward the source. Let's just * of flags that make it look like a SPT prune should
* assume that if this is a SRC VXLAN ORIG route * be sent. But this regularly scheduled join
* and no actual ifchannels( joins ) have been * for the *,G in the VXLAN setup can happen at
* created then do not send the embedded prune * scheduled times *before* the null register
* Why you may ask? Well if the prune is S,G * is received by the RP to cause it to initiate
* RPT Prune is received *before* the join * the S,G joins toward the source. Let's just
* from the RP( if it flows to this routers * assume that if this is a SRC VXLAN ORIG route
* upstream interface ) then we'll just wisely * and no actual ifchannels( joins ) have been
* create a mroute with an empty oil on * created then do not send the embedded prune
* the upstream intermediate router preventing * Why you may ask? Well if the prune is S,G
* packets from flowing to the RP * RPT Prune is received *before* the join
* from the RP( if it flows to this routers
* upstream interface ) then we'll just wisely
* create a mroute with an empty oil on
* the upstream intermediate router preventing
* packets from flowing to the RP
*/
if (PIM_UPSTREAM_FLAG_TEST_SRC_VXLAN_ORIG(child->flags) &&
listcount(child->ifchannels) == 0) {
if (PIM_DEBUG_PIM_PACKETS)
zlog_debug("%s: %s Vxlan originated S,G route with no ifchannels, not adding prune to compound message",
__func__, child->sg_str);
} else if (!PIM_UPSTREAM_FLAG_TEST_USE_RPT(child->flags)) {
/* If we are using SPT and the SPT and RPT IIFs
* are different we can prune the source off
* of the RPT.
* If RPF_interface(S) is not resolved hold
* decision to prune as SPT may end up on the
* same IIF as RPF_interface(RP).
*/ */
if (PIM_UPSTREAM_FLAG_TEST_SRC_VXLAN_ORIG(child->flags) && if (child->rpf.source_nexthop.interface &&
listcount(child->ifchannels) == 0) { !pim_rpf_is_same(&up->rpf, &child->rpf)) {
if (PIM_DEBUG_PIM_PACKETS)
zlog_debug("%s: %s Vxlan originated S,G route with no ifchannels, not adding prune to compound message",
__func__, child->sg_str);
} else if (!PIM_UPSTREAM_FLAG_TEST_USE_RPT(child->flags)) {
/* If we are using SPT and the SPT and RPT IIFs
* are different we can prune the source off
* of the RPT.
* If RPF_interface(S) is not resolved hold
* decision to prune as SPT may end up on the
* same IIF as RPF_interface(RP).
*/
if (child->rpf.source_nexthop.interface &&
!pim_rpf_is_same(&up->rpf,
&child->rpf)) {
size += sizeof(pim_encoded_source);
PIM_UPSTREAM_FLAG_SET_SEND_SG_RPT_PRUNE(
child->flags);
if (PIM_DEBUG_PIM_PACKETS)
zlog_debug(
"%s: SPT Bit and RPF'(%s) != RPF'(S,G): Add Prune (%s,rpt) to compound message",
__func__, up->sg_str,
child->sg_str);
} else if (PIM_DEBUG_PIM_PACKETS)
zlog_debug(
"%s: SPT Bit and RPF'(%s) == RPF'(S,G): Not adding Prune for (%s,rpt)",
__func__, up->sg_str,
child->sg_str);
} else if (pim_upstream_empty_inherited_olist(child)) {
/* S is supposed to be forwarded along the RPT
* but it's inherited OIL is empty. So just
* prune it off.
*/
size += sizeof(pim_encoded_source); size += sizeof(pim_encoded_source);
PIM_UPSTREAM_FLAG_SET_SEND_SG_RPT_PRUNE( PIM_UPSTREAM_FLAG_SET_SEND_SG_RPT_PRUNE(
child->flags); child->flags);
if (PIM_DEBUG_PIM_PACKETS) if (PIM_DEBUG_PIM_PACKETS)
zlog_debug( zlog_debug("%s: SPT Bit and RPF'(%s) != RPF'(S,G): Add Prune (%s,rpt) to compound message",
"%s: inherited_olist(%s,rpt) is NULL, Add Prune to compound message", __func__, up->sg_str,
__func__, child->sg_str); child->sg_str);
} else if (PIM_DEBUG_PIM_PACKETS) } else if (PIM_DEBUG_PIM_PACKETS)
zlog_debug( zlog_debug("%s: SPT Bit and RPF'(%s) == RPF'(S,G): Not adding Prune for (%s,rpt)",
"%s: Do not add Prune %s to compound message %s", __func__, up->sg_str, child->sg_str);
__func__, child->sg_str, up->sg_str); } else if (pim_upstream_empty_inherited_olist(child)) {
} /* S is supposed to be forwarded along the RPT
* but it's inherited OIL is empty. So just
* prune it off.
*/
size += sizeof(pim_encoded_source);
PIM_UPSTREAM_FLAG_SET_SEND_SG_RPT_PRUNE(child->flags);
if (PIM_DEBUG_PIM_PACKETS)
zlog_debug("%s: inherited_olist(%s,rpt) is NULL, Add Prune to compound message",
__func__, child->sg_str);
} else if (PIM_DEBUG_PIM_PACKETS)
zlog_debug("%s: Do not add Prune %s to compound message %s",
__func__, child->sg_str, up->sg_str);
} }
return size; return size;
} }