From 80d9fa1e68a48786c8208dea3ef1171a7d3ccc38 Mon Sep 17 00:00:00 2001
From: David Lamparter <equinox@opensourcerouting.org>
Date: Fri, 14 Jan 2022 17:23:51 +0100
Subject: [PATCH] pim6d: prepare SSM/filter functions

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---
 pimd/pim_ssm.c  | 9 +++------
 pimd/pim_ssm.h  | 2 +-
 pimd/pim_util.c | 8 +++-----
 pimd/pim_util.h | 2 +-
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/pimd/pim_ssm.c b/pimd/pim_ssm.c
index 6c5883aebf..45aac7756a 100644
--- a/pimd/pim_ssm.c
+++ b/pimd/pim_ssm.c
@@ -83,23 +83,20 @@ static int pim_is_grp_standard_ssm(struct prefix *group)
 	return prefix_match(&group_ssm, group);
 }
 
-int pim_is_grp_ssm(struct pim_instance *pim, struct in_addr group_addr)
+int pim_is_grp_ssm(struct pim_instance *pim, pim_addr group_addr)
 {
 	struct pim_ssm *ssm;
 	struct prefix group;
 	struct prefix_list *plist;
 
-	memset(&group, 0, sizeof(group));
-	group.family = AF_INET;
-	group.u.prefix4 = group_addr;
-	group.prefixlen = 32;
+	pim_addr_to_prefix(&group, group_addr);
 
 	ssm = pim->ssm_info;
 	if (!ssm->plist_name) {
 		return pim_is_grp_standard_ssm(&group);
 	}
 
-	plist = prefix_list_lookup(AFI_IP, ssm->plist_name);
+	plist = prefix_list_lookup(PIM_AFI, ssm->plist_name);
 	if (!plist)
 		return 0;
 
diff --git a/pimd/pim_ssm.h b/pimd/pim_ssm.h
index 7235ade8dc..117713b866 100644
--- a/pimd/pim_ssm.h
+++ b/pimd/pim_ssm.h
@@ -34,7 +34,7 @@ struct pim_ssm {
 
 void pim_ssm_prefix_list_update(struct pim_instance *pim,
 				struct prefix_list *plist);
-int pim_is_grp_ssm(struct pim_instance *pim, struct in_addr group_addr);
+int pim_is_grp_ssm(struct pim_instance *pim, pim_addr group_addr);
 int pim_ssm_range_set(struct pim_instance *pim, vrf_id_t vrf_id,
 		      const char *plist_name);
 void *pim_ssm_init(void);
diff --git a/pimd/pim_util.c b/pimd/pim_util.c
index decc491ede..8232d7205b 100644
--- a/pimd/pim_util.c
+++ b/pimd/pim_util.c
@@ -139,7 +139,7 @@ int pim_is_group_224_4(struct in_addr group_addr)
 	return prefix_match(&group_all, &group);
 }
 
-bool pim_is_group_filtered(struct pim_interface *pim_ifp, struct in_addr *grp)
+bool pim_is_group_filtered(struct pim_interface *pim_ifp, pim_addr *grp)
 {
 	struct prefix grp_pfx;
 	struct prefix_list *pl;
@@ -147,10 +147,8 @@ bool pim_is_group_filtered(struct pim_interface *pim_ifp, struct in_addr *grp)
 	if (!pim_ifp->boundary_oil_plist)
 		return false;
 
-	grp_pfx.family = AF_INET;
-	grp_pfx.prefixlen = IPV4_MAX_BITLEN;
-	grp_pfx.u.prefix4 = *grp;
+	pim_addr_to_prefix(&grp_pfx, *grp);
 
-	pl = prefix_list_lookup(AFI_IP, pim_ifp->boundary_oil_plist);
+	pl = prefix_list_lookup(PIM_AFI, pim_ifp->boundary_oil_plist);
 	return pl ? prefix_list_apply(pl, &grp_pfx) == PREFIX_DENY : false;
 }
diff --git a/pimd/pim_util.h b/pimd/pim_util.h
index c66dd7b660..b9c227996e 100644
--- a/pimd/pim_util.h
+++ b/pimd/pim_util.h
@@ -35,5 +35,5 @@ void pim_pkt_dump(const char *label, const uint8_t *buf, int size);
 
 int pim_is_group_224_0_0_0_24(struct in_addr group_addr);
 int pim_is_group_224_4(struct in_addr group_addr);
-bool pim_is_group_filtered(struct pim_interface *pim_ifp, struct in_addr *grp);
+bool pim_is_group_filtered(struct pim_interface *pim_ifp, pim_addr *grp);
 #endif /* PIM_UTIL_H */
-- 
2.39.5