Mercurial > hg > dhcpcd

changeset 1095:a6164d6da348 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CSR should come before other route options according to RFC 3442.
author Roy Marples <roy@marples.name>
date Tue, 25 Nov 2008 12:57:56 +0000
parents 189d7147cb97
children 5e360cae6c2c
files dhcp.c
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/dhcp.c	Tue Nov 25 11:37:55 2008 +0000
+++ b/dhcp.c	Tue Nov 25 12:57:56 2008 +0000
@@ -67,8 +67,13 @@
 
 static const struct dhcp_opt const dhcp_opts[] = {
 	{ 1,	IPV4 | REQUEST,	"subnet_mask" },
+	/* RFC 3442 states that the CSR has to come before all other routes.
+	 * For completeness, we also specify static routes, then routers. */
+	{ 121,  RFC3442 | REQUEST,	"classless_static_routes" },
+	{ 249,  RFC3442,	"ms_classless_static_routes" },
+	{ 33,	IPV4 | ARRAY | REQUEST,	"static_routes" },
+	{ 3,	IPV4 | ARRAY | REQUEST,	"routers" },
 	{ 2,	UINT32,		"time_offset" },
-	{ 3,	IPV4 | ARRAY | REQUEST,	"routers" },
 	{ 4,	IPV4 | ARRAY,	"time_servers" },
 	{ 5,	IPV4 | ARRAY,	"ien116_name_servers" },
 	{ 6,	IPV4 | ARRAY,	"domain_name_servers" },
@@ -98,7 +103,6 @@
 	{ 30,	UINT8,		"mask_supplier" },
 	{ 31,	UINT8,		"router_discovery" },
 	{ 32,	IPV4,		"router_solicitation_address" },
-	{ 33,	IPV4 | ARRAY | REQUEST,	"static_routes" },
 	{ 34,	UINT8,		"trailer_encapsulation" },
 	{ 35, 	UINT32,		"arp_cache_timeout" },
 	{ 36,	UINT16,		"ieee802_3_encapsulation" },
@@ -153,8 +157,6 @@
 	{ 114,	STRING,		"default_url" },
 	{ 118,	IPV4,		"subnet_selection" },
 	{ 119,	STRING | RFC3397,	"domain_search" },
-	{ 121,  RFC3442 | REQUEST,	"classless_static_routes" },
-	{ 249,  RFC3442,	"ms_classless_static_routes" },
 	{ 0, 0, NULL }
 };