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

- Cleaned up an unused hardware address variable in nak_lease().

Browse Source 
[ISC-Bugs #15382]
This commit is contained in:
David Hankins 2010-02-01 22:03:15 +00:00
parent d1f31a0065
commit 3c941d426d
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELNOTES
View File

@ -45,6 +45,8 @@ work on other platforms. Please report any problems and suggested fixes to
- When using 'ignore client-updates;', the FQDN returned to the client
is no longer truncated to one octet.
- Cleaned up an unused hardware address variable in nak_lease().
- Manpage entries for the ia-pd and ia-prefix options were updated to
reflect support for prefix delegation.

22
server/dhcp.c
View File

@ -1303,7 +1303,6 @@ void nak_lease (packet, cip)
struct dhcp_packet raw;
unsigned char nak = DHCPNAK;
struct packet outgoing;
struct hardware hto;
unsigned i;
struct option_state *options = (struct option_state *)0;
struct option_cache *oc = (struct option_cache *)0;
@ -1405,8 +1404,6 @@ void nak_lease (packet, cip)
? inet_ntoa (packet -> raw -> giaddr)
: packet -> interface -> name);
#ifdef DEBUG_PACKET
dump_packet (packet);
dump_raw ((unsigned char *)packet -> raw, packet -> packet_length);
@ -1414,13 +1411,6 @@ void nak_lease (packet, cip)
dump_raw ((unsigned char *)&raw, outgoing.packet_length);
#endif
#if 0
hto.hbuf [0] = packet -> raw -> htype;
hto.hlen = packet -> raw -> hlen;
memcpy (&hto.hbuf [1], packet -> raw -> chaddr, hto.hlen);
hto.hlen++;
#endif
/* Set up the common stuff... */
to.sin_family = AF_INET;
#ifdef HAVE_SA_LEN
@ -1442,10 +1432,9 @@ void nak_lease (packet, cip)
to.sin_port = remote_port; /* for testing. */
if (fallback_interface) {
result = send_packet (fallback_interface,
packet, &raw,
outgoing.packet_length,
from, &to, &hto);
result = send_packet(fallback_interface, packet, &raw,
outgoing.packet_length, from, &to,
NULL);
return;
}
} else {
@ -1454,9 +1443,8 @@ void nak_lease (packet, cip)
}
errno = 0;
result = send_packet (packet -> interface,
packet, &raw, outgoing.packet_length,
from, &to, (struct hardware *)0);
result = send_packet(packet->interface, packet, &raw,
outgoing.packet_length, from, &to, NULL);
}
void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp)