From: Ted Lemon <source@isc.org>
Date: Thu, 28 Dec 2000 23:20:53 +0000 (+0000)
Subject: Correctly implement the subnet selection option.
X-Git-Tag: V3-BETA-2-PATCH-12~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fdb840514ca77d6b22e115cc6b811725ba689fd;p=thirdparty%2Fdhcp.git

Correctly implement the subnet selection option.
---

diff --git a/common/tables.c b/common/tables.c
index ba11e7546..73de6b487 100644
--- a/common/tables.c
+++ b/common/tables.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: tables.c,v 1.47 2000/12/11 18:56:32 neild Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: tables.c,v 1.48 2000/12/28 23:19:15 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -207,7 +207,7 @@ struct option dhcp_options [256] = {
 	{ "option-115", "X",				&dhcp_universe, 115 },
 	{ "option-116", "X",				&dhcp_universe, 116 },
 	{ "option-117", "X",				&dhcp_universe, 117 },
-	{ "option-118", "X",				&dhcp_universe, 118 },
+	{ "subnet-selection", "X",			&dhcp_universe, 118 },
 	{ "option-119", "X",				&dhcp_universe, 119 },
 	{ "option-120", "X",				&dhcp_universe, 120 },
 	{ "option-121", "X",				&dhcp_universe, 121 },
@@ -300,7 +300,7 @@ struct option dhcp_options [256] = {
 	{ "option-208", "X",				&dhcp_universe, 208 },
 	{ "option-209", "X",				&dhcp_universe, 209 },
 	{ "authenticate", "X",				&dhcp_universe, 210 },
-	{ "subnet-selection-xx", "X",			&dhcp_universe, 211 },
+	{ "option-211", "X",				&dhcp_universe, 211 },
 	{ "option-212", "X",				&dhcp_universe, 212 },
 	{ "option-213", "X",				&dhcp_universe, 213 },
 	{ "option-214", "X",				&dhcp_universe, 214 },
diff --git a/includes/dhcp.h b/includes/dhcp.h
index 0602ae107..997e9ee7a 100644
--- a/includes/dhcp.h
+++ b/includes/dhcp.h
@@ -159,15 +159,13 @@ struct dhcp_packet {
 #define DHO_USER_CLASS			77
 #define DHO_FQDN			81
 #define DHO_DHCP_AGENT_OPTIONS		82
+#define DHO_SUBNET_SELECTION		118 /* RFC3011! */
 /* The DHO_AUTHENTICATE option is not a standard yet, so I've
    allocated an option out of the "local" option space for it on a
    temporary basis.  Once an option code number is assigned, I will
    immediately and shamelessly break this, so don't count on it
    continuing to work. */
 #define DHO_AUTHENTICATE		210
-/* The DHO_SUBNET_SELECTION option is also not standard - same deal
-   as above. */
-#define DHO_SUBNET_SELECTION		211
 
 #define DHO_END				255