Commit efd3b1e2 authored by Thomas Markwalder's avatar Thomas Markwalder

[master] Includes DHCP4 option definitions for RFCs 4578,5071, and 5859

    Merges in 47062
parent b94669fa
......@@ -97,6 +97,14 @@ by Eric Young (eay@cryptsoft.com).
dad-wait-time is zero (the default), DAD error checking is not peformed.
[ISC-Bugs 46805]
- Support for sending and receiving additional DHCP4 options has been added
to both the dhcpd and dhclient. Specifically: option codes 93,94, and 97
(RFC 4578); code 150 (RFC 5859); and codes 209,219, and 211 (RFC 5071).
Beyond configuring, sending, requesting, and receiving these options neither
server nor client apply any additional logic based on their values.
Thanks to Peter Lewis for requesting this change.
[ISC-Bugs 47062]
Changes since 4.4.0b1 (Bug Fixes)
- Added clarifying text to dhcpd.conf.5 explaining the class match expressions
......
.\" $Id: dhcp-options.5,v 1.50 2011/05/20 13:48:32 tomasz Exp $
.\"
.\" Copyright (c) 2012-2016 by Internet Systems Consortium, Inc. ("ISC")
.\" Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC")
.\" Copyright (c) 2004-2018 by Internet Systems Consortium, Inc. ("ISC")
.\" Copyright (c) 1996-2003 by Internet Software Consortium
.\"
.\" Permission to use, copy, modify, and distribute this software for any
......@@ -581,6 +580,35 @@ forwarding, and a value of true means enable IP forwarding.
The IRC server option specifies a list of IRC servers available
to the client. Servers should be listed in order of preference.
.RE
.PP
.B option \fBloader-configfile\fR \fItext\fR
.RS 0.25i
.PP
This option is used to specify a boot loading configuration file
a PXE client should use.
.PP
This option is included based on RFC 5071.
.RE
.PP
.B option \fBloader-pathprefix\fR \fItext\fR
.RS 0.25i
.PP
This option is used to specify a path prefix a PXE client should
use in conjunction with the boot load configuration file.
.PP
This option is included based on RFC 5071.
.RE
.PP
.B option \fBloader-reboottime\fR \fIuint32\fR
.RS 0.25i
.PP
This option is used to dictate the maximum amount of time a
PXE client should allow itself to achieve configured network
resources before rebooting.
.PP
This option is included based on RFC 5071.
.RE
.PP
.B option \fBlog-servers\fR \fIip-address\fR [\fB,\fR \fIip-address\fR...
]\fB;\fR
......@@ -810,6 +838,33 @@ NetWare/IP suboptions - see the NETWARE/IP SUBOPTIONS section for more
information.
.RE
.PP
.B option \fBpxe-system-type\fR \fIuint16\fR [\fB, \fIuint16\fR ... ]\fB;\fR
.RS 0.25i
.PP
A list of one ore more 16-bit integers which allows a client to specify its
pre-boot architecture type(s).
.PP
This option is included based on RFC 4578.
.RE
.PP
.B option \fBpxe-interface-id\fR \fIuint8\fR \fIuint8\fR \fIuint8\fR
.RS 0.25i
.PP
A three octet value which allows a client to specify its network interface
type.
.PP
This option is included based on RFC 4578.
.RE
.PP
.B option \fBpxe-client-id\fR \fIuint8\fR \fIstring\fR
.RS 0.25i
.PP
A single octet indicating type, followed by a string that allows a
client to specify its PXE client identity.
.PP
This option is included based on RFC 4578.
.RE
.PP
.B option \fBoption-6rd\fR \fIuint8 uint8 ip6-address ip-address\fR [\fB,\fR
.I ip-address \fR...]\fB;\fR
.RS 0.25i
......@@ -966,7 +1021,7 @@ If you have an NDS directory agent whose address you need to
configure, the slp-directory-agent option should work.
.RE
.PP
.B option slp-service-scope \fIboolean text\fR\fB;\fR
.B option \fBslp-service-scope\fR \fIboolean text\fR\fB;\fR
.RS 0.25i
.PP
The Service Location Protocol Service Scope Option specifies two
......@@ -1067,6 +1122,16 @@ This option is not user configurable in the server.
This specifies the IP address of the client's swap server.
.RE
.PP
.B option \fBtftp-server-address\fR \fIip-address\fR [\fB,\fR
\fIip-address\fR... ]\fB;\fR
.RS 0.25i
.PP
This option configures a list of one or more IPv4 addresses of
tftp servers a client may use.
.PP
This option is included based on RFC 5859
.RE
.PP
.B option \fBtcp-keepalive-garbage\fR \fIflag\fR\fB;\fR
.RS 0.25i
.PP
......
......@@ -3,7 +3,7 @@
Tables of information... */
/*
* Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 2004-2018 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1995-2003 by Internet Software Consortium
*
* This Source Code Form is subject to the terms of the Mozilla Public
......@@ -191,9 +191,9 @@ static struct option dhcp_options[] = {
{ "client-last-transaction-time", "L", &dhcp_universe, 91, 1 },
{ "associated-ip", "Ia", &dhcp_universe, 92, 1 },
#if 0
#if defined(RFC4578_OPTIONS)
/* Defined by RFC 4578 */
{ "pxe-system-type", "S", &dhcp_universe, 93, 1 },
{ "pxe-system-type", "Sa", &dhcp_universe, 93, 1 },
{ "pxe-interface-id", "BBB", &dhcp_universe, 94, 1 },
{ "pxe-client-id", "BX", &dhcp_universe, 97, 1 },
#endif
......@@ -250,8 +250,7 @@ static struct option dhcp_options[] = {
#if defined(RFC6731_OPTIONS)
{ "rdnss-selection", "BIID", &dhcp_universe, 146, 1 },
#endif
#if 0
/* Not defined by RFC yet */
#if defined(RFC5859_OPTIONS)
{ "tftp-server-address", "Ia", &dhcp_universe, 150, 1 },
#endif
#if defined(RFC7618_OPTIONS)
......@@ -260,9 +259,11 @@ static struct option dhcp_options[] = {
#if defined(RFC7710_OPTIONS)
{ "v4-captive-portal", "t", &dhcp_universe, 160, 1 },
#endif
#if defined(RFC5071_OPTIONS)
#if 0
/* PXELINUX options: defined by RFC 5071 */
/* Option 208 has been officially deprecated. Do NOT define it */
{ "pxelinux-magic", "BBBB", &dhcp_universe, 208, 1 },
#endif
{ "loader-configfile", "t", &dhcp_universe, 209, 1 },
{ "loader-pathprefix", "t", &dhcp_universe, 210, 1 },
{ "loader-reboottime", "L", &dhcp_universe, 211, 1 },
......
......@@ -350,12 +350,15 @@
#define RFC2563_OPTIONS
#define RFC2937_OPTIONS
#define RFC4776_OPTIONS
#define RFC4578_OPTIONS
#define RFC4833_OPTIONS
#define RFC4994_OPTIONS
#define RFC5071_OPTIONS
#define RFC5192_OPTIONS
#define RFC5223_OPTIONS
#define RFC5417_OPTIONS
#define RFC5460_OPTIONS
#define RFC5859_OPTIONS
#define RFC5969_OPTIONS
#define RFC5970_OPTIONS
#define RFC5986_OPTIONS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment