Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 13:37:17 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

lib: In sockunion.c convert v6 memcmp's to IPV6_ADDR_CMP

Browse source 
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2024-10-31 10:06:26 -04:00
parent 1cb6b71b40
commit ff9781ebf5
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/sockunion.c
View file

@ -403,8 +403,7 @@ int sockunion_same(const union sockunion *su1, const union sockunion *su2)
sizeof(struct in_addr)); sizeof(struct in_addr));
break; break;
case AF_INET6: case AF_INET6:
ret = memcmp(&su1->sin6.sin6_addr, &su2->sin6.sin6_addr, ret = IPV6_ADDR_CMP(&su1->sin6.sin6_addr, &su2->sin6.sin6_addr);
sizeof(struct in6_addr));
if ((ret == 0) && IN6_IS_ADDR_LINKLOCAL(&su1->sin6.sin6_addr)) { if ((ret == 0) && IN6_IS_ADDR_LINKLOCAL(&su1->sin6.sin6_addr)) {
/* compare interface indices */ /* compare interface indices */
if (su1->sin6.sin6_scope_id && su2->sin6.sin6_scope_id) if (su1->sin6.sin6_scope_id && su2->sin6.sin6_scope_id)
@ -604,7 +603,7 @@ int sockunion_cmp(const union sockunion *su1, const union sockunion *su2)
return -1; return -1;
} }
if (su1->sa.sa_family == AF_INET6) if (su1->sa.sa_family == AF_INET6)
return IN6_ADDR_CMP(&su1->sin6.sin6_addr, &su2->sin6.sin6_addr); return IPV6_ADDR_CMP(&su1->sin6.sin6_addr, &su2->sin6.sin6_addr);
return 0; return 0;
} }
@ -711,8 +710,7 @@ int sockunion_is_null(const union sockunion *su)
case AF_INET: case AF_INET:
return (su->sin.sin_addr.s_addr == 0); return (su->sin.sin_addr.s_addr == 0);
case AF_INET6: case AF_INET6:
return !memcmp(su->sin6.sin6_addr.s6_addr, null_s6_addr, return !IPV6_ADDR_CMP(su->sin6.sin6_addr.s6_addr, null_s6_addr);
sizeof(null_s6_addr));
default: default:
return 0; return 0;
} }