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

- A bug was repaired where MAC Address Affinity for virgin leases always

Browse Source 
mapped to the primary.  Virgin leases now have an interleaved preference
  between primary and secondary. [ISC-Bugs #17174]

- A bug was repaired where MAC Address Affinity for clients with no client
  identifier was sometimes mishashed to the peer.  Load balancing during
  runtime and pool rebalancing were opposing. [ISC-Bugs #17174]
This commit is contained in:
David Hankins
2007-09-27 15:28:05 +00:00
parent d7ec175bc0
commit 1418fd1103
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/failover.c
View File

@@ -5502,10 +5502,18 @@ peer_wants_lease(struct lease *lp)
return 0;
if (lp->uid_len)
hbaix = loadb_p_hash (lp->uid, lp->uid_len);
else
hbaix = loadb_p_hash (lp->hardware_addr.hbuf,
lp->hardware_addr.hlen);
hbaix = loadb_p_hash(lp->uid, lp->uid_len);
else if (lp->hardware_addr.hlen > 1)
/* Skip the first byte, which is the hardware type, and is
* not included during actual load balancing checks above
* since it is separate from the packet header chaddr field.
* The remainder of the hardware address should be identical
* to the chaddr contents.
*/
hbaix = loadb_p_hash(lp->hardware_addr.hbuf + 1,
lp->hardware_addr.hlen - 1);
else /* Consistent 50/50 split */
return(lp->ip_addr.iabuf[lp->ip_addr.len-1] & 0x01);
hm = state->hba[(hbaix >> 3) & 0x1F] & (1 << (hbaix & 0x07));