mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 14:35:26 +00:00
Code Issues Releases Wiki Activity

isc_sockaddr_equal() wasn't matching sockets that really were equal because

Browse Source 
it was comparing the sin_zero fields which weren't equal.
This commit is contained in:
Bob Halley
1999-07-12 18:43:53 +00:00
parent b677cd01b0
commit 3724ec85fb
1 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/isc/sockaddr.c
View File

@@ -30,13 +30,39 @@
isc_boolean_t
isc_sockaddr_equal(isc_sockaddr_t *a, isc_sockaddr_t *b)
{
unsigned int length;
REQUIRE(a != NULL && b != NULL);
if (a->length != b->length)
return (ISC_FALSE);
if (memcmp(&a->type, &b->type, a->length) != 0)
/*
* We don't just memcmp because the sin_zero field isn't always
* zero.
*/
if (a->type.sa.sa_family != b->type.sa.sa_family)
return (ISC_FALSE);
switch (a->type.sa.sa_family) {
case AF_INET:
if (memcmp(&a->type.sin.sin_addr, &b->type.sin.sin_addr,
sizeof a->type.sin.sin_addr) != 0)
return (ISC_FALSE);
if (a->type.sin.sin_port != b->type.sin.sin_port)
return (ISC_FALSE);
break;
case AF_INET6:
if (memcmp(&a->type.sin6.sin6_addr, &b->type.sin6.sin6_addr,
sizeof a->type.sin6.sin6_addr) != 0)
return (ISC_FALSE);
if (a->type.sin6.sin6_port != b->type.sin6.sin6_port)
return (ISC_FALSE);
break;
default:
if (memcmp(&a->type, &b->type, a->length) != 0)
return (ISC_FALSE);
}
return (ISC_TRUE);
}