aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2013-11-12 11:18:26 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2013-11-12 11:18:26 +0100
commitd3092c99ae90f2be2e1f990eab15921ea26652fd (patch)
treed9b533f1173f09baeb0f8e1d4b688edb99de9e0c
parent087843a65b82ca2be486118214293530a6814d2d (diff)
downloadbusybox-w32-d3092c99ae90f2be2e1f990eab15921ea26652fd.tar.gz
busybox-w32-d3092c99ae90f2be2e1f990eab15921ea26652fd.tar.bz2
busybox-w32-d3092c99ae90f2be2e1f990eab15921ea26652fd.zip
udhcp: add PXELINUX config file option (code 209) definition
This change adds a definition for DHCP option 209. RFC 5071 defines code 209 as a configuration file for a PXE bootloader; this change uses the string "pxeconffile" as its text identifier. Signed-off-by: Jeremy Kerr <jk@ozlabs.org> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--networking/udhcp/common.c2
-rw-r--r--networking/udhcp/common.h5
2 files changed, 5 insertions, 2 deletions
diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c
index 11b7b1f06..fe322db4f 100644
--- a/networking/udhcp/common.c
+++ b/networking/udhcp/common.c
@@ -62,6 +62,7 @@ const struct dhcp_optflag dhcp_optflags[] = {
62 { OPTION_U16 , 0x84 }, /* DHCP_VLAN_ID */ 62 { OPTION_U16 , 0x84 }, /* DHCP_VLAN_ID */
63 { OPTION_U8 , 0x85 }, /* DHCP_VLAN_PRIORITY */ 63 { OPTION_U8 , 0x85 }, /* DHCP_VLAN_PRIORITY */
64#endif 64#endif
65 { OPTION_STRING , 0xd1 }, /* DHCP_PXE_CONF_FILE */
65 { OPTION_6RD , 0xd4 }, /* DHCP_6RD */ 66 { OPTION_6RD , 0xd4 }, /* DHCP_6RD */
66 { OPTION_STATIC_ROUTES | OPTION_LIST , 0xf9 }, /* DHCP_MS_STATIC_ROUTES */ 67 { OPTION_STATIC_ROUTES | OPTION_LIST , 0xf9 }, /* DHCP_MS_STATIC_ROUTES */
67 { OPTION_STRING , 0xfc }, /* DHCP_WPAD */ 68 { OPTION_STRING , 0xfc }, /* DHCP_WPAD */
@@ -128,6 +129,7 @@ const char dhcp_option_strings[] ALIGN1 =
128 "vlanid" "\0" /* DHCP_VLAN_ID */ 129 "vlanid" "\0" /* DHCP_VLAN_ID */
129 "vlanpriority" "\0"/* DHCP_VLAN_PRIORITY */ 130 "vlanpriority" "\0"/* DHCP_VLAN_PRIORITY */
130#endif 131#endif
132 "pxeconffile" "\0" /* DHCP_PXE_CONF_FILE */
131 "ip6rd" "\0" /* DHCP_6RD */ 133 "ip6rd" "\0" /* DHCP_6RD */
132 "msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */ 134 "msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */
133 "wpad" "\0" /* DHCP_WPAD */ 135 "wpad" "\0" /* DHCP_WPAD */
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index 0e8e45fd2..5e70d609f 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -149,8 +149,9 @@ enum {
149//#define DHCP_DOMAIN_SEARCH 0x77 /* RFC 3397. set of ASCIZ string, DNS-style compressed */ 149//#define DHCP_DOMAIN_SEARCH 0x77 /* RFC 3397. set of ASCIZ string, DNS-style compressed */
150//#define DHCP_SIP_SERVERS 0x78 /* RFC 3361. flag byte, then: 0: domain names, 1: IP addrs */ 150//#define DHCP_SIP_SERVERS 0x78 /* RFC 3361. flag byte, then: 0: domain names, 1: IP addrs */
151//#define DHCP_STATIC_ROUTES 0x79 /* RFC 3442. (mask,ip,router) tuples */ 151//#define DHCP_STATIC_ROUTES 0x79 /* RFC 3442. (mask,ip,router) tuples */
152#define DHCP_VLAN_ID 0x84 /* 802.1P VLAN ID */ 152//#define DHCP_VLAN_ID 0x84 /* 802.1P VLAN ID */
153#define DHCP_VLAN_PRIORITY 0x85 /* 802.1Q VLAN priority */ 153//#define DHCP_VLAN_PRIORITY 0x85 /* 802.1Q VLAN priority */
154//#define DHCP_PXE_CONF_FILE 0xd1 /* RFC 5071 Configuration File */
154//#define DHCP_MS_STATIC_ROUTES 0xf9 /* Microsoft's pre-RFC 3442 code for 0x79? */ 155//#define DHCP_MS_STATIC_ROUTES 0xf9 /* Microsoft's pre-RFC 3442 code for 0x79? */
155//#define DHCP_WPAD 0xfc /* MSIE's Web Proxy Autodiscovery Protocol */ 156//#define DHCP_WPAD 0xfc /* MSIE's Web Proxy Autodiscovery Protocol */
156#define DHCP_END 0xff 157#define DHCP_END 0xff