Eliminate unnecessary 'code' field from struct option. Make

dhcp_options const.

ok henning@

5 files changed, 291 insertions, 294 deletions

diff --git a/sbin/dhclient/clparse.c b/sbin/dhclient/clparse.c
index 30c990f991d..a67ea80e0a8 100644
--- a/sbin/dhclient/clparse.c
+++ b/sbin/dhclient/clparse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clparse.c,v 1.23 2005/07/15 22:33:04 krw Exp $	*/
+/*	$OpenBSD: clparse.c,v 1.24 2005/07/16 14:09:51 krw Exp $	*/
 
 /* Parser for dhclient config and lease files... */
 
@@ -185,34 +185,32 @@ void
 parse_client_statement(FILE *cfile, struct interface_info *ip,
     struct client_config *config)
 {
-	int		 token;
+	int		 token, code;
 	char		*val;
-	struct option	*option;
 
 	switch (next_token(&val, cfile)) {
 	case SEND:
 		parse_option_decl(cfile, &config->send_options[0]);
 		return;
 	case DEFAULT:
-		option = parse_option_decl(cfile, &config->defaults[0]);
-		if (option)
-			config->default_actions[option->code] = ACTION_DEFAULT;
+		code = parse_option_decl(cfile, &config->defaults[0]);
+		if (code != -1)
+			config->default_actions[code] = ACTION_DEFAULT;
 		return;
 	case SUPERSEDE:
-		option = parse_option_decl(cfile, &config->defaults[0]);
-		if (option)
-			config->default_actions[option->code] =
-			    ACTION_SUPERSEDE;
+		code = parse_option_decl(cfile, &config->defaults[0]);
+		if (code != -1)
+			config->default_actions[code] = ACTION_SUPERSEDE;
 		return;
 	case APPEND:
-		option = parse_option_decl(cfile, &config->defaults[0]);
-		if (option)
-			config->default_actions[option->code] = ACTION_APPEND;
+		code = parse_option_decl(cfile, &config->defaults[0]);
+		if (code != -1)
+			config->default_actions[code] = ACTION_APPEND;
 		return;
 	case PREPEND:
-		option = parse_option_decl(cfile, &config->defaults[0]);
-		if (option)
-			config->default_actions[option->code] = ACTION_PREPEND;
+		code = parse_option_decl(cfile, &config->defaults[0]);
+		if (code != -1)
+			config->default_actions[code] = ACTION_PREPEND;
 		return;
 	case MEDIA:
 		parse_string_list(cfile, &config->media, 1);
@@ -659,7 +657,7 @@ parse_client_lease_declaration(FILE *cfile, struct client_lease *lease,
 	}
 }
 
-struct option *
+int
 parse_option_decl(FILE *cfile, struct option_data *options)
 {
 	char		*val;
@@ -678,7 +676,7 @@ parse_option_decl(FILE *cfile, struct option_data *options)
 		parse_warn("expecting identifier after option keyword.");
 		if (token != SEMI)
 			skip_to_semi(cfile);
-		return (NULL);
+		return (-1);
 	}
 
 	/* Look up the actual option info. */
@@ -690,7 +688,7 @@ parse_option_decl(FILE *cfile, struct option_data *options)
 	if (code > 255) {
 		parse_warn("no option named %s", val);
 		skip_to_semi(cfile);
-		return (NULL);
+		return (-1);
 	}
 
 	/* Parse the option data... */
@@ -709,14 +707,14 @@ parse_option_decl(FILE *cfile, struct option_data *options)
 				if (token != STRING) {
 					parse_warn("expecting string.");
 					skip_to_semi(cfile);
-					return (NULL);
+					return (-1);
 				}
 				len = strlen(val);
 				if (hunkix + len + 1 > sizeof(hunkbuf)) {
 					parse_warn("option data buffer %s",
 					    "overflow");
 					skip_to_semi(cfile);
-					return (NULL);
+					return (-1);
 				}
 				memcpy(&hunkbuf[hunkix], val, len + 1);
 				nul_term = 1;
@@ -724,7 +722,7 @@ parse_option_decl(FILE *cfile, struct option_data *options)
 				break;
 			case 'I': /* IP address. */
 				if (!parse_ip_addr(cfile, &ip_addr))
-					return (NULL);
+					return (-1);
 				len = ip_addr.len;
 				dp = ip_addr.iabuf;
 alloc:
@@ -732,7 +730,7 @@ alloc:
 					parse_warn("option data buffer "
 					    "overflow");
 					skip_to_semi(cfile);
-					return (NULL);
+					return (-1);
 				}
 				memcpy(&hunkbuf[hunkix], dp, len);
 				hunkix += len;
@@ -745,7 +743,7 @@ need_number:
 					parse_warn("expecting number.");
 					if (token != SEMI)
 						skip_to_semi(cfile);
-					return (NULL);
+					return (-1);
 				}
 				convert_num(buf, val, 0, 32);
 				len = 4;
@@ -776,7 +774,7 @@ need_number:
 bad_flag:
 					if (token != SEMI)
 						skip_to_semi(cfile);
-					return (NULL);
+					return (-1);
 				}
 				if (!strcasecmp(val, "true") ||
 				    !strcasecmp(val, "on"))
@@ -795,7 +793,7 @@ bad_flag:
 				warning("Bad format %c in parse_option_param.",
 				    *fmt);
 				skip_to_semi(cfile);
-				return (NULL);
+				return (-1);
 			}
 		}
 		token = next_token(&val, cfile);
@@ -804,7 +802,7 @@ bad_flag:
 	if (token != SEMI) {
 		parse_warn("semicolon expected.");
 		skip_to_semi(cfile);
-		return (NULL);
+		return (-1);
 	}
 
 	options[code].data = malloc(hunkix + nul_term);
@@ -812,7 +810,7 @@ bad_flag:
 		error("out of memory allocating option data.");
 	memcpy(options[code].data, hunkbuf, hunkix + nul_term);
 	options[code].len = hunkix;
-	return (&dhcp_options[code]);
+	return (code);
 }
 
 void
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index dd258f18bc2..00a4908462c 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dhclient.c,v 1.75 2005/07/13 23:31:32 deraadt Exp $	*/
+/*	$OpenBSD: dhclient.c,v 1.76 2005/07/16 14:09:51 krw Exp $	*/
 
 /*
  * Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -2048,7 +2048,7 @@ script_flush_env(struct client_state *client)
 }
 
 int
-dhcp_option_ev_name(char *buf, size_t buflen, struct option *option)
+dhcp_option_ev_name(char *buf, size_t buflen, const struct option *option)
 {
 	int i;
 
diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h
index 9b612310b85..43ecb8d4556 100644
--- a/sbin/dhclient/dhcpd.h
+++ b/sbin/dhclient/dhcpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dhcpd.h,v 1.42 2005/07/13 23:25:55 krw Exp $	*/
+/*	$OpenBSD: dhcpd.h,v 1.43 2005/07/16 14:09:51 krw Exp $	*/
 
 /*
  * Copyright (c) 2004 Henning Brauer <henning@openbsd.org>
@@ -292,7 +292,7 @@ void remove_protocol(struct protocol *);
 int interface_link_status(char *);
 
 /* tables.c */
-extern struct option dhcp_options[256];
+extern const struct option dhcp_options[256];
 
 /* convert.c */
 u_int32_t getULong(unsigned char *);
@@ -355,7 +355,7 @@ void client_envadd(struct client_state *,
 void script_set_env(struct client_state *, const char *, const char *,
     const char *);
 void script_flush_env(struct client_state *);
-int dhcp_option_ev_name(char *, size_t, struct option *);
+int dhcp_option_ev_name(char *, size_t, const struct option *);
 
 struct client_lease *packet_to_lease(struct packet *);
 void go_daemon(void);
@@ -393,7 +393,7 @@ void make_client_config(struct interface_info *, struct client_config *);
 void parse_client_lease_statement(FILE *, int);
 void parse_client_lease_declaration(FILE *, struct client_lease *,
     struct interface_info **);
-struct option *parse_option_decl(FILE *, struct option_data *);
+int parse_option_decl(FILE *, struct option_data *);
 void parse_string_list(FILE *, struct string_list **, int);
 void parse_reject_statement(FILE *, struct client_config *);
 
diff --git a/sbin/dhclient/tables.c b/sbin/dhclient/tables.c
index 75c698cff1d..49e1a52cc2e 100644
--- a/sbin/dhclient/tables.c
+++ b/sbin/dhclient/tables.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tables.c,v 1.9 2005/07/13 23:25:55 krw Exp $	*/
+/*	$OpenBSD: tables.c,v 1.10 2005/07/16 14:09:51 krw Exp $	*/
 
 /* Tables of information... */
 
@@ -60,261 +60,261 @@
  * A - array of whatever precedes (e.g., IA means array of IP addresses)
  */
 
-struct option dhcp_options[256] = {
-	{ "pad", "",					0 },
-	{ "subnet-mask", "I",				1 },
-	{ "time-offset", "l",				2 },
-	{ "routers", "IA",				3 },
-	{ "time-servers", "IA",				4 },
-	{ "ien116-name-servers", "IA",			5 },
-	{ "domain-name-servers", "IA",			6 },
-	{ "log-servers", "IA",				7 },
-	{ "cookie-servers", "IA",			8 },
-	{ "lpr-servers", "IA",				9 },
-	{ "impress-servers", "IA",			10 },
-	{ "resource-location-servers", "IA",		11 },
-	{ "host-name", "X",				12 },
-	{ "boot-size", "S",				13 },
-	{ "merit-dump", "t",				14 },
-	{ "domain-name", "t",				15 },
-	{ "swap-server", "I",				16 },
-	{ "root-path", "t",				17 },
-	{ "extensions-path", "t",			18 },
-	{ "ip-forwarding", "f",				19 },
-	{ "non-local-source-routing", "f",		20 },
-	{ "policy-filter", "IIA",			21 },
-	{ "max-dgram-reassembly", "S",			22 },
-	{ "default-ip-ttl", "B",			23 },
-	{ "path-mtu-aging-timeout", "L",		24 },
-	{ "path-mtu-plateau-table", "SA",		25 },
-	{ "interface-mtu", "S",				26 },
-	{ "all-subnets-local", "f",			27 },
-	{ "broadcast-address", "I",			28 },
-	{ "perform-mask-discovery", "f",		29 },
-	{ "mask-supplier", "f",				30 },
-	{ "router-discovery", "f",			31 },
-	{ "router-solicitation-address", "I",		32 },
-	{ "static-routes", "IIA",			33 },
-	{ "trailer-encapsulation", "f",			34 },
-	{ "arp-cache-timeout", "L",			35 },
-	{ "ieee802-3-encapsulation", "f",		36 },
-	{ "default-tcp-ttl", "B",			37 },
-	{ "tcp-keepalive-interval", "L",		38 },
-	{ "tcp-keepalive-garbage", "f",			39 },
-	{ "nis-domain", "t",				40 },
-	{ "nis-servers", "IA",				41 },
-	{ "ntp-servers", "IA",				42 },
-	{ "vendor-encapsulated-options", "X",		43 },
-	{ "netbios-name-servers", "IA",			44 },
-	{ "netbios-dd-server", "IA",			45 },
-	{ "netbios-node-type", "B",			46 },
-	{ "netbios-scope", "t",				47 },
-	{ "font-servers", "IA",				48 },
-	{ "x-display-manager", "IA",			49 },
-	{ "dhcp-requested-address", "I",		50 },
-	{ "dhcp-lease-time", "L",			51 },
-	{ "dhcp-option-overload", "B",			52 },
-	{ "dhcp-message-type", "B",			53 },
-	{ "dhcp-server-identifier", "I",		54 },
-	{ "dhcp-parameter-request-list", "BA",		55 },
-	{ "dhcp-message", "t",				56 },
-	{ "dhcp-max-message-size", "S",			57 },
-	{ "dhcp-renewal-time", "L",			58 },
-	{ "dhcp-rebinding-time", "L",			59 },
-	{ "dhcp-class-identifier", "t",			60 },
-	{ "dhcp-client-identifier", "X",		61 },
-	{ "option-62", "X",				62 },
-	{ "option-63", "X",				63 },
-	{ "nisplus-domain", "t",			64 },
-	{ "nisplus-servers", "IA",			65 },
-	{ "tftp-server-name", "t",			66 },
-	{ "bootfile-name", "t",				67 },
-	{ "mobile-ip-home-agent", "IA",			68 },
-	{ "smtp-server", "IA",				69 },
-	{ "pop-server", "IA",				70 },
-	{ "nntp-server", "IA",				71 },
-	{ "www-server", "IA",				72 },
-	{ "finger-server", "IA",			73 },
-	{ "irc-server", "IA",				74 },
-	{ "streettalk-server", "IA",			75 },
-	{ "streettalk-directory-assistance-server", "IA", 76 },
-	{ "user-class", "t",				77 },
-	{ "option-78", "X",				78 },
-	{ "option-79", "X",				79 },
-	{ "option-80", "X",				80 },
-	{ "option-81", "X",				81 },
-	{ "option-82", "X",				82 },
-	{ "option-83", "X",				83 },
-	{ "option-84", "X",				84 },
-	{ "nds-servers", "IA",				85 },
-	{ "nds-tree-name", "X",				86 },
-	{ "nds-context", "X",				87 },
-	{ "option-88", "X",				88 },
-	{ "option-89", "X",				89 },
-	{ "option-90", "X",				90 },
-	{ "option-91", "X",				91 },
-	{ "option-92", "X",				92 },
-	{ "option-93", "X",				93 },
-	{ "option-94", "X",				94 },
-	{ "option-95", "X",				95 },
-	{ "option-96", "X",				96 },
-	{ "option-97", "X",				97 },
-	{ "option-98", "X",				98 },
-	{ "option-99", "X",				99 },
-	{ "option-100", "X",				100 },
-	{ "option-101", "X",				101 },
-	{ "option-102", "X",				102 },
-	{ "option-103", "X",				103 },
-	{ "option-104", "X",				104 },
-	{ "option-105", "X",				105 },
-	{ "option-106", "X",				106 },
-	{ "option-107", "X",				107 },
-	{ "option-108", "X",				108 },
-	{ "option-109", "X",				109 },
-	{ "option-110", "X",				110 },
-	{ "option-111", "X",				111 },
-	{ "option-112", "X",				112 },
-	{ "option-113", "X",				113 },
-	{ "option-114", "X",				114 },
-	{ "option-115", "X",				115 },
-	{ "option-116", "X",				116 },
-	{ "option-117", "X",				117 },
-	{ "option-118", "X",				118 },
-	{ "option-119", "X",				119 },
-	{ "option-120", "X",				120 },
-	{ "option-121", "X",				121 },
-	{ "option-122", "X",				122 },
-	{ "option-123", "X",				123 },
-	{ "option-124", "X",				124 },
-	{ "option-125", "X",				125 },
-	{ "option-126", "X",				126 },
-	{ "option-127", "X",				127 },
-	{ "option-128", "X",				128 },
-	{ "option-129", "X",				129 },
-	{ "option-130", "X",				130 },
-	{ "option-131", "X",				131 },
-	{ "option-132", "X",				132 },
-	{ "option-133", "X",				133 },
-	{ "option-134", "X",				134 },
-	{ "option-135", "X",				135 },
-	{ "option-136", "X",				136 },
-	{ "option-137", "X",				137 },
-	{ "option-138", "X",				138 },
-	{ "option-139", "X",				139 },
-	{ "option-140", "X",				140 },
-	{ "option-141", "X",				141 },
-	{ "option-142", "X",				142 },
-	{ "option-143", "X",				143 },
-	{ "option-144", "X",				144 },
-	{ "option-145", "X",				145 },
-	{ "option-146", "X",				146 },
-	{ "option-147", "X",				147 },
-	{ "option-148", "X",				148 },
-	{ "option-149", "X",				149 },
-	{ "option-150", "X",				150 },
-	{ "option-151", "X",				151 },
-	{ "option-152", "X",				152 },
-	{ "option-153", "X",				153 },
-	{ "option-154", "X",				154 },
-	{ "option-155", "X",				155 },
-	{ "option-156", "X",				156 },
-	{ "option-157", "X",				157 },
-	{ "option-158", "X",				158 },
-	{ "option-159", "X",				159 },
-	{ "option-160", "X",				160 },
-	{ "option-161", "X",				161 },
-	{ "option-162", "X",				162 },
-	{ "option-163", "X",				163 },
-	{ "option-164", "X",				164 },
-	{ "option-165", "X",				165 },
-	{ "option-166", "X",				166 },
-	{ "option-167", "X",				167 },
-	{ "option-168", "X",				168 },
-	{ "option-169", "X",				169 },
-	{ "option-170", "X",				170 },
-	{ "option-171", "X",				171 },
-	{ "option-172", "X",				172 },
-	{ "option-173", "X",				173 },
-	{ "option-174", "X",				174 },
-	{ "option-175", "X",				175 },
-	{ "option-176", "X",				176 },
-	{ "option-177", "X",				177 },
-	{ "option-178", "X",				178 },
-	{ "option-179", "X",				179 },
-	{ "option-180", "X",				180 },
-	{ "option-181", "X",				181 },
-	{ "option-182", "X",				182 },
-	{ "option-183", "X",				183 },
-	{ "option-184", "X",				184 },
-	{ "option-185", "X",				185 },
-	{ "option-186", "X",				186 },
-	{ "option-187", "X",				187 },
-	{ "option-188", "X",				188 },
-	{ "option-189", "X",				189 },
-	{ "option-190", "X",				190 },
-	{ "option-191", "X",				191 },
-	{ "option-192", "X",				192 },
-	{ "option-193", "X",				193 },
-	{ "option-194", "X",				194 },
-	{ "option-195", "X",				195 },
-	{ "option-196", "X",				196 },
-	{ "option-197", "X",				197 },
-	{ "option-198", "X",				198 },
-	{ "option-199", "X",				199 },
-	{ "option-200", "X",				200 },
-	{ "option-201", "X",				201 },
-	{ "option-202", "X",				202 },
-	{ "option-203", "X",				203 },
-	{ "option-204", "X",				204 },
-	{ "option-205", "X",				205 },
-	{ "option-206", "X",				206 },
-	{ "option-207", "X",				207 },
-	{ "option-208", "X",				208 },
-	{ "option-209", "X",				209 },
-	{ "option-210", "X",				210 },
-	{ "option-211", "X",				211 },
-	{ "option-212", "X",				212 },
-	{ "option-213", "X",				213 },
-	{ "option-214", "X",				214 },
-	{ "option-215", "X",				215 },
-	{ "option-216", "X",				216 },
-	{ "option-217", "X",				217 },
-	{ "option-218", "X",				218 },
-	{ "option-219", "X",				219 },
-	{ "option-220", "X",				220 },
-	{ "option-221", "X",				221 },
-	{ "option-222", "X",				222 },
-	{ "option-223", "X",				223 },
-	{ "option-224", "X",				224 },
-	{ "option-225", "X",				225 },
-	{ "option-226", "X",				226 },
-	{ "option-227", "X",				227 },
-	{ "option-228", "X",				228 },
-	{ "option-229", "X",				229 },
-	{ "option-230", "X",				230 },
-	{ "option-231", "X",				231 },
-	{ "option-232", "X",				232 },
-	{ "option-233", "X",				233 },
-	{ "option-234", "X",				234 },
-	{ "option-235", "X",				235 },
-	{ "option-236", "X",				236 },
-	{ "option-237", "X",				237 },
-	{ "option-238", "X",				238 },
-	{ "option-239", "X",				239 },
-	{ "option-240", "X",				240 },
-	{ "option-241", "X",				241 },
-	{ "option-242", "X",				242 },
-	{ "option-243", "X",				243 },
-	{ "option-244", "X",				244 },
-	{ "option-245", "X",				245 },
-	{ "option-246", "X",				246 },
-	{ "option-247", "X",				247 },
-	{ "option-248", "X",				248 },
-	{ "option-249", "X",				249 },
-	{ "option-250", "X",				250 },
-	{ "option-251", "X",				251 },
-	{ "option-252", "X",				252 },
-	{ "option-253", "X",				253 },
-	{ "option-254", "X",				254 },
-	{ "option-end", "e",				255 },
+const struct option dhcp_options[256] = {
+	/*   0 */ { "pad", "" },
+	/*   1 */ { "subnet-mask", "I" },
+	/*   2 */ { "time-offset", "l" },
+	/*   3 */ { "routers", "IA" },
+	/*   4 */ { "time-servers", "IA" },
+	/*   5 */ { "ien116-name-servers", "IA" },
+	/*   6 */ { "domain-name-servers", "IA" },
+	/*   7 */ { "log-servers", "IA" },
+	/*   8 */ { "cookie-servers", "IA" },
+	/*   9 */ { "lpr-servers", "IA" },
+	/*  10 */ { "impress-servers", "IA" },
+	/*  11 */ { "resource-location-servers", "IA" },
+	/*  12 */ { "host-name", "X" },
+	/*  13 */ { "boot-size", "S" },
+	/*  14 */ { "merit-dump", "t" },
+	/*  15 */ { "domain-name", "t" },
+	/*  16 */ { "swap-server", "I" },
+	/*  17 */ { "root-path", "t" },
+	/*  18 */ { "extensions-path", "t" },
+	/*  19 */ { "ip-forwarding", "f" },
+	/*  20 */ { "non-local-source-routing", "f" },
+	/*  21 */ { "policy-filter", "IIA" },
+	/*  22 */ { "max-dgram-reassembly", "S" },
+	/*  23 */ { "default-ip-ttl", "B" },
+	/*  24 */ { "path-mtu-aging-timeout", "L" },
+	/*  25 */ { "path-mtu-plateau-table", "SA" },
+	/*  26 */ { "interface-mtu", "S" },
+	/*  27 */ { "all-subnets-local", "f" },
+	/*  28 */ { "broadcast-address", "I" },
+	/*  29 */ { "perform-mask-discovery", "f" },
+	/*  30 */ { "mask-supplier", "f" },
+	/*  31 */ { "router-discovery", "f" },
+	/*  32 */ { "router-solicitation-address", "I" },
+	/*  33 */ { "static-routes", "IIA" },
+	/*  34 */ { "trailer-encapsulation", "f" },
+	/*  35 */ { "arp-cache-timeout", "L" },
+	/*  36 */ { "ieee802-3-encapsulation", "f" },
+	/*  37 */ { "default-tcp-ttl", "B" },
+	/*  38 */ { "tcp-keepalive-interval", "L" },
+	/*  39 */ { "tcp-keepalive-garbage", "f" },
+	/*  40 */ { "nis-domain", "t" },
+	/*  41 */ { "nis-servers", "IA" },
+	/*  42 */ { "ntp-servers", "IA" },
+	/*  43 */ { "vendor-encapsulated-options", "X" },
+	/*  44 */ { "netbios-name-servers", "IA" },
+	/*  45 */ { "netbios-dd-server", "IA" },
+	/*  46 */ { "netbios-node-type", "B" },
+	/*  47 */ { "netbios-scope", "t" },
+	/*  48 */ { "font-servers", "IA" },
+	/*  49 */ { "x-display-manager", "IA" },
+	/*  50 */ { "dhcp-requested-address", "I" },
+	/*  51 */ { "dhcp-lease-time", "L" },
+	/*  52 */ { "dhcp-option-overload", "B" },
+	/*  53 */ { "dhcp-message-type", "B" },
+	/*  54 */ { "dhcp-server-identifier", "I" },
+	/*  55 */ { "dhcp-parameter-request-list", "BA" },
+	/*  56 */ { "dhcp-message", "t" },
+	/*  57 */ { "dhcp-max-message-size", "S" },
+	/*  58 */ { "dhcp-renewal-time", "L" },
+	/*  59 */ { "dhcp-rebinding-time", "L" },
+	/*  60 */ { "dhcp-class-identifier", "t" },
+	/*  61 */ { "dhcp-client-identifier", "X" },
+	/*  62 */ { "option-62", "X" },
+	/*  63 */ { "option-63", "X" },
+	/*  64 */ { "nisplus-domain", "t" },
+	/*  65 */ { "nisplus-servers", "IA" },
+	/*  66 */ { "tftp-server-name", "t" },
+	/*  67 */ { "bootfile-name", "t" },
+	/*  68 */ { "mobile-ip-home-agent", "IA" },
+	/*  69 */ { "smtp-server", "IA" },
+	/*  70 */ { "pop-server", "IA" },
+	/*  71 */ { "nntp-server", "IA" },
+	/*  72 */ { "www-server", "IA" },
+	/*  73 */ { "finger-server", "IA" },
+	/*  74 */ { "irc-server", "IA" },
+	/*  75 */ { "streettalk-server", "IA" },
+	/*  76 */ { "streettalk-directory-assistance-server", "IA" },
+	/*  77 */ { "user-class", "t" },
+	/*  78 */ { "option-78", "X" },
+	/*  79 */ { "option-79", "X" },
+	/*  80 */ { "option-80", "X" },
+	/*  81 */ { "option-81", "X" },
+	/*  82 */ { "option-82", "X" },
+	/*  83 */ { "option-83", "X" },
+	/*  84 */ { "option-84", "X" },
+	/*  85 */ { "nds-servers", "IA" },
+	/*  86 */ { "nds-tree-name", "X" },
+	/*  87 */ { "nds-context", "X" },
+	/*  88 */ { "option-88", "X" },
+	/*  89 */ { "option-89", "X" },
+	/*  90 */ { "option-90", "X" },
+	/*  91 */ { "option-91", "X" },
+	/*  92 */ { "option-92", "X" },
+	/*  93 */ { "option-93", "X" },
+	/*  94 */ { "option-94", "X" },
+	/*  95 */ { "option-95", "X" },
+	/*  96 */ { "option-96", "X" },
+	/*  97 */ { "option-97", "X" },
+	/*  98 */ { "option-98", "X" },
+	/*  99 */ { "option-99", "X" },
+	/* 100 */ { "option-100", "X" },
+	/* 101 */ { "option-101", "X" },
+	/* 102 */ { "option-102", "X" },
+	/* 103 */ { "option-103", "X" },
+	/* 104 */ { "option-104", "X" },
+	/* 105 */ { "option-105", "X" },
+	/* 106 */ { "option-106", "X" },
+	/* 107 */ { "option-107", "X" },
+	/* 108 */ { "option-108", "X" },
+	/* 109 */ { "option-109", "X" },
+	/* 110 */ { "option-110", "X" },
+	/* 111 */ { "option-111", "X" },
+	/* 112 */ { "option-112", "X" },
+	/* 113 */ { "option-113", "X" },
+	/* 114 */ { "option-114", "X" },
+	/* 115 */ { "option-115", "X" },
+	/* 116 */ { "option-116", "X" },
+	/* 117 */ { "option-117", "X" },
+	/* 118 */ { "option-118", "X" },
+	/* 119 */ { "option-119", "X" },
+	/* 120 */ { "option-120", "X" },
+	/* 121 */ { "option-121", "X" },
+	/* 122 */ { "option-122", "X" },
+	/* 123 */ { "option-123", "X" },
+	/* 124 */ { "option-124", "X" },
+	/* 125 */ { "option-125", "X" },
+	/* 126 */ { "option-126", "X" },
+	/* 127 */ { "option-127", "X" },
+	/* 128 */ { "option-128", "X" },
+	/* 129 */ { "option-129", "X" },
+	/* 130 */ { "option-130", "X" },
+	/* 131 */ { "option-131", "X" },
+	/* 132 */ { "option-132", "X" },
+	/* 133 */ { "option-133", "X" },
+	/* 134 */ { "option-134", "X" },
+	/* 135 */ { "option-135", "X" },
+	/* 136 */ { "option-136", "X" },
+	/* 137 */ { "option-137", "X" },
+	/* 138 */ { "option-138", "X" },
+	/* 139 */ { "option-139", "X" },
+	/* 140 */ { "option-140", "X" },
+	/* 141 */ { "option-141", "X" },
+	/* 142 */ { "option-142", "X" },
+	/* 143 */ { "option-143", "X" },
+	/* 144 */ { "option-144", "X" },
+	/* 145 */ { "option-145", "X" },
+	/* 146 */ { "option-146", "X" },
+	/* 147 */ { "option-147", "X" },
+	/* 148 */ { "option-148", "X" },
+	/* 149 */ { "option-149", "X" },
+	/* 150 */ { "option-150", "X" },
+	/* 151 */ { "option-151", "X" },
+	/* 152 */ { "option-152", "X" },
+	/* 153 */ { "option-153", "X" },
+	/* 154 */ { "option-154", "X" },
+	/* 155 */ { "option-155", "X" },
+	/* 156 */ { "option-156", "X" },
+	/* 157 */ { "option-157", "X" },
+	/* 158 */ { "option-158", "X" },
+	/* 159 */ { "option-159", "X" },
+	/* 160 */ { "option-160", "X" },
+	/* 161 */ { "option-161", "X" },
+	/* 162 */ { "option-162", "X" },
+	/* 163 */ { "option-163", "X" },
+	/* 164 */ { "option-164", "X" },
+	/* 165 */ { "option-165", "X" },
+	/* 166 */ { "option-166", "X" },
+	/* 167 */ { "option-167", "X" },
+	/* 168 */ { "option-168", "X" },
+	/* 169 */ { "option-169", "X" },
+	/* 170 */ { "option-170", "X" },
+	/* 171 */ { "option-171", "X" },
+	/* 172 */ { "option-172", "X" },
+	/* 173 */ { "option-173", "X" },
+	/* 174 */ { "option-174", "X" },
+	/* 175 */ { "option-175", "X" },
+	/* 176 */ { "option-176", "X" },
+	/* 177 */ { "option-177", "X" },
+	/* 178 */ { "option-178", "X" },
+	/* 179 */ { "option-179", "X" },
+	/* 180 */ { "option-180", "X" },
+	/* 181 */ { "option-181", "X" },
+	/* 182 */ { "option-182", "X" },
+	/* 183 */ { "option-183", "X" },
+	/* 184 */ { "option-184", "X" },
+	/* 185 */ { "option-185", "X" },
+	/* 186 */ { "option-186", "X" },
+	/* 187 */ { "option-187", "X" },
+	/* 188 */ { "option-188", "X" },
+	/* 189 */ { "option-189", "X" },
+	/* 190 */ { "option-190", "X" },
+	/* 191 */ { "option-191", "X" },
+	/* 192 */ { "option-192", "X" },
+	/* 193 */ { "option-193", "X" },
+	/* 194 */ { "option-194", "X" },
+	/* 195 */ { "option-195", "X" },
+	/* 196 */ { "option-196", "X" },
+	/* 197 */ { "option-197", "X" },
+	/* 198 */ { "option-198", "X" },
+	/* 199 */ { "option-199", "X" },
+	/* 200 */ { "option-200", "X" },
+	/* 201 */ { "option-201", "X" },
+	/* 202 */ { "option-202", "X" },
+	/* 203 */ { "option-203", "X" },
+	/* 204 */ { "option-204", "X" },
+	/* 205 */ { "option-205", "X" },
+	/* 206 */ { "option-206", "X" },
+	/* 207 */ { "option-207", "X" },
+	/* 208 */ { "option-208", "X" },
+	/* 209 */ { "option-209", "X" },
+	/* 210 */ { "option-210", "X" },
+	/* 211 */ { "option-211", "X" },
+	/* 212 */ { "option-212", "X" },
+	/* 213 */ { "option-213", "X" },
+	/* 214 */ { "option-214", "X" },
+	/* 215 */ { "option-215", "X" },
+	/* 216 */ { "option-216", "X" },
+	/* 217 */ { "option-217", "X" },
+	/* 218 */ { "option-218", "X" },
+	/* 219 */ { "option-219", "X" },
+	/* 220 */ { "option-220", "X" },
+	/* 221 */ { "option-221", "X" },
+	/* 222 */ { "option-222", "X" },
+	/* 223 */ { "option-223", "X" },
+	/* 224 */ { "option-224", "X" },
+	/* 225 */ { "option-225", "X" },
+	/* 226 */ { "option-226", "X" },
+	/* 227 */ { "option-227", "X" },
+	/* 228 */ { "option-228", "X" },
+	/* 229 */ { "option-229", "X" },
+	/* 230 */ { "option-230", "X" },
+	/* 231 */ { "option-231", "X" },
+	/* 232 */ { "option-232", "X" },
+	/* 233 */ { "option-233", "X" },
+	/* 234 */ { "option-234", "X" },
+	/* 235 */ { "option-235", "X" },
+	/* 236 */ { "option-236", "X" },
+	/* 237 */ { "option-237", "X" },
+	/* 238 */ { "option-238", "X" },
+	/* 239 */ { "option-239", "X" },
+	/* 240 */ { "option-240", "X" },
+	/* 241 */ { "option-241", "X" },
+	/* 242 */ { "option-242", "X" },
+	/* 243 */ { "option-243", "X" },
+	/* 244 */ { "option-244", "X" },
+	/* 245 */ { "option-245", "X" },
+	/* 246 */ { "option-246", "X" },
+	/* 247 */ { "option-247", "X" },
+	/* 248 */ { "option-248", "X" },
+	/* 249 */ { "option-249", "X" },
+	/* 250 */ { "option-250", "X" },
+	/* 251 */ { "option-251", "X" },
+	/* 252 */ { "option-252", "X" },
+	/* 253 */ { "option-253", "X" },
+	/* 254 */ { "option-254", "X" },
+	/* 255 */ { "option-end", "e" },
 };
diff --git a/sbin/dhclient/tree.h b/sbin/dhclient/tree.h
index c4cd676294b..bd035916bdb 100644
--- a/sbin/dhclient/tree.h
+++ b/sbin/dhclient/tree.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tree.h,v 1.10 2005/07/11 18:09:09 krw Exp $	*/
+/*	$OpenBSD: tree.h,v 1.11 2005/07/16 14:09:51 krw Exp $	*/
 
 /* Definitions for address trees... */
 
@@ -48,5 +48,4 @@ typedef struct _pair {
 struct option {
 	char *name;
 	char *format;
-	unsigned char code;
 };