diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2022-11-04 16:55:55 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2022-11-04 17:17:39 +0100 |
| commit | ab2f9e89b44642af568c3542e1f2b14378fb5ec2 (patch) | |
| tree | e7ef08f89a3a1a0426a224689b977f205e9320cf | |
| parent | Merge pull request #12196 from opensourcerouting/xref-vtysh (diff) | |
| download | frr-ab2f9e89b44642af568c3542e1f2b14378fb5ec2.tar.xz frr-ab2f9e89b44642af568c3542e1f2b14378fb5ec2.zip | |
pimd: consistently ignore prefix list mask len
... the prefix length wasn't ignored as expected. Both S and G are
always /32. But expecting "le 32" in prefix-list config is unexpected &
counterintuitive.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
| -rw-r--r-- | pimd/pim_ifchannel.c | 5 | ||||
| -rw-r--r-- | pimd/pim_register.c | 3 | ||||
| -rw-r--r-- | pimd/pim_ssm.c | 3 | ||||
| -rw-r--r-- | pimd/pim_upstream.c | 2 | ||||
| -rw-r--r-- | pimd/pim_util.c | 4 |
5 files changed, 11 insertions, 6 deletions
diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c index ce252366c..3310009c0 100644 --- a/pimd/pim_ifchannel.c +++ b/pimd/pim_ifchannel.c @@ -1217,8 +1217,9 @@ int pim_ifchannel_local_membership_add(struct interface *ifp, pim_sgaddr *sg, struct prefix g; pim_addr_to_prefix(&g, up->sg.grp); - if (prefix_list_apply(plist, &g) - == PREFIX_DENY) { + if (prefix_list_apply_ext(plist, NULL, &g, + true) == + PREFIX_DENY) { pim_channel_add_oif( up->channel_oil, pim->regiface, PIM_OIF_FLAG_PROTO_GM, diff --git a/pimd/pim_register.c b/pimd/pim_register.c index a37759e0d..b62c646c3 100644 --- a/pimd/pim_register.c +++ b/pimd/pim_register.c @@ -628,7 +628,8 @@ int pim_register_recv(struct interface *ifp, pim_addr dest_addr, pim_addr_to_prefix(&src, sg.src); - if (prefix_list_apply(plist, &src) == PREFIX_DENY) { + if (prefix_list_apply_ext(plist, NULL, &src, true) == + PREFIX_DENY) { pim_register_stop_send(ifp, &sg, dest_addr, src_addr); if (PIM_DEBUG_PIM_PACKETS) diff --git a/pimd/pim_ssm.c b/pimd/pim_ssm.c index 1ff60f9b6..62246cc23 100644 --- a/pimd/pim_ssm.c +++ b/pimd/pim_ssm.c @@ -93,7 +93,8 @@ int pim_is_grp_ssm(struct pim_instance *pim, pim_addr group_addr) if (!plist) return 0; - return (prefix_list_apply(plist, &group) == PREFIX_PERMIT); + return (prefix_list_apply_ext(plist, NULL, &group, true) == + PREFIX_PERMIT); } int pim_ssm_range_set(struct pim_instance *pim, vrf_id_t vrf_id, diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c index 6b58fbb5c..4ef0bfaa4 100644 --- a/pimd/pim_upstream.c +++ b/pimd/pim_upstream.c @@ -2153,7 +2153,7 @@ void pim_upstream_remove_lhr_star_pimreg(struct pim_instance *pim, continue; } pim_addr_to_prefix(&g, up->sg.grp); - apply_new = prefix_list_apply(np, &g); + apply_new = prefix_list_apply_ext(np, NULL, &g, true); if (apply_new == PREFIX_DENY) pim_channel_add_oif(up->channel_oil, pim->regiface, PIM_OIF_FLAG_PROTO_GM, __func__); diff --git a/pimd/pim_util.c b/pimd/pim_util.c index 150e1a01e..273c332c9 100644 --- a/pimd/pim_util.c +++ b/pimd/pim_util.c @@ -150,7 +150,9 @@ bool pim_is_group_filtered(struct pim_interface *pim_ifp, pim_addr *grp) pim_addr_to_prefix(&grp_pfx, *grp); pl = prefix_list_lookup(PIM_AFI, pim_ifp->boundary_oil_plist); - return pl ? prefix_list_apply(pl, &grp_pfx) == PREFIX_DENY : false; + return pl ? prefix_list_apply_ext(pl, NULL, &grp_pfx, true) == + PREFIX_DENY + : false; } |