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

- Merge changes between 3.0.3RC1 and 3.0.4-BETA-3 into HEAD (silence

Browse Source 
robie).
This commit is contained in:
David Hankins
2006-02-24 23:16:32 +00:00
parent b43c87ad59
commit 88cd8aca9e
48 changed files with 1171 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
common/tables.c
View File

@@ -3,7 +3,7 @@
Tables of information... */
/*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 2004-2006 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1995-2003 by Internet Software Consortium
*
* Permission to use, copy, modify, and distribute this software for any
@@ -34,7 +34,7 @@
#ifndef lint
static char copyright[] =
"$Id: tables.c,v 1.53 2005/03/17 20:15:00 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium. All rights reserved.\n";
"$Id: tables.c,v 1.54 2006/02/24 23:16:28 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -58,6 +58,9 @@ HASH_FUNCTIONS (option, const char *, struct option, option_hash_t, 0, 0)
b - 8-bit signed integer
B - 8-bit unsigned integer
t - ASCII text
T - Lease Time, 32-bit unsigned integer implying a number of seconds from
some event. The special all-ones value means 'infinite'. May either
be printed as a decimal, eg, "3600", or as this name, eg, "infinite".
f - flag (true or false)
A - array of whatever precedes (e.g., IA means array of IP addresses)
a - array of the preceding character (e.g., IIa means two or more IP
@@ -102,7 +105,7 @@ struct option dhcp_options [256] = {
{ "lpr-servers", "IA", &dhcp_universe, 9 },
{ "impress-servers", "IA", &dhcp_universe, 10 },
{ "resource-location-servers", "IA", &dhcp_universe, 11 },
{ "host-name", "X", &dhcp_universe, 12 },
{ "host-name", "t", &dhcp_universe, 12 },
{ "boot-size", "S", &dhcp_universe, 13 },
{ "merit-dump", "t", &dhcp_universe, 14 },
{ "domain-name", "t", &dhcp_universe, 15 },
@@ -152,7 +155,7 @@ struct option dhcp_options [256] = {
{ "dhcp-rebinding-time", "L", &dhcp_universe, 59 },
{ "vendor-class-identifier", "X", &dhcp_universe, 60 },
{ "dhcp-client-identifier", "X", &dhcp_universe, 61 },
{ "nwip-domain", "X", &dhcp_universe, 62 },
{ "nwip-domain", "t", &dhcp_universe, 62 },
{ "nwip-suboptions", "Enwip.", &dhcp_universe, 63 },
{ "nisplus-domain", "t", &dhcp_universe, 64 },
{ "nisplus-servers", "IA", &dhcp_universe, 65 },
@@ -176,8 +179,8 @@ struct option dhcp_options [256] = {
{ "unknown-83", "X", &dhcp_universe, 83 },
{ "unknown-84", "X", &dhcp_universe, 84 },
{ "nds-servers", "IA", &dhcp_universe, 85 },
{ "nds-tree-name", "X", &dhcp_universe, 86 },
{ "nds-context", "X", &dhcp_universe, 87 },
{ "nds-tree-name", "t", &dhcp_universe, 86 },
{ "nds-context", "t", &dhcp_universe, 87 },
{ "unknown-88", "X", &dhcp_universe, 88 },
{ "unknown-89", "X", &dhcp_universe, 89 },
{ "unknown-90", "X", &dhcp_universe, 90 },
@@ -208,7 +211,7 @@ struct option dhcp_options [256] = {
{ "unknown-115", "X", &dhcp_universe, 115 },
{ "unknown-116", "X", &dhcp_universe, 116 },
{ "unknown-117", "X", &dhcp_universe, 117 },
{ "subnet-selection", "X", &dhcp_universe, 118 },
{ "subnet-selection", "I", &dhcp_universe, 118 },
{ "unknown-119", "X", &dhcp_universe, 119 },
{ "unknown-120", "X", &dhcp_universe, 120 },
{ "unknown-121", "X", &dhcp_universe, 121 },
@@ -608,6 +611,15 @@ struct option nwip_options [256] = {
{ "unknown-end", "e", &nwip_universe, 255 },
};
/* Note that the "FQDN suboption space" does not reflect the FQDN option
* format - rather, this is a handy "virtualization" of a flat option
* which makes manual configuration and presentation of some of its
* contents easier (each of these suboptions is a fixed-space field within
* the fqdn contents - domain and host names are derived from a common field,
* and differ in the left and right hand side of the leftmost dot, fqdn is
* the combination of the two).
*/
struct universe fqdn_universe;
struct option fqdn_options [256] = {
{ "pad", "", &fqdn_universe, 0 },