matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

pim6d: Modify pim_rp_new for pimv6

Browse source 
Modify the api pim_rp_new to accomodate pimv6 changes.

Signed-off-by: Mobashshera Rasool <mrasool@vmware.com>
This commit is contained in:
Mobashshera Rasool 2022-02-02 07:00:50 -08:00
parent 99384c6e4d
commit 6ed1cea1dc
3 changed files with 13 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pimd/pim_bsm.h
View file

@ -115,7 +115,7 @@ struct bsm_rpinfo {
uint32_t elapse_time; /* upd at expiry of elected RP node */ uint32_t elapse_time; /* upd at expiry of elected RP node */
uint16_t rp_prio; /* RP priority */ uint16_t rp_prio; /* RP priority */
uint16_t rp_holdtime; /* RP holdtime - g2rp timer value */ uint16_t rp_holdtime; /* RP holdtime - g2rp timer value */
struct in_addr rp_address; /* RP Address */ pim_addr rp_address; /* RP Address */
struct bsgrp_node *bsgrp_node; /* Back ptr to bsgrp_node */ struct bsgrp_node *bsgrp_node; /* Back ptr to bsgrp_node */
struct thread *g2rp_timer; /* Run only for elected RP node */ struct thread *g2rp_timer; /* Run only for elected RP node */
}; };

28
pimd/pim_rp.c
View file

@ -412,7 +412,7 @@ void pim_upstream_update(struct pim_instance *pim, struct pim_upstream *up)
} }
int pim_rp_new(struct pim_instance *pim, struct in_addr rp_addr, struct prefix group, int pim_rp_new(struct pim_instance *pim, pim_addr rp_addr, struct prefix group,
const char *plist, enum rp_source rp_src_flag) const char *plist, enum rp_source rp_src_flag)
{ {
int result = 0; int result = 0;
@ -427,14 +427,12 @@ int pim_rp_new(struct pim_instance *pim, struct in_addr rp_addr, struct prefix g
struct pim_upstream *up; struct pim_upstream *up;
bool upstream_updated = false; bool upstream_updated = false;
if (rp_addr.s_addr == INADDR_ANY) if (pim_addr_is_any(rp_addr))
return PIM_RP_BAD_ADDRESS; return PIM_RP_BAD_ADDRESS;
rp_info = XCALLOC(MTYPE_PIM_RP, sizeof(*rp_info)); rp_info = XCALLOC(MTYPE_PIM_RP, sizeof(*rp_info));
rp_info->rp.rpf_addr.family = AF_INET; pim_addr_to_prefix(&rp_info->rp.rpf_addr, rp_addr);
rp_info->rp.rpf_addr.prefixlen = IPV4_MAX_BITLEN;
rp_info->rp.rpf_addr.u.prefix4 = rp_addr;
prefix_copy(&rp_info->group, &group); prefix_copy(&rp_info->group, &group);
rp_info->rp_src = rp_src_flag; rp_info->rp_src = rp_src_flag;
@ -461,8 +459,8 @@ int pim_rp_new(struct pim_instance *pim, struct in_addr rp_addr, struct prefix g
*/ */
for (ALL_LIST_ELEMENTS(pim->rp_list, node, nnode, for (ALL_LIST_ELEMENTS(pim->rp_list, node, nnode,
tmp_rp_info)) { tmp_rp_info)) {
if (rp_info->rp.rpf_addr.u.prefix4.s_addr if (prefix_same(&rp_info->rp.rpf_addr,
== tmp_rp_info->rp.rpf_addr.u.prefix4.s_addr) { &tmp_rp_info->rp.rpf_addr)) {
if (tmp_rp_info->plist) if (tmp_rp_info->plist)
pim_rp_del_config(pim, rp_addr, NULL, pim_rp_del_config(pim, rp_addr, NULL,
tmp_rp_info->plist); tmp_rp_info->plist);
@ -497,10 +495,9 @@ int pim_rp_new(struct pim_instance *pim, struct in_addr rp_addr, struct prefix g
*/ */
for (ALL_LIST_ELEMENTS(pim->rp_list, node, nnode, for (ALL_LIST_ELEMENTS(pim->rp_list, node, nnode,
tmp_rp_info)) { tmp_rp_info)) {
if (tmp_rp_info->plist if (tmp_rp_info->plist &&
&& rp_info->rp.rpf_addr.u.prefix4.s_addr prefix_same(&rp_info->rp.rpf_addr,
== tmp_rp_info->rp.rpf_addr.u.prefix4 &tmp_rp_info->rp.rpf_addr)) {
.s_addr) {
pim_rp_del_config(pim, rp_addr, NULL, pim_rp_del_config(pim, rp_addr, NULL,
tmp_rp_info->plist); tmp_rp_info->plist);
} }
@ -516,10 +513,7 @@ int pim_rp_new(struct pim_instance *pim, struct in_addr rp_addr, struct prefix g
XFREE(MTYPE_PIM_RP, rp_info); XFREE(MTYPE_PIM_RP, rp_info);
/* Register addr with Zebra NHT */ /* Register addr with Zebra NHT */
nht_p.family = AF_INET; nht_p = rp_all->rp.rpf_addr;
nht_p.prefixlen = IPV4_MAX_BITLEN;
nht_p.u.prefix4 =
rp_all->rp.rpf_addr.u.prefix4; // RP address
if (PIM_DEBUG_PIM_NHT_RP) if (PIM_DEBUG_PIM_NHT_RP)
zlog_debug( zlog_debug(
"%s: NHT Register rp_all addr %pFX grp %pFX ", "%s: NHT Register rp_all addr %pFX grp %pFX ",
@ -640,9 +634,7 @@ int pim_rp_new(struct pim_instance *pim, struct in_addr rp_addr, struct prefix g
pim_rp_refresh_group_to_rp_mapping(pim); pim_rp_refresh_group_to_rp_mapping(pim);
/* Register addr with Zebra NHT */ /* Register addr with Zebra NHT */
nht_p.family = AF_INET; nht_p = rp_info->rp.rpf_addr;
nht_p.prefixlen = IPV4_MAX_BITLEN;
nht_p.u.prefix4 = rp_info->rp.rpf_addr.u.prefix4;
if (PIM_DEBUG_PIM_NHT_RP) if (PIM_DEBUG_PIM_NHT_RP)
zlog_debug("%s: NHT Register RP addr %pFX grp %pFX with Zebra ", zlog_debug("%s: NHT Register RP addr %pFX grp %pFX with Zebra ",
__func__, &nht_p, &rp_info->group); __func__, &nht_p, &rp_info->group);

5
pimd/pim_rp.h
View file

@ -47,9 +47,8 @@ void pim_rp_free(struct pim_instance *pim);
void pim_rp_list_hash_clean(void *data); void pim_rp_list_hash_clean(void *data);
int pim_rp_new(struct pim_instance *pim, struct in_addr rp_addr, int pim_rp_new(struct pim_instance *pim, pim_addr rp_addr, struct prefix group,
struct prefix group, const char *plist, const char *plist, enum rp_source rp_src_flag);
enum rp_source rp_src_flag);
void pim_rp_del_config(struct pim_instance *pim, pim_addr rp_addr, void pim_rp_del_config(struct pim_instance *pim, pim_addr rp_addr,
const char *group, const char *plist); const char *group, const char *plist);
int pim_rp_del(struct pim_instance *pim, struct in_addr rp_addr, int pim_rp_del(struct pim_instance *pim, struct in_addr rp_addr,