commit d6b749af91f1f0decfbb8018d6711092e539394a
author Simon Kelley <simon@thekelleys.org.uk> Mon Apr 25 17:05:15 2016 +0100
committer Simon Kelley <simon@thekelleys.org.uk> Mon Apr 25 17:05:15 2016 +0100
tree ef867064168fa31097b7182e24c98ed7d83782fc
parent 14ffa0770b546d6d7939a23add7122383f08fde5

Fix typo in SDBM hash function.

Thanks to Luis Carvalho for spotting the error.

src/dhcp.c

diff --git a/src/dhcp.c b/src/dhcp.c
index c11675d..00145bc 100644
--- a/src/dhcp.c
+++ b/src/dhcp.c
@@ -651,7 +651,7 @@
   /* hash hwaddr: use the SDBM hashing algorithm.  Seems to give good
      dispersal even with similarly-valued "strings". */ 
   for (j = 0, i = 0; i < hw_len; i++)
-    j += hwaddr[i] + (j << 6) + (j << 16) - j;
+    j = hwaddr[i] + (j << 6) + (j << 16) - j;
   
   for (pass = 0; pass <= 1; pass++)
     for (c = context; c; c = c->current)

src/dhcp6.c

diff --git a/src/dhcp6.c b/src/dhcp6.c
index 93a359e..56eb0da 100644
--- a/src/dhcp6.c
+++ b/src/dhcp6.c
@@ -420,7 +420,7 @@
     j = rand64();
   else
     for (j = iaid, i = 0; i < clid_len; i++)
-      j += clid[i] + (j << 6) + (j << 16) - j;
+      j = clid[i] + (j << 6) + (j << 16) - j;
   
   for (pass = 0; pass <= plain_range ? 1 : 0; pass++)
     for (c = context; c; c = c->current)