mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-03 15:56:00 +00:00
Code Issues Releases Wiki Activity

Move warning about dhcp-renewal-time to config parsing rather

Browse Source 
than runtime.
See RT ticket #17382 for more.
This commit is contained in:
Shane Kerr
2008-01-14 14:26:10 +00:00
parent c4d29896d3
commit 57fcb8d97a
3 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/confpars.c
View File

@@ -687,6 +687,26 @@ int parse_statement (cfile, group, type, host_decl, declaration)
return declaration;
}
/*
* If the configuration attempts to define on option
* that we ignore, then warn about it now.
*
* In DHCPv4 we do not use dhcp-renewal-time or
* dhcp-rebinding-time, but we use these in DHCPv6.
*
* XXX: We may want to include a "blacklist" of
* options we ignore in the future, as a table.
*/
if ((option->code == DHO_DHCP_LEASE_TIME) ||
((local_family != AF_INET6) &&
((option->code == DHO_DHCP_RENEWAL_TIME) ||
(option->code == DHO_DHCP_REBINDING_TIME))))
{
log_error("WARNING: server ignoring option %s "
"in configuration file.",
option->name);
}
finish_option:
et = (struct executable_statement *)0;
if (!parse_option_statement

9
server/dhcp.c
View File

@@ -2522,9 +2522,6 @@ void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp)
putULong(state->expiry, (u_int32_t)offered_lease_time);
i = DHO_DHCP_LEASE_TIME;
if (lookup_option (&dhcp_universe, state -> options, i))
log_error ("dhcp-lease-time option for %s overridden.",
inet_ntoa (state -> ciaddr));
oc = (struct option_cache *)0;
if (option_cache_allocate (&oc, MDL)) {
if (make_const_data(&oc->expression, state->expiry,
@@ -2542,9 +2539,6 @@ void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp)
offered_lease_time /= 2;
putULong(state->renewal, (u_int32_t)offered_lease_time);
i = DHO_DHCP_RENEWAL_TIME;
if (lookup_option (&dhcp_universe, state -> options, i))
log_error ("overriding dhcp-renewal-time for %s.",
inet_ntoa (state -> ciaddr));
oc = (struct option_cache *)0;
if (option_cache_allocate (&oc, MDL)) {
if (make_const_data(&oc->expression, state->renewal,
@@ -2563,9 +2557,6 @@ void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp)
+ offered_lease_time / 4);
putULong(state->rebind, (u_int32_t)offered_lease_time);
i = DHO_DHCP_REBINDING_TIME;
if (lookup_option (&dhcp_universe, state -> options, i))
log_error ("overriding dhcp-rebinding-time for %s.",
inet_ntoa (state -> ciaddr));
oc = (struct option_cache *)0;
if (option_cache_allocate (&oc, MDL)) {
if (make_const_data(&oc->expression, state->rebind,