diff options
| author | Mobashshera Rasool <mrasool@vmware.com> | 2022-02-21 03:21:48 -0800 |
|---|---|---|
| committer | Mobashshera Rasool <mrasool@vmware.com> | 2022-03-08 00:57:51 -0800 |
| commit | 131ded0891132bd0705809c96bfed6added818ef (patch) | |
| tree | 81e1c7267552a9a4d206e996363297050ee33c34 /pimd/pim_rp.c | |
| parent | b1e132ac61f3404dfc6db4f5ee395aa859a571f7 (diff) | |
pim6d: Modify pim_rp_i_am_rp for PIMv4/PIMv6
Remove pim_rp_i_am_rp from stub for PIMv6.
Modify pim_rp_i_am_rp for both the daemons.
Signed-off-by: Mobashshera Rasool <mrasool@vmware.com>
Diffstat (limited to 'pimd/pim_rp.c')
| -rw-r--r-- | pimd/pim_rp.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/pimd/pim_rp.c b/pimd/pim_rp.c index be2f7ccdd8..e8c5c4ddb3 100644 --- a/pimd/pim_rp.c +++ b/pimd/pim_rp.c @@ -1045,7 +1045,6 @@ void pim_i_am_rp_re_evaluate(struct pim_instance *pim) } } -#if PIM_IPV == 4 /* * I_am_RP(G) is true if the group-to-RP mapping indicates that * this router is the RP for the group. @@ -1058,10 +1057,7 @@ int pim_rp_i_am_rp(struct pim_instance *pim, pim_addr group) struct rp_info *rp_info; memset(&g, 0, sizeof(g)); - g.family = AF_INET; - g.prefixlen = IPV4_MAX_BITLEN; - g.u.prefix4 = group; - + pim_addr_to_prefix(&g, group); rp_info = pim_rp_find_match_group(pim, &g); if (rp_info) @@ -1069,6 +1065,7 @@ int pim_rp_i_am_rp(struct pim_instance *pim, pim_addr group) return 0; } +#if PIM_IPV == 4 /* * RP(G) * @@ -1111,11 +1108,6 @@ struct pim_rpf *pim_rp_g(struct pim_instance *pim, pim_addr group) #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; |