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

pim6d: IPV6 adjust in hash_calc_on_grp_rp

Browse source 
Signed-off-by: sarita patra <saritap@vmware.com>
This commit is contained in:
sarita patra 2022-04-27 04:17:48 -07:00 committed by Sarita Patra
parent f0e91749df
commit c0590b1c59
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pimd/pim_bsm.c
View file

@ -1029,7 +1029,7 @@ struct bsgrp_node *pim_bsm_get_bsgrp_node(struct bsm_scope *scope,
return bsgrp; return bsgrp;
} }
static uint32_t hash_calc_on_grp_rp(struct prefix group, struct in_addr rp, static uint32_t hash_calc_on_grp_rp(struct prefix group, pim_addr rp,
uint8_t hashmasklen) uint8_t hashmasklen)
{ {
uint64_t temp; uint64_t temp;
@ -1047,14 +1047,24 @@ static uint32_t hash_calc_on_grp_rp(struct prefix group, struct in_addr rp,
/* in_addr stores ip in big endian, hence network byte order /* in_addr stores ip in big endian, hence network byte order
* convert to uint32 before processing hash * convert to uint32 before processing hash
*/ */
#if PIM_IPV == 4
grpaddr = ntohl(group.u.prefix4.s_addr); grpaddr = ntohl(group.u.prefix4.s_addr);
#else
grpaddr = group.u.prefix6.s6_addr32[0] ^ group.u.prefix6.s6_addr32[1] ^
group.u.prefix6.s6_addr32[2] ^ group.u.prefix6.s6_addr32[3];
#endif
/* Avoid shifting by 32 bit on a 32 bit register */ /* Avoid shifting by 32 bit on a 32 bit register */
if (hashmasklen) if (hashmasklen)
grpaddr = grpaddr & ((mask << (32 - hashmasklen))); grpaddr = grpaddr & ((mask << (32 - hashmasklen)));
else else
grpaddr = grpaddr & mask; grpaddr = grpaddr & mask;
#if PIM_IPV == 4
rp_add = ntohl(rp.s_addr); rp_add = ntohl(rp.s_addr);
#else
rp_add = rp.s6_addr32[0] ^ rp.s6_addr32[1] ^ rp.s6_addr32[2] ^
rp.s6_addr32[3];
#endif
temp = 1103515245 * ((1103515245 * (uint64_t)grpaddr + 12345) ^ rp_add) temp = 1103515245 * ((1103515245 * (uint64_t)grpaddr + 12345) ^ rp_add)
+ 12345; + 12345;
hash = temp & (0x7fffffff); hash = temp & (0x7fffffff);