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

1495. [cleanup] Replace hash functions with universal hash.

Browse Source
This commit is contained in:
Mark Andrews
2003-07-25 02:22:26 +00:00
parent 4691e18ca0
commit 1e107b3d7b
18 changed files with 645 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/isc/sockaddr.c
View File

@@ -15,13 +15,14 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: sockaddr.c,v 1.56 2003/04/11 07:25:28 marka Exp $ */
/* $Id: sockaddr.c,v 1.57 2003/07/25 02:22:26 marka Exp $ */
#include <config.h>
#include <stdio.h>
#include <isc/buffer.h>
#include <isc/hash.h>
#include <isc/msgs.h>
#include <isc/netaddr.h>
#include <isc/print.h>
@@ -186,19 +187,17 @@ isc_sockaddr_hash(const isc_sockaddr_t *sockaddr, isc_boolean_t address_only) {
switch (sockaddr->type.sa.sa_family) {
case AF_INET:
h = ntohl(sockaddr->type.sin.sin_addr.s_addr);
s = (const unsigned char *)&sockaddr->type.sin.sin_addr;
p = ntohs(sockaddr->type.sin.sin_port);
length = sizeof(sockaddr->type.sin.sin_addr.s_addr);
break;
case AF_INET6:
in6 = &sockaddr->type.sin6.sin6_addr;
if (IN6_IS_ADDR_V4MAPPED(in6)) {
h = (in6->s6_addr[12] << 24) |
(in6->s6_addr[13] << 16) |
(in6->s6_addr[14] << 8) |
in6->s6_addr[15];
s = (const unsigned char *)&in6[12];
length = sizeof(sockaddr->type.sin.sin_addr.s_addr);
} else {
s = (const unsigned char *)&sockaddr->
type.sin6.sin6_addr;
s = (const unsigned char *)in6;
length = sizeof(sockaddr->type.sin6.sin6_addr);
}
p = ntohs(sockaddr->type.sin6.sin6_port);
@@ -214,22 +213,14 @@ isc_sockaddr_hash(const isc_sockaddr_t *sockaddr, isc_boolean_t address_only) {
length = sockaddr->length;
p = 0;
}
while (length > 0) {
h = ( h << 4 ) + *s;
if ((g = ( h & 0xf0000000 )) != 0) {
h = h ^ (g >> 24);
h = h ^ g;
}
s++;
length--;
}
h = isc_hash_calc(s, length, ISC_TRUE);
if (!address_only) {
h = h ^ (p << 4);
if ((g = ( h & 0xf0000000 )) != 0) {
h = h ^ (g >> 24);
h = h ^ g;
}
g = isc_hash_calc((const unsigned char *)&p, sizeof(p),
ISC_TRUE);
h = h ^ g; /* XXX: we should concatenate h and p first */
}
return (h);
}