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

lib, tests: Remove in6addr_cmp function from the system

Browse source 
This function should just be memcmp.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2024-10-30 10:41:08 -04:00
parent 7ebda3892c
commit 1cb6b71b40
3 changed files with 1 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/sockunion.c
View file

@ -588,23 +588,6 @@ static void __attribute__((unused)) sockunion_print(const union sockunion *su)
}
}
int in6addr_cmp(const struct in6_addr *addr1, const struct in6_addr *addr2)
{
unsigned int i;
const uint8_t *p1, *p2;
p1 = (const uint8_t *)addr1;
p2 = (const uint8_t *)addr2;
for (i = 0; i < sizeof(struct in6_addr); i++) {
if (p1[i] > p2[i])
return 1;
else if (p1[i] < p2[i])
return -1;
}
return 0;
}
int sockunion_cmp(const union sockunion *su1, const union sockunion *su2)
{
if (su1->sa.sa_family > su2->sa.sa_family)

1
lib/sockunion.h
View file

@ -93,7 +93,6 @@ enum connect_result { connect_error, connect_success, connect_in_progress };
/* Prototypes. */
extern int str2sockunion(const char *, union sockunion *);
extern const char *sockunion2str(const union sockunion *, char *, size_t);
int in6addr_cmp(const struct in6_addr *addr1, const struct in6_addr *addr2);
extern int sockunion_cmp(const union sockunion *, const union sockunion *);
extern int sockunion_same(const union sockunion *, const union sockunion *);
extern unsigned int sockunion_hash(const union sockunion *);

2
tests/lib/test_frrlua.c
View file

@ -90,7 +90,7 @@ static void test_encode_decode(void)
lua_pushin6addr(L, &in6addr_a);
lua_decode_in6addr(L, -1, &in6addr_a);
assert(in6addr_cmp(&in6addr_a, &in6addr_b) == 0);
assert(memcmp(&in6addr_a, &in6addr_b, sizeof(struct in6_addr)) == 0);
assert(lua_gettop(L) == 0);
union sockunion su_a, su_b;