diff options
| -rw-r--r-- | RELNOTES | 3 | ||||
| -rw-r--r-- | common/dhcp-options.5 | 19 | ||||
| -rw-r--r-- | server/dhcp.c | 6 | ||||
| -rw-r--r-- | server/dhcpd.conf.5 | 4 |
4 files changed, 19 insertions, 13 deletions
@@ -60,6 +60,9 @@ and for prodding me into improving it. - 'make install' now creates the initial zero-length dhcpd.leases file if one does not already exist on the system. +- RFC3942 compliance, site-local option spaces start at 224 now, not 128. + ||| THIS NEEDS TO BE SPELLED OUT IN THE NEW FEATURES LIST ||| + Changes since 3.0.3b3 - dhclient.conf documentation for interface {} was updated to reflect recent diff --git a/common/dhcp-options.5 b/common/dhcp-options.5 index 8728c681..102178fe 100644 --- a/common/dhcp-options.5 +++ b/common/dhcp-options.5 @@ -1,4 +1,4 @@ -.\" $Id: dhcp-options.5,v 1.25 2005/04/01 23:41:26 dhankins Exp $ +.\" $Id: dhcp-options.5,v 1.26 2005/09/30 19:15:55 dhankins Exp $ .\" .\" Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") .\" Copyright (c) 1996-2003 by Internet Software Consortium @@ -1229,13 +1229,16 @@ sure that future options don't take your name. For example, you might define an option, "local-host-name", feeling some confidence that no official DHCP option name will ever start with "local". .PP -Once you have chosen a name, you must choose a code. For site-local -options, all codes between 128 and 254 are reserved for DHCP options, -so you can pick any one of these. In practice, some vendors have -interpreted the protocol rather loosely and have used option code -values greater than 128 themselves. There's no real way to avoid -this problem, but it's not likely to cause too much trouble in -practice. +Once you have chosen a name, you must choose a code. All codes between +224 and 254 are reserved as 'site-local' DHCP options, so you can pick +any one of these for your site (not for your product/application). In +RFC3942, site-local space was moved from starting at 128 to starting at +224. In practice, some vendors have interpreted the protocol rather +loosely and have used option code values greater than 128 themselves. +There's no real way to avoid this problem, and it was thought to be +unlikely to cause too much trouble in practice. If you come across +a vendor-documented option code in either the new or old site-local +spaces, please contact your vendor and inform them about rfc3942. .PP The structure of an option is simply the format in which the option data appears. The ISC DHCP server currently supports a few simple diff --git a/server/dhcp.c b/server/dhcp.c index fee59a92..3cc266cf 100644 --- a/server/dhcp.c +++ b/server/dhcp.c @@ -34,7 +34,7 @@ #ifndef lint static char copyright[] = -"$Id: dhcp.c,v 1.198 2005/07/07 16:39:08 dhankins Exp $ Copyright (c) 2004-2005 Internet Systems Consortium. All rights reserved.\n"; +"$Id: dhcp.c,v 1.199 2005/09/30 19:15:55 dhankins Exp $ Copyright (c) 2004-2005 Internet Systems Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -1174,7 +1174,7 @@ void dhcpinform (packet, ms_nulltp) } options -> site_universe = u -> index; - options -> site_code_min = 128; /* XXX */ + options -> site_code_min = 224; /* XXX */ data_string_forget (&d1, MDL); } else { options -> site_universe = dhcp_universe.index; @@ -2632,7 +2632,7 @@ void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp) } state -> options -> site_universe = u -> index; - state -> options -> site_code_min = 128; /* XXX */ + state -> options -> site_code_min = 224; /* XXX */ data_string_forget (&d1, MDL); } else { state -> options -> site_code_min = 0; diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5 index 847b3458..a50a6ff2 100644 --- a/server/dhcpd.conf.5 +++ b/server/dhcpd.conf.5 @@ -28,7 +28,7 @@ .\" see ``http://www.vix.com''. To learn more about Nominum, Inc., see .\" ``http://www.nominum.com''. .\" -.\" $Id: dhcpd.conf.5,v 1.68 2005/07/07 16:39:08 dhankins Exp $ +.\" $Id: dhcpd.conf.5,v 1.69 2005/09/30 19:15:55 dhankins Exp $ .\" .TH dhcpd.conf 5 .SH NAME @@ -2252,7 +2252,7 @@ The \fIsite-option-space\fR statement can be used to determine from what option space site-local options will be taken. This can be used in much the same way as the \fIvendor-option-space\fR statement. Site-local options in DHCP are those options whose numeric codes are -greater than 128. These options are intended for site-specific +greater than 224. These options are intended for site-specific uses, but are frequently used by vendors of embedded hardware that contains DHCP clients. Because site-specific options are allocated on an ad hoc basis, it is quite possible that one vendor's DHCP client |