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

pim6d: Modify pim_rp_set_upstream_addr for PIMv4/PIMv6

Browse Source 
Modify pim_rp_set_upstream_addr for supporting PIMv4 and PIMv6.
Removed the stub api for PIMv6.

Signed-off-by: Mobashshera Rasool <mrasool@vmware.com>
This commit is contained in:
Mobashshera Rasool 2022-02-17 10:54:47 -08:00
parent c6ced47492
commit b1e132ac61
1 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
pimd/pim_rp.c
View File

@ -1108,6 +1108,20 @@ struct pim_rpf *pim_rp_g(struct pim_instance *pim, pim_addr group)
return NULL; return NULL;
} }
#else
CPP_NOTICE("functions stubbed out for IPv6");
int pim_rp_i_am_rp(struct pim_instance *pim, pim_addr group)
{
return 0;
}
struct pim_rpf *pim_rp_g(struct pim_instance *pim, pim_addr group)
{
return NULL;
}
#endif
/* /*
* Set the upstream IP address we want to talk to based upon * Set the upstream IP address we want to talk to based upon
* the rp configured and the source address * the rp configured and the source address
@ -1123,45 +1137,27 @@ int pim_rp_set_upstream_addr(struct pim_instance *pim, pim_addr *up,
struct prefix g; struct prefix g;
memset(&g, 0, sizeof(g)); memset(&g, 0, sizeof(g));
g.family = AF_INET;
g.prefixlen = IPV4_MAX_BITLEN; pim_addr_to_prefix(&g, group);
g.u.prefix4 = group;
rp_info = pim_rp_find_match_group(pim, &g); rp_info = pim_rp_find_match_group(pim, &g);
if (!rp_info || ((pim_rpf_addr_is_inaddr_any(&rp_info->rp)) && if (!rp_info || ((pim_rpf_addr_is_inaddr_any(&rp_info->rp)) &&
(source.s_addr == INADDR_ANY))) { (pim_addr_is_any(source)))) {
if (PIM_DEBUG_PIM_NHT_RP) if (PIM_DEBUG_PIM_NHT_RP)
zlog_debug("%s: Received a (*,G) with no RP configured", zlog_debug("%s: Received a (*,G) with no RP configured",
__func__); __func__);
up->s_addr = INADDR_ANY; *up = PIMADDR_ANY;
return 0; return 0;
} }
*up = (source.s_addr == INADDR_ANY) ? rp_info->rp.rpf_addr.u.prefix4 if (pim_addr_is_any(source))
: source; *up = pim_addr_from_prefix(&rp_info->rp.rpf_addr);
else
*up = source;
return 1; return 1;
} }
#else
CPP_NOTICE("functions stubbed out for IPv6");
int pim_rp_i_am_rp(struct pim_instance *pim, pim_addr group)
{
return 0;
}
struct pim_rpf *pim_rp_g(struct pim_instance *pim, pim_addr group)
{
return NULL;
}
int pim_rp_set_upstream_addr(struct pim_instance *pim, pim_addr *up,
pim_addr source, pim_addr group)
{
return 0;
}
#endif
int pim_rp_config_write(struct pim_instance *pim, struct vty *vty, int pim_rp_config_write(struct pim_instance *pim, struct vty *vty,
const char *spaces) const char *spaces)