From 66b631bbce0f76a8ac8b7e449d641bf2d39e2b7b Mon Sep 17 00:00:00 2001 From: mbr Date: Tue, 2 Sep 2003 11:13:21 +0000 Subject: Resolve conflicts. --- contrib/isc-dhcp/client/clparse.c | 27 +- contrib/isc-dhcp/client/dhclient.conf.5 | 4 +- contrib/isc-dhcp/common/dhcp-options.5 | 30 +- contrib/isc-dhcp/common/tables.c | 1319 ++++++++++++++++--------------- contrib/isc-dhcp/includes/dhcpd.h | 5 + 5 files changed, 699 insertions(+), 686 deletions(-) (limited to 'contrib/isc-dhcp') diff --git a/contrib/isc-dhcp/client/clparse.c b/contrib/isc-dhcp/client/clparse.c index c2047dd..e07b3cf 100644 --- a/contrib/isc-dhcp/client/clparse.c +++ b/contrib/isc-dhcp/client/clparse.c @@ -43,7 +43,7 @@ #ifndef lint static char copyright[] = -"$Id: clparse.c,v 1.62.2.3 2002/11/17 02:25:43 dhankins Exp $ Copyright (c) 1996-2002 The Internet Software Consortium. All rights reserved.\n" +"$Id: clparse.c,v 1.62.2.4 2003/02/10 00:39:57 dhankins Exp $ Copyright (c) 1996-2002 The Internet Software Consortium. All rights reserved.\n" "$FreeBSD$\n"; #endif /* not lint */ @@ -620,34 +620,41 @@ void parse_option_list (cfile, list) struct parse *cfile; u_int32_t **list; { - int ix, i; + int ix; int token; const char *val; pair p = (pair)0, q, r; + struct option *option; ix = 0; do { - token = next_token (&val, (unsigned *)0, cfile); - if (token == SEMI) + token = peek_token (&val, (unsigned *)0, cfile); + if (token == SEMI) { + token = next_token (&val, (unsigned *)0, cfile); break; + } if (!is_identifier (token)) { parse_warn (cfile, "%s: expected option name.", val); + token = next_token (&val, (unsigned *)0, cfile); skip_to_semi (cfile); return; } - for (i = 0; i < 256; i++) { - if (!strcasecmp (dhcp_options [i].name, val)) - break; - } - if (i == 256) { + option = parse_option_name (cfile, 0, NULL); + if (!option) { parse_warn (cfile, "%s: expected option name.", val); + return; + } + if (option -> universe != &dhcp_universe) { + parse_warn (cfile, + "%s.%s: Only global options allowed.", + option -> universe -> name, option->name ); skip_to_semi (cfile); return; } r = new_pair (MDL); if (!r) log_fatal ("can't allocate pair for option code."); - r -> car = (caddr_t)(long)i; + r -> car = (caddr_t)(long)option -> code; r -> cdr = (pair)0; if (p) q -> cdr = r; diff --git a/contrib/isc-dhcp/client/dhclient.conf.5 b/contrib/isc-dhcp/client/dhclient.conf.5 index 72b11ce..95ff0e1 100644 --- a/contrib/isc-dhcp/client/dhclient.conf.5 +++ b/contrib/isc-dhcp/client/dhclient.conf.5 @@ -35,7 +35,7 @@ .\" see ``http://www.vix.com''. To learn more about Nominum, Inc., see .\" ``http://www.nominum.com''. .\" -.\" $Id: dhclient.conf.5,v 1.12.2.8 2002/11/17 02:25:43 dhankins Exp $ +.\" $Id: dhclient.conf.5,v 1.12.2.9 2003/02/23 03:27:26 dhankins Exp $ .\" $FreeBSD$ .\" .TH dhclient.conf 5 @@ -447,7 +447,7 @@ automatically determine the type of network to which they are connected. The media setup string is a system-dependent parameter which is passed to the dhcp client configuration script when initializing the interface. On Unix and Unix-like systems, the -argument is passed on the ifconfig command line when configuring te +argument is passed on the ifconfig command line when configuring the interface. .PP The dhcp client automatically declares this parameter if it uses a diff --git a/contrib/isc-dhcp/common/dhcp-options.5 b/contrib/isc-dhcp/common/dhcp-options.5 index 0084ef9..5ba2891 100644 --- a/contrib/isc-dhcp/common/dhcp-options.5 +++ b/contrib/isc-dhcp/common/dhcp-options.5 @@ -35,7 +35,7 @@ .\" see ``http://www.vix.com''. To learn more about Nominum, Inc., see .\" ``http://www.nominum.com''. .\" -.\" $Id: dhcp-options.5,v 1.19.2.9 2002/11/17 02:26:57 dhankins Exp $ +.\" $Id: dhcp-options.5,v 1.19.2.10 2003/02/23 03:27:42 dhankins Exp $ .\" $FreeBSD$ .\" .TH dhcpd-options 5 @@ -222,7 +222,7 @@ sending TCP segments. The minimum value is 1. .B option \fBdhcp-client-identifier\fR \fIstring\fR\fB;\fR .RS 0.25i .PP -This option can be used to specify the a DHCP client identifier in a +This option can be used to specify a DHCP client identifier in a host declaration, so that dhcpd can find the host record by matching against the client identifier. .PP @@ -412,8 +412,8 @@ RFC2132. \fIip-address\fR... ]\fB;\fR .RS 0.25i .PP -The Finger server option specifies a list of Finger available to the -client. Servers should be listed in order of preference. +The Finger server option specifies a list of Finger servers available +to the client. Servers should be listed in order of preference. .RE .PP .B option \fBfont-servers\fR \fIip-address\fR [\fB,\fR \fIip-address\fR... @@ -485,8 +485,8 @@ forwarding, and a value of true means enable IP forwarding. \fIip-address\fR... ]\fB;\fR .RS 0.25i .PP -The IRC server option specifies a list of IRC available to the -client. Servers should be listed in order of preference. +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 \fBlog-servers\fR \fIip-address\fR [\fB,\fR \fIip-address\fR... @@ -593,7 +593,7 @@ Possible node types are: B-node: Broadcast - no WINS .TP .I 2 -P-node: Peer - WINS only. +P-node: Peer - WINS only .TP .I 4 M-node: Mixed - broadcast, then WINS @@ -648,8 +648,8 @@ preference. \fIip-address\fR... ]\fB;\fR .RS 0.25i .PP -The NNTP server option specifies a list of NNTP available to the -client. Servers should be listed in order of preference. +The NNTP server option specifies a list of NNTP servesr available +to the client. Servers should be listed in order of preference. .RE .PP .B option \fBnon-local-source-routing\fR \fIflag\fR\fB;\fR @@ -733,8 +733,8 @@ See STD 3 (RFC1122) for further information. .B option \fBpop-server\fR \fIip-address\fR [\fB,\fR \fIip-address\fR... ]\fB;\fR .RS 0.25i .PP -The POP3 server option specifies a list of POP3 available to the -client. Servers should be listed in order of preference. +The POP3 server option specifies a list of POP3 servers available +to the client. Servers should be listed in order of preference. .RE .PP .B option \fBresource-location-servers\fR \fIip-address\fR @@ -905,8 +905,8 @@ This specifies the IP address of the client's swap server. .B option \fBtcp-keepalive-garbage\fR \fIflag\fR\fB;\fR .RS 0.25i .PP -This option specifies the whether or not the client should send TCP -keepalive messages with a octet of garbage for compatibility with +This option specifies whether or not the client should send TCP +keepalive messages with an octet of garbage for compatibility with older implementations. A value of false indicates that a garbage octet should not be sent. A value of true indicates that a garbage octet should be sent. @@ -1031,8 +1031,8 @@ details. \fIip-address\fR... ]\fB;\fR .RS 0.25i .PP -The WWW server option specifies a list of WWW available to the -client. Servers should be listed in order of preference. +The WWW server option specifies a list of WWW servers available +to the client. Servers should be listed in order of preference. .RE .PP .B option \fBx-display-manager\fR \fIip-address\fR [\fB,\fR \fIip-address\fR... diff --git a/contrib/isc-dhcp/common/tables.c b/contrib/isc-dhcp/common/tables.c index e94c91d..fce0907 100644 --- a/contrib/isc-dhcp/common/tables.c +++ b/contrib/isc-dhcp/common/tables.c @@ -43,7 +43,8 @@ #ifndef lint static char copyright[] = -"$Id: tables.c,v 1.51.2.6 2002/11/17 02:26:59 dhankins Exp $ Copyright (c) 1995-2002 The Internet Software Consortium. All rights reserved.\n"; +"$FreeBSD$" +"$Id: tables.c,v 1.51.2.7 2003/07/25 22:53:38 dhankins Exp $ Copyright (c) 1995-2002 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -179,181 +180,181 @@ struct option dhcp_options [256] = { { "user-class", "t", &dhcp_universe, 77 }, { "slp-directory-agent", "fIa", &dhcp_universe, 78 }, { "slp-service-scope", "fto", &dhcp_universe, 79 }, - { "#80", "X", &dhcp_universe, 80 }, + { "unknown-80", "X", &dhcp_universe, 80 }, { "fqdn", "Efqdn.", &dhcp_universe, 81 }, { "relay-agent-information", "Eagent.", &dhcp_universe, 82 }, - { "#83", "X", &dhcp_universe, 83 }, - { "#84", "X", &dhcp_universe, 84 }, + { "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 }, - { "#88", "X", &dhcp_universe, 88 }, - { "#89", "X", &dhcp_universe, 89 }, - { "#90", "X", &dhcp_universe, 90 }, - { "#91", "X", &dhcp_universe, 91 }, - { "#92", "X", &dhcp_universe, 92 }, - { "#93", "X", &dhcp_universe, 93 }, - { "#94", "X", &dhcp_universe, 94 }, - { "#95", "X", &dhcp_universe, 95 }, - { "#96", "X", &dhcp_universe, 96 }, - { "#97", "X", &dhcp_universe, 97 }, + { "unknown-88", "X", &dhcp_universe, 88 }, + { "unknown-89", "X", &dhcp_universe, 89 }, + { "unknown-90", "X", &dhcp_universe, 90 }, + { "unknown-91", "X", &dhcp_universe, 91 }, + { "unknown-92", "X", &dhcp_universe, 92 }, + { "unknown-93", "X", &dhcp_universe, 93 }, + { "unknown-94", "X", &dhcp_universe, 94 }, + { "unknown-95", "X", &dhcp_universe, 95 }, + { "unknown-96", "X", &dhcp_universe, 96 }, + { "unknown-97", "X", &dhcp_universe, 97 }, { "uap-servers", "t", &dhcp_universe, 98 }, - { "#99", "X", &dhcp_universe, 99 }, - { "#100", "X", &dhcp_universe, 100 }, - { "#101", "X", &dhcp_universe, 101 }, - { "#102", "X", &dhcp_universe, 102 }, - { "#103", "X", &dhcp_universe, 103 }, - { "#104", "X", &dhcp_universe, 104 }, - { "#105", "X", &dhcp_universe, 105 }, - { "#106", "X", &dhcp_universe, 106 }, - { "#107", "X", &dhcp_universe, 107 }, - { "#108", "X", &dhcp_universe, 108 }, - { "#109", "X", &dhcp_universe, 109 }, - { "#110", "X", &dhcp_universe, 110 }, - { "#111", "X", &dhcp_universe, 111 }, - { "#112", "X", &dhcp_universe, 112 }, - { "#113", "X", &dhcp_universe, 113 }, - { "#114", "X", &dhcp_universe, 114 }, - { "#115", "X", &dhcp_universe, 115 }, - { "#116", "X", &dhcp_universe, 116 }, - { "#117", "X", &dhcp_universe, 117 }, + { "unknown-99", "X", &dhcp_universe, 99 }, + { "unknown-100", "X", &dhcp_universe, 100 }, + { "unknown-101", "X", &dhcp_universe, 101 }, + { "unknown-102", "X", &dhcp_universe, 102 }, + { "unknown-103", "X", &dhcp_universe, 103 }, + { "unknown-104", "X", &dhcp_universe, 104 }, + { "unknown-105", "X", &dhcp_universe, 105 }, + { "unknown-106", "X", &dhcp_universe, 106 }, + { "unknown-107", "X", &dhcp_universe, 107 }, + { "unknown-108", "X", &dhcp_universe, 108 }, + { "unknown-109", "X", &dhcp_universe, 109 }, + { "unknown-110", "X", &dhcp_universe, 110 }, + { "unknown-111", "X", &dhcp_universe, 111 }, + { "unknown-112", "X", &dhcp_universe, 112 }, + { "unknown-113", "X", &dhcp_universe, 113 }, + { "unknown-114", "X", &dhcp_universe, 114 }, + { "unknown-115", "X", &dhcp_universe, 115 }, + { "unknown-116", "X", &dhcp_universe, 116 }, + { "unknown-117", "X", &dhcp_universe, 117 }, { "subnet-selection", "X", &dhcp_universe, 118 }, - { "#119", "X", &dhcp_universe, 119 }, - { "#120", "X", &dhcp_universe, 120 }, - { "#121", "X", &dhcp_universe, 121 }, - { "#122", "X", &dhcp_universe, 122 }, - { "#123", "X", &dhcp_universe, 123 }, - { "#124", "X", &dhcp_universe, 124 }, - { "#125", "X", &dhcp_universe, 125 }, - { "#126", "X", &dhcp_universe, 126 }, - { "#127", "X", &dhcp_universe, 127 }, - { "#128", "X", &dhcp_universe, 128 }, - { "#129", "X", &dhcp_universe, 129 }, - { "#130", "X", &dhcp_universe, 130 }, - { "#131", "X", &dhcp_universe, 131 }, - { "#132", "X", &dhcp_universe, 132 }, - { "#133", "X", &dhcp_universe, 133 }, - { "#134", "X", &dhcp_universe, 134 }, - { "#135", "X", &dhcp_universe, 135 }, - { "#136", "X", &dhcp_universe, 136 }, - { "#137", "X", &dhcp_universe, 137 }, - { "#138", "X", &dhcp_universe, 138 }, - { "#139", "X", &dhcp_universe, 139 }, - { "#140", "X", &dhcp_universe, 140 }, - { "#141", "X", &dhcp_universe, 141 }, - { "#142", "X", &dhcp_universe, 142 }, - { "#143", "X", &dhcp_universe, 143 }, - { "#144", "X", &dhcp_universe, 144 }, - { "#145", "X", &dhcp_universe, 145 }, - { "#146", "X", &dhcp_universe, 146 }, - { "#147", "X", &dhcp_universe, 147 }, - { "#148", "X", &dhcp_universe, 148 }, - { "#149", "X", &dhcp_universe, 149 }, - { "#150", "X", &dhcp_universe, 150 }, - { "#151", "X", &dhcp_universe, 151 }, - { "#152", "X", &dhcp_universe, 152 }, - { "#153", "X", &dhcp_universe, 153 }, - { "#154", "X", &dhcp_universe, 154 }, - { "#155", "X", &dhcp_universe, 155 }, - { "#156", "X", &dhcp_universe, 156 }, - { "#157", "X", &dhcp_universe, 157 }, - { "#158", "X", &dhcp_universe, 158 }, - { "#159", "X", &dhcp_universe, 159 }, - { "#160", "X", &dhcp_universe, 160 }, - { "#161", "X", &dhcp_universe, 161 }, - { "#162", "X", &dhcp_universe, 162 }, - { "#163", "X", &dhcp_universe, 163 }, - { "#164", "X", &dhcp_universe, 164 }, - { "#165", "X", &dhcp_universe, 165 }, - { "#166", "X", &dhcp_universe, 166 }, - { "#167", "X", &dhcp_universe, 167 }, - { "#168", "X", &dhcp_universe, 168 }, - { "#169", "X", &dhcp_universe, 169 }, - { "#170", "X", &dhcp_universe, 170 }, - { "#171", "X", &dhcp_universe, 171 }, - { "#172", "X", &dhcp_universe, 172 }, - { "#173", "X", &dhcp_universe, 173 }, - { "#174", "X", &dhcp_universe, 174 }, - { "#175", "X", &dhcp_universe, 175 }, - { "#176", "X", &dhcp_universe, 176 }, - { "#177", "X", &dhcp_universe, 177 }, - { "#178", "X", &dhcp_universe, 178 }, - { "#179", "X", &dhcp_universe, 179 }, - { "#180", "X", &dhcp_universe, 180 }, - { "#181", "X", &dhcp_universe, 181 }, - { "#182", "X", &dhcp_universe, 182 }, - { "#183", "X", &dhcp_universe, 183 }, - { "#184", "X", &dhcp_universe, 184 }, - { "#185", "X", &dhcp_universe, 185 }, - { "#186", "X", &dhcp_universe, 186 }, - { "#187", "X", &dhcp_universe, 187 }, - { "#188", "X", &dhcp_universe, 188 }, - { "#189", "X", &dhcp_universe, 189 }, - { "#190", "X", &dhcp_universe, 190 }, - { "#191", "X", &dhcp_universe, 191 }, - { "#192", "X", &dhcp_universe, 192 }, - { "#193", "X", &dhcp_universe, 193 }, - { "#194", "X", &dhcp_universe, 194 }, - { "#195", "X", &dhcp_universe, 195 }, - { "#196", "X", &dhcp_universe, 196 }, - { "#197", "X", &dhcp_universe, 197 }, - { "#198", "X", &dhcp_universe, 198 }, - { "#199", "X", &dhcp_universe, 199 }, - { "#200", "X", &dhcp_universe, 200 }, - { "#201", "X", &dhcp_universe, 201 }, - { "#202", "X", &dhcp_universe, 202 }, - { "#203", "X", &dhcp_universe, 203 }, - { "#204", "X", &dhcp_universe, 204 }, - { "#205", "X", &dhcp_universe, 205 }, - { "#206", "X", &dhcp_universe, 206 }, - { "#207", "X", &dhcp_universe, 207 }, - { "#208", "X", &dhcp_universe, 208 }, - { "#209", "X", &dhcp_universe, 209 }, + { "unknown-119", "X", &dhcp_universe, 119 }, + { "unknown-120", "X", &dhcp_universe, 120 }, + { "unknown-121", "X", &dhcp_universe, 121 }, + { "unknown-122", "X", &dhcp_universe, 122 }, + { "unknown-123", "X", &dhcp_universe, 123 }, + { "unknown-124", "X", &dhcp_universe, 124 }, + { "unknown-125", "X", &dhcp_universe, 125 }, + { "unknown-126", "X", &dhcp_universe, 126 }, + { "unknown-127", "X", &dhcp_universe, 127 }, + { "unknown-128", "X", &dhcp_universe, 128 }, + { "unknown-129", "X", &dhcp_universe, 129 }, + { "unknown-130", "X", &dhcp_universe, 130 }, + { "unknown-131", "X", &dhcp_universe, 131 }, + { "unknown-132", "X", &dhcp_universe, 132 }, + { "unknown-133", "X", &dhcp_universe, 133 }, + { "unknown-134", "X", &dhcp_universe, 134 }, + { "unknown-135", "X", &dhcp_universe, 135 }, + { "unknown-136", "X", &dhcp_universe, 136 }, + { "unknown-137", "X", &dhcp_universe, 137 }, + { "unknown-138", "X", &dhcp_universe, 138 }, + { "unknown-139", "X", &dhcp_universe, 139 }, + { "unknown-140", "X", &dhcp_universe, 140 }, + { "unknown-141", "X", &dhcp_universe, 141 }, + { "unknown-142", "X", &dhcp_universe, 142 }, + { "unknown-143", "X", &dhcp_universe, 143 }, + { "unknown-144", "X", &dhcp_universe, 144 }, + { "unknown-145", "X", &dhcp_universe, 145 }, + { "unknown-146", "X", &dhcp_universe, 146 }, + { "unknown-147", "X", &dhcp_universe, 147 }, + { "unknown-148", "X", &dhcp_universe, 148 }, + { "unknown-149", "X", &dhcp_universe, 149 }, + { "unknown-150", "X", &dhcp_universe, 150 }, + { "unknown-151", "X", &dhcp_universe, 151 }, + { "unknown-152", "X", &dhcp_universe, 152 }, + { "unknown-153", "X", &dhcp_universe, 153 }, + { "unknown-154", "X", &dhcp_universe, 154 }, + { "unknown-155", "X", &dhcp_universe, 155 }, + { "unknown-156", "X", &dhcp_universe, 156 }, + { "unknown-157", "X", &dhcp_universe, 157 }, + { "unknown-158", "X", &dhcp_universe, 158 }, + { "unknown-159", "X", &dhcp_universe, 159 }, + { "unknown-160", "X", &dhcp_universe, 160 }, + { "unknown-161", "X", &dhcp_universe, 161 }, + { "unknown-162", "X", &dhcp_universe, 162 }, + { "unknown-163", "X", &dhcp_universe, 163 }, + { "unknown-164", "X", &dhcp_universe, 164 }, + { "unknown-165", "X", &dhcp_universe, 165 }, + { "unknown-166", "X", &dhcp_universe, 166 }, + { "unknown-167", "X", &dhcp_universe, 167 }, + { "unknown-168", "X", &dhcp_universe, 168 }, + { "unknown-169", "X", &dhcp_universe, 169 }, + { "unknown-170", "X", &dhcp_universe, 170 }, + { "unknown-171", "X", &dhcp_universe, 171 }, + { "unknown-172", "X", &dhcp_universe, 172 }, + { "unknown-173", "X", &dhcp_universe, 173 }, + { "unknown-174", "X", &dhcp_universe, 174 }, + { "unknown-175", "X", &dhcp_universe, 175 }, + { "unknown-176", "X", &dhcp_universe, 176 }, + { "unknown-177", "X", &dhcp_universe, 177 }, + { "unknown-178", "X", &dhcp_universe, 178 }, + { "unknown-179", "X", &dhcp_universe, 179 }, + { "unknown-180", "X", &dhcp_universe, 180 }, + { "unknown-181", "X", &dhcp_universe, 181 }, + { "unknown-182", "X", &dhcp_universe, 182 }, + { "unknown-183", "X", &dhcp_universe, 183 }, + { "unknown-184", "X", &dhcp_universe, 184 }, + { "unknown-185", "X", &dhcp_universe, 185 }, + { "unknown-186", "X", &dhcp_universe, 186 }, + { "unknown-187", "X", &dhcp_universe, 187 }, + { "unknown-188", "X", &dhcp_universe, 188 }, + { "unknown-189", "X", &dhcp_universe, 189 }, + { "unknown-190", "X", &dhcp_universe, 190 }, + { "unknown-191", "X", &dhcp_universe, 191 }, + { "unknown-192", "X", &dhcp_universe, 192 }, + { "unknown-193", "X", &dhcp_universe, 193 }, + { "unknown-194", "X", &dhcp_universe, 194 }, + { "unknown-195", "X", &dhcp_universe, 195 }, + { "unknown-196", "X", &dhcp_universe, 196 }, + { "unknown-197", "X", &dhcp_universe, 197 }, + { "unknown-198", "X", &dhcp_universe, 198 }, + { "unknown-199", "X", &dhcp_universe, 199 }, + { "unknown-200", "X", &dhcp_universe, 200 }, + { "unknown-201", "X", &dhcp_universe, 201 }, + { "unknown-202", "X", &dhcp_universe, 202 }, + { "unknown-203", "X", &dhcp_universe, 203 }, + { "unknown-204", "X", &dhcp_universe, 204 }, + { "unknown-205", "X", &dhcp_universe, 205 }, + { "unknown-206", "X", &dhcp_universe, 206 }, + { "unknown-207", "X", &dhcp_universe, 207 }, + { "unknown-208", "X", &dhcp_universe, 208 }, + { "unknown-209", "X", &dhcp_universe, 209 }, { "authenticate", "X", &dhcp_universe, 210 }, - { "#211", "X", &dhcp_universe, 211 }, - { "#212", "X", &dhcp_universe, 212 }, - { "#213", "X", &dhcp_universe, 213 }, - { "#214", "X", &dhcp_universe, 214 }, - { "#215", "X", &dhcp_universe, 215 }, - { "#216", "X", &dhcp_universe, 216 }, - { "#217", "X", &dhcp_universe, 217 }, - { "#218", "X", &dhcp_universe, 218 }, - { "#219", "X", &dhcp_universe, 219 }, - { "#220", "X", &dhcp_universe, 220 }, - { "#221", "X", &dhcp_universe, 221 }, - { "#222", "X", &dhcp_universe, 222 }, - { "#223", "X", &dhcp_universe, 223 }, - { "#224", "X", &dhcp_universe, 224 }, - { "#225", "X", &dhcp_universe, 225 }, - { "#226", "X", &dhcp_universe, 226 }, - { "#227", "X", &dhcp_universe, 227 }, - { "#228", "X", &dhcp_universe, 228 }, - { "#229", "X", &dhcp_universe, 229 }, - { "#230", "X", &dhcp_universe, 230 }, - { "#231", "X", &dhcp_universe, 231 }, - { "#232", "X", &dhcp_universe, 232 }, - { "#233", "X", &dhcp_universe, 233 }, - { "#234", "X", &dhcp_universe, 234 }, - { "#235", "X", &dhcp_universe, 235 }, - { "#236", "X", &dhcp_universe, 236 }, - { "#237", "X", &dhcp_universe, 237 }, - { "#238", "X", &dhcp_universe, 238 }, - { "#239", "X", &dhcp_universe, 239 }, - { "#240", "X", &dhcp_universe, 240 }, - { "#241", "X", &dhcp_universe, 241 }, - { "#242", "X", &dhcp_universe, 242 }, - { "#243", "X", &dhcp_universe, 243 }, - { "#244", "X", &dhcp_universe, 244 }, - { "#245", "X", &dhcp_universe, 245 }, - { "#246", "X", &dhcp_universe, 246 }, - { "#247", "X", &dhcp_universe, 247 }, - { "#248", "X", &dhcp_universe, 248 }, - { "#249", "X", &dhcp_universe, 249 }, - { "#250", "X", &dhcp_universe, 250 }, - { "#251", "X", &dhcp_universe, 251 }, - { "#252", "X", &dhcp_universe, 252 }, - { "#253", "X", &dhcp_universe, 253 }, - { "#254", "X", &dhcp_universe, 254 }, + { "unknown-211", "X", &dhcp_universe, 211 }, + { "unknown-212", "X", &dhcp_universe, 212 }, + { "unknown-213", "X", &dhcp_universe, 213 }, + { "unknown-214", "X", &dhcp_universe, 214 }, + { "unknown-215", "X", &dhcp_universe, 215 }, + { "unknown-216", "X", &dhcp_universe, 216 }, + { "unknown-217", "X", &dhcp_universe, 217 }, + { "unknown-218", "X", &dhcp_universe, 218 }, + { "unknown-219", "X", &dhcp_universe, 219 }, + { "unknown-220", "X", &dhcp_universe, 220 }, + { "unknown-221", "X", &dhcp_universe, 221 }, + { "unknown-222", "X", &dhcp_universe, 222 }, + { "unknown-223", "X", &dhcp_universe, 223 }, + { "unknown-224", "X", &dhcp_universe, 224 }, + { "unknown-225", "X", &dhcp_universe, 225 }, + { "unknown-226", "X", &dhcp_universe, 226 }, + { "unknown-227", "X", &dhcp_universe, 227 }, + { "unknown-228", "X", &dhcp_universe, 228 }, + { "unknown-229", "X", &dhcp_universe, 229 }, + { "unknown-230", "X", &dhcp_universe, 230 }, + { "unknown-231", "X", &dhcp_universe, 231 }, + { "unknown-232", "X", &dhcp_universe, 232 }, + { "unknown-233", "X", &dhcp_universe, 233 }, + { "unknown-234", "X", &dhcp_universe, 234 }, + { "unknown-235", "X", &dhcp_universe, 235 }, + { "unknown-236", "X", &dhcp_universe, 236 }, + { "unknown-237", "X", &dhcp_universe, 237 }, + { "unknown-238", "X", &dhcp_universe, 238 }, + { "unknown-239", "X", &dhcp_universe, 239 }, + { "unknown-240", "X", &dhcp_universe, 240 }, + { "unknown-241", "X", &dhcp_universe, 241 }, + { "unknown-242", "X", &dhcp_universe, 242 }, + { "unknown-243", "X", &dhcp_universe, 243 }, + { "unknown-244", "X", &dhcp_universe, 244 }, + { "unknown-245", "X", &dhcp_universe, 245 }, + { "unknown-246", "X", &dhcp_universe, 246 }, + { "unknown-247", "X", &dhcp_universe, 247 }, + { "unknown-248", "X", &dhcp_universe, 248 }, + { "unknown-249", "X", &dhcp_universe, 249 }, + { "unknown-250", "X", &dhcp_universe, 250 }, + { "unknown-251", "X", &dhcp_universe, 251 }, + { "unknown-252", "X", &dhcp_universe, 252 }, + { "unknown-253", "X", &dhcp_universe, 253 }, + { "unknown-254", "X", &dhcp_universe, 254 }, { "option-end", "e", &dhcp_universe, 255 }, }; @@ -371,250 +372,250 @@ struct option nwip_options [256] = { { "autoretry-secs", "B", &nwip_universe, 9 }, { "nwip-1-1", "f", &nwip_universe, 10 }, { "primary-dss", "I", &nwip_universe, 11 }, - { "#12", "X", &nwip_universe, 12 }, - { "#13", "X", &nwip_universe, 13 }, - { "#14", "X", &nwip_universe, 14 }, - { "#15", "X", &nwip_universe, 15 }, - { "#16", "X", &nwip_universe, 16 }, - { "#17", "X", &nwip_universe, 17 }, - { "#18", "X", &nwip_universe, 18 }, - { "#19", "X", &nwip_universe, 19 }, - { "#20", "X", &nwip_universe, 20 }, - { "#21", "X", &nwip_universe, 21 }, - { "#22", "X", &nwip_universe, 22 }, - { "#23", "X", &nwip_universe, 23 }, - { "#24", "X", &nwip_universe, 24 }, - { "#25", "X", &nwip_universe, 25 }, - { "#26", "X", &nwip_universe, 26 }, - { "#27", "X", &nwip_universe, 27 }, - { "#28", "X", &nwip_universe, 28 }, - { "#29", "X", &nwip_universe, 29 }, - { "#30", "X", &nwip_universe, 30 }, - { "#31", "X", &nwip_universe, 31 }, - { "#32", "X", &nwip_universe, 32 }, - { "#33", "X", &nwip_universe, 33 }, - { "#34", "X", &nwip_universe, 34 }, - { "#35", "X", &nwip_universe, 35 }, - { "#36", "X", &nwip_universe, 36 }, - { "#37", "X", &nwip_universe, 37 }, - { "#38", "X", &nwip_universe, 38 }, - { "#39", "X", &nwip_universe, 39 }, - { "#40", "X", &nwip_universe, 40 }, - { "#41", "X", &nwip_universe, 41 }, - { "#42", "X", &nwip_universe, 42 }, - { "#43", "X", &nwip_universe, 43 }, - { "#44", "X", &nwip_universe, 44 }, - { "#45", "X", &nwip_universe, 45 }, - { "#46", "X", &nwip_universe, 46 }, - { "#47", "X", &nwip_universe, 47 }, - { "#48", "X", &nwip_universe, 48 }, - { "#49", "X", &nwip_universe, 49 }, - { "#50", "X", &nwip_universe, 50 }, - { "#51", "X", &nwip_universe, 51 }, - { "#52", "X", &nwip_universe, 52 }, - { "#53", "X", &nwip_universe, 53 }, - { "#54", "X", &nwip_universe, 54 }, - { "#55", "X", &nwip_universe, 55 }, - { "#56", "X", &nwip_universe, 56 }, - { "#57", "X", &nwip_universe, 57 }, - { "#58", "X", &nwip_universe, 58 }, - { "#59", "X", &nwip_universe, 59 }, - { "#60", "X", &nwip_universe, 60 }, - { "#61", "X", &nwip_universe, 61 }, - { "#62", "X", &nwip_universe, 62 }, - { "#63", "X", &nwip_universe, 63 }, - { "#64", "X", &nwip_universe, 64 }, - { "#65", "X", &nwip_universe, 65 }, - { "#66", "X", &nwip_universe, 66 }, - { "#67", "X", &nwip_universe, 67 }, - { "#68", "X", &nwip_universe, 68 }, - { "#69", "X", &nwip_universe, 69 }, - { "#70", "X", &nwip_universe, 70 }, - { "#71", "X", &nwip_universe, 71 }, - { "#72", "X", &nwip_universe, 72 }, - { "#73", "X", &nwip_universe, 73 }, - { "#74", "X", &nwip_universe, 74 }, - { "#75", "X", &nwip_universe, 75 }, - { "#76", "X", &nwip_universe, 76 }, - { "#77", "X", &nwip_universe, 77 }, - { "#78", "X", &nwip_universe, 78 }, - { "#79", "X", &nwip_universe, 79 }, - { "#80", "X", &nwip_universe, 80 }, - { "#81", "X", &nwip_universe, 81 }, - { "#82", "X", &nwip_universe, 82 }, - { "#83", "X", &nwip_universe, 83 }, - { "#84", "X", &nwip_universe, 84 }, - { "#85", "X", &nwip_universe, 85 }, - { "#86", "X", &nwip_universe, 86 }, - { "#87", "X", &nwip_universe, 87 }, - { "#88", "X", &nwip_universe, 88 }, - { "#89", "X", &nwip_universe, 89 }, - { "#90", "X", &nwip_universe, 90 }, - { "#91", "X", &nwip_universe, 91 }, - { "#92", "X", &nwip_universe, 92 }, - { "#93", "X", &nwip_universe, 93 }, - { "#94", "X", &nwip_universe, 94 }, - { "#95", "X", &nwip_universe, 95 }, - { "#96", "X", &nwip_universe, 96 }, - { "#97", "X", &nwip_universe, 97 }, - { "#98", "X", &nwip_universe, 98 }, - { "#99", "X", &nwip_universe, 99 }, - { "#100", "X", &nwip_universe, 100 }, - { "#101", "X", &nwip_universe, 101 }, - { "#102", "X", &nwip_universe, 102 }, - { "#103", "X", &nwip_universe, 103 }, - { "#104", "X", &nwip_universe, 104 }, - { "#105", "X", &nwip_universe, 105 }, - { "#106", "X", &nwip_universe, 106 }, - { "#107", "X", &nwip_universe, 107 }, - { "#108", "X", &nwip_universe, 108 }, - { "#109", "X", &nwip_universe, 109 }, - { "#110", "X", &nwip_universe, 110 }, - { "#111", "X", &nwip_universe, 111 }, - { "#112", "X", &nwip_universe, 112 }, - { "#113", "X", &nwip_universe, 113 }, - { "#114", "X", &nwip_universe, 114 }, - { "#115", "X", &nwip_universe, 115 }, - { "#116", "X", &nwip_universe, 116 }, - { "#117", "X", &nwip_universe, 117 }, - { "#118", "X", &nwip_universe, 118 }, - { "#119", "X", &nwip_universe, 119 }, - { "#120", "X", &nwip_universe, 120 }, - { "#121", "X", &nwip_universe, 121 }, - { "#122", "X", &nwip_universe, 122 }, - { "#123", "X", &nwip_universe, 123 }, - { "#124", "X", &nwip_universe, 124 }, - { "#125", "X", &nwip_universe, 125 }, - { "#126", "X", &nwip_universe, 126 }, - { "#127", "X", &nwip_universe, 127 }, - { "#128", "X", &nwip_universe, 128 }, - { "#129", "X", &nwip_universe, 129 }, - { "#130", "X", &nwip_universe, 130 }, - { "#131", "X", &nwip_universe, 131 }, - { "#132", "X", &nwip_universe, 132 }, - { "#133", "X", &nwip_universe, 133 }, - { "#134", "X", &nwip_universe, 134 }, - { "#135", "X", &nwip_universe, 135 }, - { "#136", "X", &nwip_universe, 136 }, - { "#137", "X", &nwip_universe, 137 }, - { "#138", "X", &nwip_universe, 138 }, - { "#139", "X", &nwip_universe, 139 }, - { "#140", "X", &nwip_universe, 140 }, - { "#141", "X", &nwip_universe, 141 }, - { "#142", "X", &nwip_universe, 142 }, - { "#143", "X", &nwip_universe, 143 }, - { "#144", "X", &nwip_universe, 144 }, - { "#145", "X", &nwip_universe, 145 }, - { "#146", "X", &nwip_universe, 146 }, - { "#147", "X", &nwip_universe, 147 }, - { "#148", "X", &nwip_universe, 148 }, - { "#149", "X", &nwip_universe, 149 }, - { "#150", "X", &nwip_universe, 150 }, - { "#151", "X", &nwip_universe, 151 }, - { "#152", "X", &nwip_universe, 152 }, - { "#153", "X", &nwip_universe, 153 }, - { "#154", "X", &nwip_universe, 154 }, - { "#155", "X", &nwip_universe, 155 }, - { "#156", "X", &nwip_universe, 156 }, - { "#157", "X", &nwip_universe, 157 }, - { "#158", "X", &nwip_universe, 158 }, - { "#159", "X", &nwip_universe, 159 }, - { "#160", "X", &nwip_universe, 160 }, - { "#161", "X", &nwip_universe, 161 }, - { "#162", "X", &nwip_universe, 162 }, - { "#163", "X", &nwip_universe, 163 }, - { "#164", "X", &nwip_universe, 164 }, - { "#165", "X", &nwip_universe, 165 }, - { "#166", "X", &nwip_universe, 166 }, - { "#167", "X", &nwip_universe, 167 }, - { "#168", "X", &nwip_universe, 168 }, - { "#169", "X", &nwip_universe, 169 }, - { "#170", "X", &nwip_universe, 170 }, - { "#171", "X", &nwip_universe, 171 }, - { "#172", "X", &nwip_universe, 172 }, - { "#173", "X", &nwip_universe, 173 }, - { "#174", "X", &nwip_universe, 174 }, - { "#175", "X", &nwip_universe, 175 }, - { "#176", "X", &nwip_universe, 176 }, - { "#177", "X", &nwip_universe, 177 }, - { "#178", "X", &nwip_universe, 178 }, - { "#179", "X", &nwip_universe, 179 }, - { "#180", "X", &nwip_universe, 180 }, - { "#181", "X", &nwip_universe, 181 }, - { "#182", "X", &nwip_universe, 182 }, - { "#183", "X", &nwip_universe, 183 }, - { "#184", "X", &nwip_universe, 184 }, - { "#185", "X", &nwip_universe, 185 }, - { "#186", "X", &nwip_universe, 186 }, - { "#187", "X", &nwip_universe, 187 }, - { "#188", "X", &nwip_universe, 188 }, - { "#189", "X", &nwip_universe, 189 }, - { "#190", "X", &nwip_universe, 190 }, - { "#191", "X", &nwip_universe, 191 }, - { "#192", "X", &nwip_universe, 192 }, - { "#193", "X", &nwip_universe, 193 }, - { "#194", "X", &nwip_universe, 194 }, - { "#195", "X", &nwip_universe, 195 }, - { "#196", "X", &nwip_universe, 196 }, - { "#197", "X", &nwip_universe, 197 }, - { "#198", "X", &nwip_universe, 198 }, - { "#199", "X", &nwip_universe, 199 }, - { "#200", "X", &nwip_universe, 200 }, - { "#201", "X", &nwip_universe, 201 }, - { "#202", "X", &nwip_universe, 202 }, - { "#203", "X", &nwip_universe, 203 }, - { "#204", "X", &nwip_universe, 204 }, - { "#205", "X", &nwip_universe, 205 }, - { "#206", "X", &nwip_universe, 206 }, - { "#207", "X", &nwip_universe, 207 }, - { "#208", "X", &nwip_universe, 208 }, - { "#209", "X", &nwip_universe, 209 }, - { "#210", "X", &nwip_universe, 210 }, - { "#211", "X", &nwip_universe, 211 }, - { "#212", "X", &nwip_universe, 212 }, - { "#213", "X", &nwip_universe, 213 }, - { "#214", "X", &nwip_universe, 214 }, - { "#215", "X", &nwip_universe, 215 }, - { "#216", "X", &nwip_universe, 216 }, - { "#217", "X", &nwip_universe, 217 }, - { "#218", "X", &nwip_universe, 218 }, - { "#219", "X", &nwip_universe, 219 }, - { "#220", "X", &nwip_universe, 220 }, - { "#221", "X", &nwip_universe, 221 }, - { "#222", "X", &nwip_universe, 222 }, - { "#223", "X", &nwip_universe, 223 }, - { "#224", "X", &nwip_universe, 224 }, - { "#225", "X", &nwip_universe, 225 }, - { "#226", "X", &nwip_universe, 226 }, - { "#227", "X", &nwip_universe, 227 }, - { "#228", "X", &nwip_universe, 228 }, - { "#229", "X", &nwip_universe, 229 }, - { "#230", "X", &nwip_universe, 230 }, - { "#231", "X", &nwip_universe, 231 }, - { "#232", "X", &nwip_universe, 232 }, - { "#233", "X", &nwip_universe, 233 }, - { "#234", "X", &nwip_universe, 234 }, - { "#235", "X", &nwip_universe, 235 }, - { "#236", "X", &nwip_universe, 236 }, - { "#237", "X", &nwip_universe, 237 }, - { "#238", "X", &nwip_universe, 238 }, - { "#239", "X", &nwip_universe, 239 }, - { "#240", "X", &nwip_universe, 240 }, - { "#241", "X", &nwip_universe, 241 }, - { "#242", "X", &nwip_universe, 242 }, - { "#243", "X", &nwip_universe, 243 }, - { "#244", "X", &nwip_universe, 244 }, - { "#245", "X", &nwip_universe, 245 }, - { "#246", "X", &nwip_universe, 246 }, - { "#247", "X", &nwip_universe, 247 }, - { "#248", "X", &nwip_universe, 248 }, - { "#249", "X", &nwip_universe, 249 }, - { "#250", "X", &nwip_universe, 250 }, - { "#251", "X", &nwip_universe, 251 }, - { "#252", "X", &nwip_universe, 252 }, - { "#253", "X", &nwip_universe, 253 }, - { "#254", "X", &nwip_universe, 254 }, - { "#end", "e", &nwip_universe, 255 }, + { "unknown-12", "X", &nwip_universe, 12 }, + { "unknown-13", "X", &nwip_universe, 13 }, + { "unknown-14", "X", &nwip_universe, 14 }, + { "unknown-15", "X", &nwip_universe, 15 }, + { "unknown-16", "X", &nwip_universe, 16 }, + { "unknown-17", "X", &nwip_universe, 17 }, + { "unknown-18", "X", &nwip_universe, 18 }, + { "unknown-19", "X", &nwip_universe, 19 }, + { "unknown-20", "X", &nwip_universe, 20 }, + { "unknown-21", "X", &nwip_universe, 21 }, + { "unknown-22", "X", &nwip_universe, 22 }, + { "unknown-23", "X", &nwip_universe, 23 }, + { "unknown-24", "X", &nwip_universe, 24 }, + { "unknown-25", "X", &nwip_universe, 25 }, + { "unknown-26", "X", &nwip_universe, 26 }, + { "unknown-27", "X", &nwip_universe, 27 }, + { "unknown-28", "X", &nwip_universe, 28 }, + { "unknown-29", "X", &nwip_universe, 29 }, + { "unknown-30", "X", &nwip_universe, 30 }, + { "unknown-31", "X", &nwip_universe, 31 }, + { "unknown-32", "X", &nwip_universe, 32 }, + { "unknown-33", "X", &nwip_universe, 33 }, + { "unknown-34", "X", &nwip_universe, 34 }, + { "unknown-35", "X", &nwip_universe, 35 }, + { "unknown-36", "X", &nwip_universe, 36 }, + { "unknown-37", "X", &nwip_universe, 37 }, + { "unknown-38", "X", &nwip_universe, 38 }, + { "unknown-39", "X", &nwip_universe, 39 }, + { "unknown-40", "X", &nwip_universe, 40 }, + { "unknown-41", "X", &nwip_universe, 41 }, + { "unknown-42", "X", &nwip_universe, 42 }, + { "unknown-43", "X", &nwip_universe, 43 }, + { "unknown-44", "X", &nwip_universe, 44 }, + { "unknown-45", "X", &nwip_universe, 45 }, + { "unknown-46", "X", &nwip_universe, 46 }, + { "unknown-47", "X", &nwip_universe, 47 }, + { "unknown-48", "X", &nwip_universe, 48 }, + { "unknown-49", "X", &nwip_universe, 49 }, + { "unknown-50", "X", &nwip_universe, 50 }, + { "unknown-51", "X", &nwip_universe, 51 }, + { "unknown-52", "X", &nwip_universe, 52 }, + { "unknown-53", "X", &nwip_universe, 53 }, + { "unknown-54", "X", &nwip_universe, 54 }, + { "unknown-55", "X", &nwip_universe, 55 }, + { "unknown-56", "X", &nwip_universe, 56 }, + { "unknown-57", "X", &nwip_universe, 57 }, + { "unknown-58", "X", &nwip_universe, 58 }, + { "unknown-59", "X", &nwip_universe, 59 }, + { "unknown-60", "X", &nwip_universe, 60 }, + { "unknown-61", "X", &nwip_universe, 61 }, + { "unknown-62", "X", &nwip_universe, 62 }, + { "unknown-63", "X", &nwip_universe, 63 }, + { "unknown-64", "X", &nwip_universe, 64 }, + { "unknown-65", "X", &nwip_universe, 65 }, + { "unknown-66", "X", &nwip_universe, 66 }, + { "unknown-67", "X", &nwip_universe, 67 }, + { "unknown-68", "X", &nwip_universe, 68 }, + { "unknown-69", "X", &nwip_universe, 69 }, + { "unknown-70", "X", &nwip_universe, 70 }, + { "unknown-71", "X", &nwip_universe, 71 }, + { "unknown-72", "X", &nwip_universe, 72 }, + { "unknown-73", "X", &nwip_universe, 73 }, + { "unknown-74", "X", &nwip_universe, 74 }, + { "unknown-75", "X", &nwip_universe, 75 }, + { "unknown-76", "X", &nwip_universe, 76 }, + { "unknown-77", "X", &nwip_universe, 77 }, + { "unknown-78", "X", &nwip_universe, 78 }, + { "unknown-79", "X", &nwip_universe, 79 }, + { "unknown-80", "X", &nwip_universe, 80 }, + { "unknown-81", "X", &nwip_universe, 81 }, + { "unknown-82", "X", &nwip_universe, 82 }, + { "unknown-83", "X", &nwip_universe, 83 }, + { "unknown-84", "X", &nwip_universe, 84 }, + { "unknown-85", "X", &nwip_universe, 85 }, + { "unknown-86", "X", &nwip_universe, 86 }, + { "unknown-87", "X", &nwip_universe, 87 }, + { "unknown-88", "X", &nwip_universe, 88 }, + { "unknown-89", "X", &nwip_universe, 89 }, + { "unknown-90", "X", &nwip_universe, 90 }, + { "unknown-91", "X", &nwip_universe, 91 }, + { "unknown-92", "X", &nwip_universe, 92 }, + { "unknown-93", "X", &nwip_universe, 93 }, + { "unknown-94", "X", &nwip_universe, 94 }, + { "unknown-95", "X", &nwip_universe, 95 }, + { "unknown-96", "X", &nwip_universe, 96 }, + { "unknown-97", "X", &nwip_universe, 97 }, + { "unknown-98", "X", &nwip_universe, 98 }, + { "unknown-99", "X", &nwip_universe, 99 }, + { "unknown-100", "X", &nwip_universe, 100 }, + { "unknown-101", "X", &nwip_universe, 101 }, + { "unknown-102", "X", &nwip_universe, 102 }, + { "unknown-103", "X", &nwip_universe, 103 }, + { "unknown-104", "X", &nwip_universe, 104 }, + { "unknown-105", "X", &nwip_universe, 105 }, + { "unknown-106", "X", &nwip_universe, 106 }, + { "unknown-107", "X", &nwip_universe, 107 }, + { "unknown-108", "X", &nwip_universe, 108 }, + { "unknown-109", "X", &nwip_universe, 109 }, + { "unknown-110", "X", &nwip_universe, 110 }, + { "unknown-111", "X", &nwip_universe, 111 }, + { "unknown-112", "X", &nwip_universe, 112 }, + { "unknown-113", "X", &nwip_universe, 113 }, + { "unknown-114", "X", &nwip_universe, 114 }, + { "unknown-115", "X", &nwip_universe, 115 }, + { "unknown-116", "X", &nwip_universe, 116 }, + { "unknown-117", "X", &nwip_universe, 117 }, + { "unknown-118", "X", &nwip_universe, 118 }, + { "unknown-119", "X", &nwip_universe, 119 }, + { "unknown-120", "X", &nwip_universe, 120 }, + { "unknown-121", "X", &nwip_universe, 121 }, + { "unknown-122", "X", &nwip_universe, 122 }, + { "unknown-123", "X", &nwip_universe, 123 }, + { "unknown-124", "X", &nwip_universe, 124 }, + { "unknown-125", "X", &nwip_universe, 125 }, + { "unknown-126", "X", &nwip_universe, 126 }, + { "unknown-127", "X", &nwip_universe, 127 }, + { "unknown-128", "X", &nwip_universe, 128 }, + { "unknown-129", "X", &nwip_universe, 129 }, + { "unknown-130", "X", &nwip_universe, 130 }, + { "unknown-131", "X", &nwip_universe, 131 }, + { "unknown-132", "X", &nwip_universe, 132 }, + { "unknown-133", "X", &nwip_universe, 133 }, + { "unknown-134", "X", &nwip_universe, 134 }, + { "unknown-135", "X", &nwip_universe, 135 }, + { "unknown-136", "X", &nwip_universe, 136 }, + { "unknown-137", "X", &nwip_universe, 137 }, + { "unknown-138", "X", &nwip_universe, 138 }, + { "unknown-139", "X", &nwip_universe, 139 }, + { "unknown-140", "X", &nwip_universe, 140 }, + { "unknown-141", "X", &nwip_universe, 141 }, + { "unknown-142", "X", &nwip_universe, 142 }, + { "unknown-143", "X", &nwip_universe, 143 }, + { "unknown-144", "X", &nwip_universe, 144 }, + { "unknown-145", "X", &nwip_universe, 145 }, + { "unknown-146", "X", &nwip_universe, 146 }, + { "unknown-147", "X", &nwip_universe, 147 }, + { "unknown-148", "X", &nwip_universe, 148 }, + { "unknown-149", "X", &nwip_universe, 149 }, + { "unknown-150", "X", &nwip_universe, 150 }, + { "unknown-151", "X", &nwip_universe, 151 }, + { "unknown-152", "X", &nwip_universe, 152 }, + { "unknown-153", "X", &nwip_universe, 153 }, + { "unknown-154", "X", &nwip_universe, 154 }, + { "unknown-155", "X", &nwip_universe, 155 }, + { "unknown-156", "X", &nwip_universe, 156 }, + { "unknown-157", "X", &nwip_universe, 157 }, + { "unknown-158", "X", &nwip_universe, 158 }, + { "unknown-159", "X", &nwip_universe, 159 }, + { "unknown-160", "X", &nwip_universe, 160 }, + { "unknown-161", "X", &nwip_universe, 161 }, + { "unknown-162", "X", &nwip_universe, 162 }, + { "unknown-163", "X", &nwip_universe, 163 }, + { "unknown-164", "X", &nwip_universe, 164 }, + { "unknown-165", "X", &nwip_universe, 165 }, + { "unknown-166", "X", &nwip_universe, 166 }, + { "unknown-167", "X", &nwip_universe, 167 }, + { "unknown-168", "X", &nwip_universe, 168 }, + { "unknown-169", "X", &nwip_universe, 169 }, + { "unknown-170", "X", &nwip_universe, 170 }, + { "unknown-171", "X", &nwip_universe, 171 }, + { "unknown-172", "X", &nwip_universe, 172 }, + { "unknown-173", "X", &nwip_universe, 173 }, + { "unknown-174", "X", &nwip_universe, 174 }, + { "unknown-175", "X", &nwip_universe, 175 }, + { "unknown-176", "X", &nwip_universe, 176 }, + { "unknown-177", "X", &nwip_universe, 177 }, + { "unknown-178", "X", &nwip_universe, 178 }, + { "unknown-179", "X", &nwip_universe, 179 }, + { "unknown-180", "X", &nwip_universe, 180 }, + { "unknown-181", "X", &nwip_universe, 181 }, + { "unknown-182", "X", &nwip_universe, 182 }, + { "unknown-183", "X", &nwip_universe, 183 }, + { "unknown-184", "X", &nwip_universe, 184 }, + { "unknown-185", "X", &nwip_universe, 185 }, + { "unknown-186", "X", &nwip_universe, 186 }, + { "unknown-187", "X", &nwip_universe, 187 }, + { "unknown-188", "X", &nwip_universe, 188 }, + { "unknown-189", "X", &nwip_universe, 189 }, + { "unknown-190", "X", &nwip_universe, 190 }, + { "unknown-191", "X", &nwip_universe, 191 }, + { "unknown-192", "X", &nwip_universe, 192 }, + { "unknown-193", "X", &nwip_universe, 193 }, + { "unknown-194", "X", &nwip_universe, 194 }, + { "unknown-195", "X", &nwip_universe, 195 }, + { "unknown-196", "X", &nwip_universe, 196 }, + { "unknown-197", "X", &nwip_universe, 197 }, + { "unknown-198", "X", &nwip_universe, 198 }, + { "unknown-199", "X", &nwip_universe, 199 }, + { "unknown-200", "X", &nwip_universe, 200 }, + { "unknown-201", "X", &nwip_universe, 201 }, + { "unknown-202", "X", &nwip_universe, 202 }, + { "unknown-203", "X", &nwip_universe, 203 }, + { "unknown-204", "X", &nwip_universe, 204 }, + { "unknown-205", "X", &nwip_universe, 205 }, + { "unknown-206", "X", &nwip_universe, 206 }, + { "unknown-207", "X", &nwip_universe, 207 }, + { "unknown-208", "X", &nwip_universe, 208 }, + { "unknown-209", "X", &nwip_universe, 209 }, + { "unknown-210", "X", &nwip_universe, 210 }, + { "unknown-211", "X", &nwip_universe, 211 }, + { "unknown-212", "X", &nwip_universe, 212 }, + { "unknown-213", "X", &nwip_universe, 213 }, + { "unknown-214", "X", &nwip_universe, 214 }, + { "unknown-215", "X", &nwip_universe, 215 }, + { "unknown-216", "X", &nwip_universe, 216 }, + { "unknown-217", "X", &nwip_universe, 217 }, + { "unknown-218", "X", &nwip_universe, 218 }, + { "unknown-219", "X", &nwip_universe, 219 }, + { "unknown-220", "X", &nwip_universe, 220 }, + { "unknown-221", "X", &nwip_universe, 221 }, + { "unknown-222", "X", &nwip_universe, 222 }, + { "unknown-223", "X", &nwip_universe, 223 }, + { "unknown-224", "X", &nwip_universe, 224 }, + { "unknown-225", "X", &nwip_universe, 225 }, + { "unknown-226", "X", &nwip_universe, 226 }, + { "unknown-227", "X", &nwip_universe, 227 }, + { "unknown-228", "X", &nwip_universe, 228 }, + { "unknown-229", "X", &nwip_universe, 229 }, + { "unknown-230", "X", &nwip_universe, 230 }, + { "unknown-231", "X", &nwip_universe, 231 }, + { "unknown-232", "X", &nwip_universe, 232 }, + { "unknown-233", "X", &nwip_universe, 233 }, + { "unknown-234", "X", &nwip_universe, 234 }, + { "unknown-235", "X", &nwip_universe, 235 }, + { "unknown-236", "X", &nwip_universe, 236 }, + { "unknown-237", "X", &nwip_universe, 237 }, + { "unknown-238", "X", &nwip_universe, 238 }, + { "unknown-239", "X", &nwip_universe, 239 }, + { "unknown-240", "X", &nwip_universe, 240 }, + { "unknown-241", "X", &nwip_universe, 241 }, + { "unknown-242", "X", &nwip_universe, 242 }, + { "unknown-243", "X", &nwip_universe, 243 }, + { "unknown-244", "X", &nwip_universe, 244 }, + { "unknown-245", "X", &nwip_universe, 245 }, + { "unknown-246", "X", &nwip_universe, 246 }, + { "unknown-247", "X", &nwip_universe, 247 }, + { "unknown-248", "X", &nwip_universe, 248 }, + { "unknown-249", "X", &nwip_universe, 249 }, + { "unknown-250", "X", &nwip_universe, 250 }, + { "unknown-251", "X", &nwip_universe, 251 }, + { "unknown-252", "X", &nwip_universe, 252 }, + { "unknown-253", "X", &nwip_universe, 253 }, + { "unknown-254", "X", &nwip_universe, 254 }, + { "unknown-end", "e", &nwip_universe, 255 }, }; struct universe fqdn_universe; @@ -628,253 +629,253 @@ struct option fqdn_options [256] = { { "hostname", "t", &fqdn_universe, 6 }, { "domainname", "t", &fqdn_universe, 7 }, { "fqdn", "t", &fqdn_universe, 8 }, - { "#9", "X", &fqdn_universe, 9 }, - { "#10", "X", &fqdn_universe, 10 }, - { "#11", "X", &fqdn_universe, 11 }, - { "#12", "X", &fqdn_universe, 12 }, - { "#13", "X", &fqdn_universe, 13 }, - { "#14", "X", &fqdn_universe, 14 }, - { "#15", "X", &fqdn_universe, 15 }, - { "#16", "X", &fqdn_universe, 16 }, - { "#17", "X", &fqdn_universe, 17 }, - { "#18", "X", &fqdn_universe, 18 }, - { "#19", "X", &fqdn_universe, 19 }, - { "#20", "X", &fqdn_universe, 20 }, - { "#21", "X", &fqdn_universe, 21 }, - { "#22", "X", &fqdn_universe, 22 }, - { "#23", "X", &fqdn_universe, 23 }, - { "#24", "X", &fqdn_universe, 24 }, - { "#25", "X", &fqdn_universe, 25 }, - { "#26", "X", &fqdn_universe, 26 }, - { "#27", "X", &fqdn_universe, 27 }, - { "#28", "X", &fqdn_universe, 28 }, - { "#29", "X", &fqdn_universe, 29 }, - { "#30", "X", &fqdn_universe, 30 }, - { "#31", "X", &fqdn_universe, 31 }, - { "#32", "X", &fqdn_universe, 32 }, - { "#33", "X", &fqdn_universe, 33 }, - { "#34", "X", &fqdn_universe, 34 }, - { "#35", "X", &fqdn_universe, 35 }, - { "#36", "X", &fqdn_universe, 36 }, - { "#37", "X", &fqdn_universe, 37 }, - { "#38", "X", &fqdn_universe, 38 }, - { "#39", "X", &fqdn_universe, 39 }, - { "#40", "X", &fqdn_universe, 40 }, - { "#41", "X", &fqdn_universe, 41 }, - { "#42", "X", &fqdn_universe, 42 }, - { "#43", "X", &fqdn_universe, 43 }, - { "#44", "X", &fqdn_universe, 44 }, - { "#45", "X", &fqdn_universe, 45 }, - { "#46", "X", &fqdn_universe, 46 }, - { "#47", "X", &fqdn_universe, 47 }, - { "#48", "X", &fqdn_universe, 48 }, - { "#49", "X", &fqdn_universe, 49 }, - { "#50", "X", &fqdn_universe, 50 }, - { "#51", "X", &fqdn_universe, 51 }, - { "#52", "X", &fqdn_universe, 52 }, - { "#53", "X", &fqdn_universe, 53 }, - { "#54", "X", &fqdn_universe, 54 }, - { "#55", "X", &fqdn_universe, 55 }, - { "#56", "X", &fqdn_universe, 56 }, - { "#57", "X", &fqdn_universe, 57 }, - { "#58", "X", &fqdn_universe, 58 }, - { "#59", "X", &fqdn_universe, 59 }, - { "#60", "X", &fqdn_universe, 60 }, - { "#61", "X", &fqdn_universe, 61 }, - { "#62", "X", &fqdn_universe, 62 }, - { "#63", "X", &fqdn_universe, 63 }, - { "#64", "X", &fqdn_universe, 64 }, - { "#65", "X", &fqdn_universe, 65 }, - { "#66", "X", &fqdn_universe, 66 }, - { "#67", "X", &fqdn_universe, 67 }, - { "#68", "X", &fqdn_universe, 68 }, - { "#69", "X", &fqdn_universe, 69 }, - { "#70", "X", &fqdn_universe, 70 }, - { "#71", "X", &fqdn_universe, 71 }, - { "#72", "X", &fqdn_universe, 72 }, - { "#73", "X", &fqdn_universe, 73 }, - { "#74", "X", &fqdn_universe, 74 }, - { "#75", "X", &fqdn_universe, 75 }, - { "#76", "X", &fqdn_universe, 76 }, - { "#77", "X", &fqdn_universe, 77 }, - { "#78", "X", &fqdn_universe, 78 }, - { "#79", "X", &fqdn_universe, 79 }, - { "#80", "X", &fqdn_universe, 80 }, - { "#81", "X", &fqdn_universe, 81 }, - { "#82", "X", &fqdn_universe, 82 }, - { "#83", "X", &fqdn_universe, 83 }, - { "#84", "X", &fqdn_universe, 84 }, - { "#85", "X", &fqdn_universe, 85 }, - { "#86", "X", &fqdn_universe, 86 }, - { "#87", "X", &fqdn_universe, 87 }, - { "#88", "X", &fqdn_universe, 88 }, - { "#89", "X", &fqdn_universe, 89 }, - { "#90", "X", &fqdn_universe, 90 }, - { "#91", "X", &fqdn_universe, 91 }, - { "#92", "X", &fqdn_universe, 92 }, - { "#93", "X", &fqdn_universe, 93 }, - { "#94", "X", &fqdn_universe, 94 }, - { "#95", "X", &fqdn_universe, 95 }, - { "#96", "X", &fqdn_universe, 96 }, - { "#97", "X", &fqdn_universe, 97 }, - { "#98", "X", &fqdn_universe, 98 }, - { "#99", "X", &fqdn_universe, 99 }, - { "#100", "X", &fqdn_universe, 100 }, - { "#101", "X", &fqdn_universe, 101 }, - { "#102", "X", &fqdn_universe, 102 }, - { "#103", "X", &fqdn_universe, 103 }, - { "#104", "X", &fqdn_universe, 104 }, - { "#105", "X", &fqdn_universe, 105 }, - { "#106", "X", &fqdn_universe, 106 }, - { "#107", "X", &fqdn_universe, 107 }, - { "#108", "X", &fqdn_universe, 108 }, - { "#109", "X", &fqdn_universe, 109 }, - { "#110", "X", &fqdn_universe, 110 }, - { "#111", "X", &fqdn_universe, 111 }, - { "#112", "X", &fqdn_universe, 112 }, - { "#113", "X", &fqdn_universe, 113 }, - { "#114", "X", &fqdn_universe, 114 }, - { "#115", "X", &fqdn_universe, 115 }, - { "#116", "X", &fqdn_universe, 116 }, - { "#117", "X", &fqdn_universe, 117 }, - { "#118", "X", &fqdn_universe, 118 }, - { "#119", "X", &fqdn_universe, 119 }, - { "#120", "X", &fqdn_universe, 120 }, - { "#121", "X", &fqdn_universe, 121 }, - { "#122", "X", &fqdn_universe, 122 }, - { "#123", "X", &fqdn_universe, 123 }, - { "#124", "X", &fqdn_universe, 124 }, - { "#125", "X", &fqdn_universe, 125 }, - { "#126", "X", &fqdn_universe, 126 }, - { "#127", "X", &fqdn_universe, 127 }, - { "#128", "X", &fqdn_universe, 128 }, - { "#129", "X", &fqdn_universe, 129 }, - { "#130", "X", &fqdn_universe, 130 }, - { "#131", "X", &fqdn_universe, 131 }, - { "#132", "X", &fqdn_universe, 132 }, - { "#133", "X", &fqdn_universe, 133 }, - { "#134", "X", &fqdn_universe, 134 }, - { "#135", "X", &fqdn_universe, 135 }, - { "#136", "X", &fqdn_universe, 136 }, - { "#137", "X", &fqdn_universe, 137 }, - { "#138", "X", &fqdn_universe, 138 }, - { "#139", "X", &fqdn_universe, 139 }, - { "#140", "X", &fqdn_universe, 140 }, - { "#141", "X", &fqdn_universe, 141 }, - { "#142", "X", &fqdn_universe, 142 }, - { "#143", "X", &fqdn_universe, 143 }, - { "#144", "X", &fqdn_universe, 144 }, - { "#145", "X", &fqdn_universe, 145 }, - { "#146", "X", &fqdn_universe, 146 }, - { "#147", "X", &fqdn_universe, 147 }, - { "#148", "X", &fqdn_universe, 148 }, - { "#149", "X", &fqdn_universe, 149 }, - { "#150", "X", &fqdn_universe, 150 }, - { "#151", "X", &fqdn_universe, 151 }, - { "#152", "X", &fqdn_universe, 152 }, - { "#153", "X", &fqdn_universe, 153 }, - { "#154", "X", &fqdn_universe, 154 }, - { "#155", "X", &fqdn_universe, 155 }, - { "#156", "X", &fqdn_universe, 156 }, - { "#157", "X", &fqdn_universe, 157 }, - { "#158", "X", &fqdn_universe, 158 }, - { "#159", "X", &fqdn_universe, 159 }, - { "#160", "X", &fqdn_universe, 160 }, - { "#161", "X", &fqdn_universe, 161 }, - { "#162", "X", &fqdn_universe, 162 }, - { "#163", "X", &fqdn_universe, 163 }, - { "#164", "X", &fqdn_universe, 164 }, - { "#165", "X", &fqdn_universe, 165 }, - { "#166", "X", &fqdn_universe, 166 }, - { "#167", "X", &fqdn_universe, 167 }, - { "#168", "X", &fqdn_universe, 168 }, - { "#169", "X", &fqdn_universe, 169 }, - { "#170", "X", &fqdn_universe, 170 }, - { "#171", "X", &fqdn_universe, 171 }, - { "#172", "X", &fqdn_universe, 172 }, - { "#173", "X", &fqdn_universe, 173 }, - { "#174", "X", &fqdn_universe, 174 }, - { "#175", "X", &fqdn_universe, 175 }, - { "#176", "X", &fqdn_universe, 176 }, - { "#177", "X", &fqdn_universe, 177 }, - { "#178", "X", &fqdn_universe, 178 }, - { "#179", "X", &fqdn_universe, 179 }, - { "#180", "X", &fqdn_universe, 180 }, - { "#181", "X", &fqdn_universe, 181 }, - { "#182", "X", &fqdn_universe, 182 }, - { "#183", "X", &fqdn_universe, 183 }, - { "#184", "X", &fqdn_universe, 184 }, - { "#185", "X", &fqdn_universe, 185 }, - { "#186", "X", &fqdn_universe, 186 }, - { "#187", "X", &fqdn_universe, 187 }, - { "#188", "X", &fqdn_universe, 188 }, - { "#189", "X", &fqdn_universe, 189 }, - { "#190", "X", &fqdn_universe, 190 }, - { "#191", "X", &fqdn_universe, 191 }, - { "#192", "X", &fqdn_universe, 192 }, - { "#193", "X", &fqdn_universe, 193 }, - { "#194", "X", &fqdn_universe, 194 }, - { "#195", "X", &fqdn_universe, 195 }, - { "#196", "X", &fqdn_universe, 196 }, - { "#197", "X", &fqdn_universe, 197 }, - { "#198", "X", &fqdn_universe, 198 }, - { "#199", "X", &fqdn_universe, 199 }, - { "#200", "X", &fqdn_universe, 200 }, - { "#201", "X", &fqdn_universe, 201 }, - { "#202", "X", &fqdn_universe, 202 }, - { "#203", "X", &fqdn_universe, 203 }, - { "#204", "X", &fqdn_universe, 204 }, - { "#205", "X", &fqdn_universe, 205 }, - { "#206", "X", &fqdn_universe, 206 }, - { "#207", "X", &fqdn_universe, 207 }, - { "#208", "X", &fqdn_universe, 208 }, - { "#209", "X", &fqdn_universe, 209 }, - { "#210", "X", &fqdn_universe, 210 }, - { "#211", "X", &fqdn_universe, 211 }, - { "#212", "X", &fqdn_universe, 212 }, - { "#213", "X", &fqdn_universe, 213 }, - { "#214", "X", &fqdn_universe, 214 }, - { "#215", "X", &fqdn_universe, 215 }, - { "#216", "X", &fqdn_universe, 216 }, - { "#217", "X", &fqdn_universe, 217 }, - { "#218", "X", &fqdn_universe, 218 }, - { "#219", "X", &fqdn_universe, 219 }, - { "#220", "X", &fqdn_universe, 220 }, - { "#221", "X", &fqdn_universe, 221 }, - { "#222", "X", &fqdn_universe, 222 }, - { "#223", "X", &fqdn_universe, 223 }, - { "#224", "X", &fqdn_universe, 224 }, - { "#225", "X", &fqdn_universe, 225 }, - { "#226", "X", &fqdn_universe, 226 }, - { "#227", "X", &fqdn_universe, 227 }, - { "#228", "X", &fqdn_universe, 228 }, - { "#229", "X", &fqdn_universe, 229 }, - { "#230", "X", &fqdn_universe, 230 }, - { "#231", "X", &fqdn_universe, 231 }, - { "#232", "X", &fqdn_universe, 232 }, - { "#233", "X", &fqdn_universe, 233 }, - { "#234", "X", &fqdn_universe, 234 }, - { "#235", "X", &fqdn_universe, 235 }, - { "#236", "X", &fqdn_universe, 236 }, - { "#237", "X", &fqdn_universe, 237 }, - { "#238", "X", &fqdn_universe, 238 }, - { "#239", "X", &fqdn_universe, 239 }, - { "#240", "X", &fqdn_universe, 240 }, - { "#241", "X", &fqdn_universe, 241 }, - { "#242", "X", &fqdn_universe, 242 }, - { "#243", "X", &fqdn_universe, 243 }, - { "#244", "X", &fqdn_universe, 244 }, - { "#245", "X", &fqdn_universe, 245 }, - { "#246", "X", &fqdn_universe, 246 }, - { "#247", "X", &fqdn_universe, 247 }, - { "#248", "X", &fqdn_universe, 248 }, - { "#249", "X", &fqdn_universe, 249 }, - { "#250", "X", &fqdn_universe, 250 }, - { "#251", "X", &fqdn_universe, 251 }, - { "#252", "X", &fqdn_universe, 252 }, - { "#253", "X", &fqdn_universe, 253 }, - { "#254", "X", &fqdn_universe, 254 }, - { "#end", "e", &fqdn_universe, 255 }, + { "unknown-9", "X", &fqdn_universe, 9 }, + { "unknown-10", "X", &fqdn_universe, 10 }, + { "unknown-11", "X", &fqdn_universe, 11 }, + { "unknown-12", "X", &fqdn_universe, 12 }, + { "unknown-13", "X", &fqdn_universe, 13 }, + { "unknown-14", "X", &fqdn_universe, 14 }, + { "unknown-15", "X", &fqdn_universe, 15 }, + { "unknown-16", "X", &fqdn_universe, 16 }, + { "unknown-17", "X", &fqdn_universe, 17 }, + { "unknown-18", "X", &fqdn_universe, 18 }, + { "unknown-19", "X", &fqdn_universe, 19 }, + { "unknown-20", "X", &fqdn_universe, 20 }, + { "unknown-21", "X", &fqdn_universe, 21 }, + { "unknown-22", "X", &fqdn_universe, 22 }, + { "unknown-23", "X", &fqdn_universe, 23 }, + { "unknown-24", "X", &fqdn_universe, 24 }, + { "unknown-25", "X", &fqdn_universe, 25 }, + { "unknown-26", "X", &fqdn_universe, 26 }, + { "unknown-27", "X", &fqdn_universe, 27 }, + { "unknown-28", "X", &fqdn_universe, 28 }, + { "unknown-29", "X", &fqdn_universe, 29 }, + { "unknown-30", "X", &fqdn_universe, 30 }, + { "unknown-31", "X", &fqdn_universe, 31 }, + { "unknown-32", "X", &fqdn_universe, 32 }, + { "unknown-33", "X", &fqdn_universe, 33 }, + { "unknown-34", "X", &fqdn_universe, 34 }, + { "unknown-35", "X", &fqdn_universe, 35 }, + { "unknown-36", "X", &fqdn_universe, 36 }, + { "unknown-37", "X", &fqdn_universe, 37 }, + { "unknown-38", "X", &fqdn_universe, 38 }, + { "unknown-39", "X", &fqdn_universe, 39 }, + { "unknown-40", "X", &fqdn_universe, 40 }, + { "unknown-41", "X", &fqdn_universe, 41 }, + { "unknown-42", "X", &fqdn_universe, 42 }, + { "unknown-43", "X", &fqdn_universe, 43 }, + { "unknown-44", "X", &fqdn_universe, 44 }, + { "unknown-45", "X", &fqdn_universe, 45 }, + { "unknown-46", "X", &fqdn_universe, 46 }, + { "unknown-47", "X", &fqdn_universe, 47 }, + { "unknown-48", "X", &fqdn_universe, 48 }, + { "unknown-49", "X", &fqdn_universe, 49 }, + { "unknown-50", "X", &fqdn_universe, 50 }, + { "unknown-51", "X", &fqdn_universe, 51 }, + { "unknown-52", "X", &fqdn_universe, 52 }, + { "unknown-53", "X", &fqdn_universe, 53 }, + { "unknown-54", "X", &fqdn_universe, 54 }, + { "unknown-55", "X", &fqdn_universe, 55 }, + { "unknown-56", "X", &fqdn_universe, 56 }, + { "unknown-57", "X", &fqdn_universe, 57 }, + { "unknown-58", "X", &fqdn_universe, 58 }, + { "unknown-59", "X", &fqdn_universe, 59 }, + { "unknown-60", "X", &fqdn_universe, 60 }, + { "unknown-61", "X", &fqdn_universe, 61 }, + { "unknown-62", "X", &fqdn_universe, 62 }, + { "unknown-63", "X", &fqdn_universe, 63 }, + { "unknown-64", "X", &fqdn_universe, 64 }, + { "unknown-65", "X", &fqdn_universe, 65 }, + { "unknown-66", "X", &fqdn_universe, 66 }, + { "unknown-67", "X", &fqdn_universe, 67 }, + { "unknown-68", "X", &fqdn_universe, 68 }, + { "unknown-69", "X", &fqdn_universe, 69 }, + { "unknown-70", "X", &fqdn_universe, 70 }, + { "unknown-71", "X", &fqdn_universe, 71 }, + { "unknown-72", "X", &fqdn_universe, 72 }, + { "unknown-73", "X", &fqdn_universe, 73 }, + { "unknown-74", "X", &fqdn_universe, 74 }, + { "unknown-75", "X", &fqdn_universe, 75 }, + { "unknown-76", "X", &fqdn_universe, 76 }, + { "unknown-77", "X", &fqdn_universe, 77 }, + { "unknown-78", "X", &fqdn_universe, 78 }, + { "unknown-79", "X", &fqdn_universe, 79 }, + { "unknown-80", "X", &fqdn_universe, 80 }, + { "unknown-81", "X", &fqdn_universe, 81 }, + { "unknown-82", "X", &fqdn_universe, 82 }, + { "unknown-83", "X", &fqdn_universe, 83 }, + { "unknown-84", "X", &fqdn_universe, 84 }, + { "unknown-85", "X", &fqdn_universe, 85 }, + { "unknown-86", "X", &fqdn_universe, 86 }, + { "unknown-87", "X", &fqdn_universe, 87 }, + { "unknown-88", "X", &fqdn_universe, 88 }, + { "unknown-89", "X", &fqdn_universe, 89 }, + { "unknown-90", "X", &fqdn_universe, 90 }, + { "unknown-91", "X", &fqdn_universe, 91 }, + { "unknown-92", "X", &fqdn_universe, 92 }, + { "unknown-93", "X", &fqdn_universe, 93 }, + { "unknown-94", "X", &fqdn_universe, 94 }, + { "unknown-95", "X", &fqdn_universe, 95 }, + { "unknown-96", "X", &fqdn_universe, 96 }, + { "unknown-97", "X", &fqdn_universe, 97 }, + { "unknown-98", "X", &fqdn_universe, 98 }, + { "unknown-99", "X", &fqdn_universe, 99 }, + { "unknown-100", "X", &fqdn_universe, 100 }, + { "unknown-101", "X", &fqdn_universe, 101 }, + { "unknown-102", "X", &fqdn_universe, 102 }, + { "unknown-103", "X", &fqdn_universe, 103 }, + { "unknown-104", "X", &fqdn_universe, 104 }, + { "unknown-105", "X", &fqdn_universe, 105 }, + { "unknown-106", "X", &fqdn_universe, 106 }, + { "unknown-107", "X", &fqdn_universe, 107 }, + { "unknown-108", "X", &fqdn_universe, 108 }, + { "unknown-109", "X", &fqdn_universe, 109 }, + { "unknown-110", "X", &fqdn_universe, 110 }, + { "unknown-111", "X", &fqdn_universe, 111 }, + { "unknown-112", "X", &fqdn_universe, 112 }, + { "unknown-113", "X", &fqdn_universe, 113 }, + { "unknown-114", "X", &fqdn_universe, 114 }, + { "unknown-115", "X", &fqdn_universe, 115 }, + { "unknown-116", "X", &fqdn_universe, 116 }, + { "unknown-117", "X", &fqdn_universe, 117 }, + { "unknown-118", "X", &fqdn_universe, 118 }, + { "unknown-119", "X", &fqdn_universe, 119 }, + { "unknown-120", "X", &fqdn_universe, 120 }, + { "unknown-121", "X", &fqdn_universe, 121 }, + { "unknown-122", "X", &fqdn_universe, 122 }, + { "unknown-123", "X", &fqdn_universe, 123 }, + { "unknown-124", "X", &fqdn_universe, 124 }, + { "unknown-125", "X", &fqdn_universe, 125 }, + { "unknown-126", "X", &fqdn_universe, 126 }, + { "unknown-127", "X", &fqdn_universe, 127 }, + { "unknown-128", "X", &fqdn_universe, 128 }, + { "unknown-129", "X", &fqdn_universe, 129 }, + { "unknown-130", "X", &fqdn_universe, 130 }, + { "unknown-131", "X", &fqdn_universe, 131 }, + { "unknown-132", "X", &fqdn_universe, 132 }, + { "unknown-133", "X", &fqdn_universe, 133 }, + { "unknown-134", "X", &fqdn_universe, 134 }, + { "unknown-135", "X", &fqdn_universe, 135 }, + { "unknown-136", "X", &fqdn_universe, 136 }, + { "unknown-137", "X", &fqdn_universe, 137 }, + { "unknown-138", "X", &fqdn_universe, 138 }, + { "unknown-139", "X", &fqdn_universe, 139 }, + { "unknown-140", "X", &fqdn_universe, 140 }, + { "unknown-141", "X", &fqdn_universe, 141 }, + { "unknown-142", "X", &fqdn_universe, 142 }, + { "unknown-143", "X", &fqdn_universe, 143 }, + { "unknown-144", "X", &fqdn_universe, 144 }, + { "unknown-145", "X", &fqdn_universe, 145 }, + { "unknown-146", "X", &fqdn_universe, 146 }, + { "unknown-147", "X", &fqdn_universe, 147 }, + { "unknown-148", "X", &fqdn_universe, 148 }, + { "unknown-149", "X", &fqdn_universe, 149 }, + { "unknown-150", "X", &fqdn_universe, 150 }, + { "unknown-151", "X", &fqdn_universe, 151 }, + { "unknown-152", "X", &fqdn_universe, 152 }, + { "unknown-153", "X", &fqdn_universe, 153 }, + { "unknown-154", "X", &fqdn_universe, 154 }, + { "unknown-155", "X", &fqdn_universe, 155 }, + { "unknown-156", "X", &fqdn_universe, 156 }, + { "unknown-157", "X", &fqdn_universe, 157 }, + { "unknown-158", "X", &fqdn_universe, 158 }, + { "unknown-159", "X", &fqdn_universe, 159 }, + { "unknown-160", "X", &fqdn_universe, 160 }, + { "unknown-161", "X", &fqdn_universe, 161 }, + { "unknown-162", "X", &fqdn_universe, 162 }, + { "unknown-163", "X", &fqdn_universe, 163 }, + { "unknown-164", "X", &fqdn_universe, 164 }, + { "unknown-165", "X", &fqdn_universe, 165 }, + { "unknown-166", "X", &fqdn_universe, 166 }, + { "unknown-167", "X", &fqdn_universe, 167 }, + { "unknown-168", "X", &fqdn_universe, 168 }, + { "unknown-169", "X", &fqdn_universe, 169 }, + { "unknown-170", "X", &fqdn_universe, 170 }, + { "unknown-171", "X", &fqdn_universe, 171 }, + { "unknown-172", "X", &fqdn_universe, 172 }, + { "unknown-173", "X", &fqdn_universe, 173 }, + { "unknown-174", "X", &fqdn_universe, 174 }, + { "unknown-175", "X", &fqdn_universe, 175 }, + { "unknown-176", "X", &fqdn_universe, 176 }, + { "unknown-177", "X", &fqdn_universe, 177 }, + { "unknown-178", "X", &fqdn_universe, 178 }, + { "unknown-179", "X", &fqdn_universe, 179 }, + { "unknown-180", "X", &fqdn_universe, 180 }, + { "unknown-181", "X", &fqdn_universe, 181 }, + { "unknown-182", "X", &fqdn_universe, 182 }, + { "unknown-183", "X", &fqdn_universe, 183 }, + { "unknown-184", "X", &fqdn_universe, 184 }, + { "unknown-185", "X", &fqdn_universe, 185 }, + { "unknown-186", "X", &fqdn_universe, 186 }, + { "unknown-187", "X", &fqdn_universe, 187 }, + { "unknown-188", "X", &fqdn_universe, 188 }, + { "unknown-189", "X", &fqdn_universe, 189 }, + { "unknown-190", "X", &fqdn_universe, 190 }, + { "unknown-191", "X", &fqdn_universe, 191 }, + { "unknown-192", "X", &fqdn_universe, 192 }, + { "unknown-193", "X", &fqdn_universe, 193 }, + { "unknown-194", "X", &fqdn_universe, 194 }, + { "unknown-195", "X", &fqdn_universe, 195 }, + { "unknown-196", "X", &fqdn_universe, 196 }, + { "unknown-197", "X", &fqdn_universe, 197 }, + { "unknown-198", "X", &fqdn_universe, 198 }, + { "unknown-199", "X", &fqdn_universe, 199 }, + { "unknown-200", "X", &fqdn_universe, 200 }, + { "unknown-201", "X", &fqdn_universe, 201 }, + { "unknown-202", "X", &fqdn_universe, 202 }, + { "unknown-203", "X", &fqdn_universe, 203 }, + { "unknown-204", "X", &fqdn_universe, 204 }, + { "unknown-205", "X", &fqdn_universe, 205 }, + { "unknown-206", "X", &fqdn_universe, 206 }, + { "unknown-207", "X", &fqdn_universe, 207 }, + { "unknown-208", "X", &fqdn_universe, 208 }, + { "unknown-209", "X", &fqdn_universe, 209 }, + { "unknown-210", "X", &fqdn_universe, 210 }, + { "unknown-211", "X", &fqdn_universe, 211 }, + { "unknown-212", "X", &fqdn_universe, 212 }, + { "unknown-213", "X", &fqdn_universe, 213 }, + { "unknown-214", "X", &fqdn_universe, 214 }, + { "unknown-215", "X", &fqdn_universe, 215 }, + { "unknown-216", "X", &fqdn_universe, 216 }, + { "unknown-217", "X", &fqdn_universe, 217 }, + { "unknown-218", "X", &fqdn_universe, 218 }, + { "unknown-219", "X", &fqdn_universe, 219 }, + { "unknown-220", "X", &fqdn_universe, 220 }, + { "unknown-221", "X", &fqdn_universe, 221 }, + { "unknown-222", "X", &fqdn_universe, 222 }, + { "unknown-223", "X", &fqdn_universe, 223 }, + { "unknown-224", "X", &fqdn_universe, 224 }, + { "unknown-225", "X", &fqdn_universe, 225 }, + { "unknown-226", "X", &fqdn_universe, 226 }, + { "unknown-227", "X", &fqdn_universe, 227 }, + { "unknown-228", "X", &fqdn_universe, 228 }, + { "unknown-229", "X", &fqdn_universe, 229 }, + { "unknown-230", "X", &fqdn_universe, 230 }, + { "unknown-231", "X", &fqdn_universe, 231 }, + { "unknown-232", "X", &fqdn_universe, 232 }, + { "unknown-233", "X", &fqdn_universe, 233 }, + { "unknown-234", "X", &fqdn_universe, 234 }, + { "unknown-235", "X", &fqdn_universe, 235 }, + { "unknown-236", "X", &fqdn_universe, 236 }, + { "unknown-237", "X", &fqdn_universe, 237 }, + { "unknown-238", "X", &fqdn_universe, 238 }, + { "unknown-239", "X", &fqdn_universe, 239 }, + { "unknown-240", "X", &fqdn_universe, 240 }, + { "unknown-241", "X", &fqdn_universe, 241 }, + { "unknown-242", "X", &fqdn_universe, 242 }, + { "unknown-243", "X", &fqdn_universe, 243 }, + { "unknown-244", "X", &fqdn_universe, 244 }, + { "unknown-245", "X", &fqdn_universe, 245 }, + { "unknown-246", "X", &fqdn_universe, 246 }, + { "unknown-247", "X", &fqdn_universe, 247 }, + { "unknown-248", "X", &fqdn_universe, 248 }, + { "unknown-249", "X", &fqdn_universe, 249 }, + { "unknown-250", "X", &fqdn_universe, 250 }, + { "unknown-251", "X", &fqdn_universe, 251 }, + { "unknown-252", "X", &fqdn_universe, 252 }, + { "unknown-253", "X", &fqdn_universe, 253 }, + { "unknown-254", "X", &fqdn_universe, 254 }, + { "unknown-end", "e", &fqdn_universe, 255 }, }; const char *hardware_types [] = { diff --git a/contrib/isc-dhcp/includes/dhcpd.h b/contrib/isc-dhcp/includes/dhcpd.h index 1b50c6c..376c4f3 100644 --- a/contrib/isc-dhcp/includes/dhcpd.h +++ b/contrib/isc-dhcp/includes/dhcpd.h @@ -425,6 +425,11 @@ struct lease_state { #define SV_UPDATE_STATIC_LEASES 43 #define SV_LOG_FACILITY 44 #define SV_DO_FORWARD_UPDATES 45 +#define SV_PING_TIMEOUT 46 + +#if !defined (DEFAULT_PING_TIMEOUT) +# define DEFAULT_PING_TIMEOUT 1 +#endif #if !defined (DEFAULT_DEFAULT_LEASE_TIME) # define DEFAULT_DEFAULT_LEASE_TIME 43200 -- cgit v1.1