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

DHCPv6 branch merged to HEAD.

Browse Source
This commit is contained in:
David Hankins
2007-05-08 23:05:22 +00:00
parent 74dc3e0b27
commit 98bd7ca099
112 changed files with 22575 additions and 17450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/bootp.c
View File

@@ -34,7 +34,7 @@
#ifndef lint
static char copyright[] =
"$Id: bootp.c,v 1.76 2006/08/09 14:57:48 dhankins Exp $ Copyright (c) 2004-2005 Internet Systems Consortium. All rights reserved.\n";
"$Id: bootp.c,v 1.77 2007/05/08 23:05:21 dhankins Exp $ Copyright (c) 2004-2005 Internet Systems Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -272,11 +272,12 @@ void bootp (packet)
memcpy (&raw.siaddr, d1.data, 4);
data_string_forget (&d1, MDL);
} else {
if (lease -> subnet -> shared_network -> interface)
raw.siaddr = (lease -> subnet -> shared_network ->
interface -> primary_address);
else
raw.siaddr = packet -> interface -> primary_address;
if ((lease->subnet->shared_network->interface != NULL) &&
lease->subnet->shared_network->interface->address_count)
raw.siaddr =
lease->subnet->shared_network->interface->addresses[0];
else if (packet->interface->address_count)
raw.siaddr = packet->interface->addresses[0];
}
raw.giaddr = packet -> raw -> giaddr;
@@ -326,7 +327,8 @@ void bootp (packet)
hto.hlen = packet -> raw -> hlen + 1;
memcpy (&hto.hbuf [1], packet -> raw -> chaddr, packet -> raw -> hlen);
from = packet -> interface -> primary_address;
if (packet->interface->address_count)
from = packet->interface->addresses[0];
/* Report what we're doing... */
log_info ("%s", msgbuf);