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

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

Browse Source 
Merges in 47062
This commit is contained in:
Thomas Markwalder
2018-01-26 13:09:57 -05:00
parent b94669fa89
commit efd3b1e291
4 changed files with 97 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
common/tables.c
View File

@@ -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 0
/* PXELINUX options: defined by RFC 5071 */
#if defined(RFC5071_OPTIONS)
#if 0
/* 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 },
@@ -365,10 +366,10 @@ static struct option dhcpv6_options[] = {
{ "relay-msg", "X", &dhcpv6_universe, 9, 1 },
/* Option code 10 is curiously unassigned. */
/*
/*
* In draft-ietf-dhc-dhcpv6-25 there were two OPTION_CLIENT_MSG and
* OPTION_SERVER_MSG options. They were eventually unified as
* OPTION_RELAY_MSG, hence no option with value of 10.
* OPTION_RELAY_MSG, hence no option with value of 10.
*/
#if 0
/* XXX: missing suitable atoms for the auth option. We may want