emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

udhcp: add PXELINUX path prefix option (code 210) definition

Browse Source 
Like d3092c99, this change adds support for the DHCP "path-prefix"
option, as defined in RFC 5071. We use the string identifer
"pxepathprefix".

Adding this option makes string parsing in the hook scripts simpler.

function                                             old     new   delta
dhcp_option_strings                                  255     269     +14
dhcp_optflags                                         72      74      +2

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Jeremy Kerr 2014-07-15 11:03:17 +08:00 committed by Denys Vlasenko
parent 278842dd72
commit b8ffd11e65
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
networking/udhcp/common.c
View File

@ -63,6 +63,7 @@ const struct dhcp_optflag dhcp_optflags[] = {
{ OPTION_U8 , 0x85 }, /* DHCP_VLAN_PRIORITY */ { OPTION_U8 , 0x85 }, /* DHCP_VLAN_PRIORITY */
#endif #endif
{ OPTION_STRING , 0xd1 }, /* DHCP_PXE_CONF_FILE */ { OPTION_STRING , 0xd1 }, /* DHCP_PXE_CONF_FILE */
{ OPTION_STRING , 0xd2 }, /* DHCP_PXE_PATH_PREFIX */
{ OPTION_6RD , 0xd4 }, /* DHCP_6RD */ { OPTION_6RD , 0xd4 }, /* DHCP_6RD */
{ OPTION_STATIC_ROUTES | OPTION_LIST , 0xf9 }, /* DHCP_MS_STATIC_ROUTES */ { OPTION_STATIC_ROUTES | OPTION_LIST , 0xf9 }, /* DHCP_MS_STATIC_ROUTES */
{ OPTION_STRING , 0xfc }, /* DHCP_WPAD */ { OPTION_STRING , 0xfc }, /* DHCP_WPAD */
@ -130,6 +131,7 @@ const char dhcp_option_strings[] ALIGN1 =
"vlanpriority" "\0"/* DHCP_VLAN_PRIORITY */ "vlanpriority" "\0"/* DHCP_VLAN_PRIORITY */
#endif #endif
"pxeconffile" "\0" /* DHCP_PXE_CONF_FILE */ "pxeconffile" "\0" /* DHCP_PXE_CONF_FILE */
"pxepathprefix" "\0" /* DHCP_PXE_PATH_PREFIX */
"ip6rd" "\0" /* DHCP_6RD */ "ip6rd" "\0" /* DHCP_6RD */
"msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */ "msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */
"wpad" "\0" /* DHCP_WPAD */ "wpad" "\0" /* DHCP_WPAD */

1
networking/udhcp/common.h
View File

@ -152,6 +152,7 @@ enum {
//#define DHCP_VLAN_ID 0x84 /* 802.1P VLAN ID */ //#define DHCP_VLAN_ID 0x84 /* 802.1P VLAN ID */
//#define DHCP_VLAN_PRIORITY 0x85 /* 802.1Q VLAN priority */ //#define DHCP_VLAN_PRIORITY 0x85 /* 802.1Q VLAN priority */
//#define DHCP_PXE_CONF_FILE 0xd1 /* RFC 5071 Configuration File */ //#define DHCP_PXE_CONF_FILE 0xd1 /* RFC 5071 Configuration File */
//#define DHCP_PXE_PATH_PREFIX 0xd2 /* RFC 5071 Configuration File */
//#define DHCP_MS_STATIC_ROUTES 0xf9 /* Microsoft's pre-RFC 3442 code for 0x79? */ //#define DHCP_MS_STATIC_ROUTES 0xf9 /* Microsoft's pre-RFC 3442 code for 0x79? */
//#define DHCP_WPAD 0xfc /* MSIE's Web Proxy Autodiscovery Protocol */ //#define DHCP_WPAD 0xfc /* MSIE's Web Proxy Autodiscovery Protocol */
#define DHCP_END 0xff #define DHCP_END 0xff