diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2022-01-14 16:55:12 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2022-02-14 06:45:03 +0100 |
| commit | c631920c151f0130986cb9051daa710bb0eb261b (patch) | |
| tree | bc3351777ea0323aa17ebd2878516a31a29e75ad /pimd/pim_upstream.c | |
| parent | pim6d: prepare SSM/filter functions (diff) | |
| download | frr-c631920c151f0130986cb9051daa710bb0eb261b.tar.xz frr-c631920c151f0130986cb9051daa710bb0eb261b.zip | |
pim6d: IPv6-adjust various pim_sgaddr uses
Since `pim_sgaddr` is `pim_addr` now, that causes a whole lot of fallout
anywhere S,G pairs are handled.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'pimd/pim_upstream.c')
| -rw-r--r-- | pimd/pim_upstream.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c index 800ec9c45..68fb5ba38 100644 --- a/pimd/pim_upstream.c +++ b/pimd/pim_upstream.c @@ -2153,10 +2153,7 @@ void pim_upstream_remove_lhr_star_pimreg(struct pim_instance *pim, struct prefix g; enum prefix_list_type apply_new; - np = prefix_list_lookup(AFI_IP, nlist); - - g.family = AF_INET; - g.prefixlen = IPV4_MAX_BITLEN; + np = prefix_list_lookup(PIM_AFI, nlist); frr_each (rb_pim_upstream, &pim->upstream_head, up) { if (!pim_addr_is_any(up->sg.src)) @@ -2170,7 +2167,7 @@ void pim_upstream_remove_lhr_star_pimreg(struct pim_instance *pim, PIM_OIF_FLAG_PROTO_IGMP, __func__); continue; } - g.u.prefix4 = up->sg.grp; + pim_addr_to_prefix(&g, up->sg.grp); apply_new = prefix_list_apply(np, &g); if (apply_new == PREFIX_DENY) pim_channel_add_oif(up->channel_oil, pim->regiface, |