proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 16:07:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pim6d: Modify pim_rp_find_exact and pim_rp_find_match_group

Browse Source 
Modify the apis to accomodate IPv4 and IPv6 addreses for RP.

Signed-off-by: Mobashshera Rasool <mrasool@vmware.com>
This commit is contained in:
Mobashshera Rasool 2022-02-21 05:47:08 -08:00
parent 9dca52b924
commit fd5540ead6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pimd/pim_rp.c
View File

@ -188,16 +188,17 @@ static int pim_rp_prefix_list_used(struct pim_instance *pim, const char *plist)
* Given an RP's address, return the RP's rp_info that is an exact match for * Given an RP's address, return the RP's rp_info that is an exact match for
* 'group' * 'group'
*/ */
static struct rp_info *pim_rp_find_exact(struct pim_instance *pim, static struct rp_info *pim_rp_find_exact(struct pim_instance *pim, pim_addr rp,
struct in_addr rp,
const struct prefix *group) const struct prefix *group)
{ {
struct listnode *node; struct listnode *node;
struct rp_info *rp_info; struct rp_info *rp_info;
struct prefix rp_prefix;
pim_addr_to_prefix(&rp_prefix, rp);
for (ALL_LIST_ELEMENTS_RO(pim->rp_list, node, rp_info)) { for (ALL_LIST_ELEMENTS_RO(pim->rp_list, node, rp_info)) {
if (rp.s_addr == rp_info->rp.rpf_addr.u.prefix4.s_addr if (prefix_same(&rp_prefix, &rp_info->rp.rpf_addr) &&
&& prefix_same(&rp_info->group, group)) prefix_same(&rp_info->group, group))
return rp_info; return rp_info;
} }
@ -241,7 +242,7 @@ struct rp_info *pim_rp_find_match_group(struct pim_instance *pim,
bp = NULL; bp = NULL;
for (ALL_LIST_ELEMENTS_RO(pim->rp_list, node, rp_info)) { for (ALL_LIST_ELEMENTS_RO(pim->rp_list, node, rp_info)) {
if (rp_info->plist) { if (rp_info->plist) {
plist = prefix_list_lookup(AFI_IP, rp_info->plist); plist = prefix_list_lookup(PIM_AFI, rp_info->plist);
if (prefix_list_apply_ext(plist, &entry, group, true) if (prefix_list_apply_ext(plist, &entry, group, true)
== PREFIX_DENY || !entry) == PREFIX_DENY || !entry)
@ -557,8 +558,7 @@ int pim_rp_new(struct pim_instance *pim, pim_addr rp_addr, struct prefix group,
/* /*
* Return if the group is already configured for this RP * Return if the group is already configured for this RP
*/ */
tmp_rp_info = pim_rp_find_exact( tmp_rp_info = pim_rp_find_exact(pim, rp_addr, &rp_info->group);
pim, rp_info->rp.rpf_addr.u.prefix4, &rp_info->group);
if (tmp_rp_info) { if (tmp_rp_info) {
if ((tmp_rp_info->rp_src != rp_src_flag) if ((tmp_rp_info->rp_src != rp_src_flag)
&& (rp_src_flag == RP_SRC_STATIC)) && (rp_src_flag == RP_SRC_STATIC))