diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2014-07-15 11:03:17 +0800 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2014-07-16 14:21:42 +0200 |
commit | b8ffd11e65734f90ebdaedb0ce32196fb150db01 (patch) | |
tree | 85ac9e6e3428fbca9287d8ba4e6110d6f7b0532d | |
parent | 278842dd72b5dcdda5d418f9e7bb4d288c0e909d (diff) | |
download | busybox-w32-b8ffd11e65734f90ebdaedb0ce32196fb150db01.tar.gz busybox-w32-b8ffd11e65734f90ebdaedb0ce32196fb150db01.tar.bz2 busybox-w32-b8ffd11e65734f90ebdaedb0ce32196fb150db01.zip |
udhcp: add PXELINUX path prefix option (code 210) definition
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>
-rw-r--r-- | networking/udhcp/common.c | 2 | ||||
-rw-r--r-- | networking/udhcp/common.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c index fe322db4f..bc41c8d4d 100644 --- a/networking/udhcp/common.c +++ b/networking/udhcp/common.c | |||
@@ -63,6 +63,7 @@ const struct dhcp_optflag dhcp_optflags[] = { | |||
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_STRING , 0xd1 }, /* DHCP_PXE_CONF_FILE */ |
66 | { OPTION_STRING , 0xd2 }, /* DHCP_PXE_PATH_PREFIX */ | ||
66 | { OPTION_6RD , 0xd4 }, /* DHCP_6RD */ | 67 | { OPTION_6RD , 0xd4 }, /* DHCP_6RD */ |
67 | { OPTION_STATIC_ROUTES | OPTION_LIST , 0xf9 }, /* DHCP_MS_STATIC_ROUTES */ | 68 | { OPTION_STATIC_ROUTES | OPTION_LIST , 0xf9 }, /* DHCP_MS_STATIC_ROUTES */ |
68 | { OPTION_STRING , 0xfc }, /* DHCP_WPAD */ | 69 | { OPTION_STRING , 0xfc }, /* DHCP_WPAD */ |
@@ -130,6 +131,7 @@ const char dhcp_option_strings[] ALIGN1 = | |||
130 | "vlanpriority" "\0"/* DHCP_VLAN_PRIORITY */ | 131 | "vlanpriority" "\0"/* DHCP_VLAN_PRIORITY */ |
131 | #endif | 132 | #endif |
132 | "pxeconffile" "\0" /* DHCP_PXE_CONF_FILE */ | 133 | "pxeconffile" "\0" /* DHCP_PXE_CONF_FILE */ |
134 | "pxepathprefix" "\0" /* DHCP_PXE_PATH_PREFIX */ | ||
133 | "ip6rd" "\0" /* DHCP_6RD */ | 135 | "ip6rd" "\0" /* DHCP_6RD */ |
134 | "msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */ | 136 | "msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */ |
135 | "wpad" "\0" /* DHCP_WPAD */ | 137 | "wpad" "\0" /* DHCP_WPAD */ |
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h index 5e70d609f..e5e0f2599 100644 --- a/networking/udhcp/common.h +++ b/networking/udhcp/common.h | |||
@@ -152,6 +152,7 @@ enum { | |||
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_PXE_CONF_FILE 0xd1 /* RFC 5071 Configuration File */ |
155 | //#define DHCP_PXE_PATH_PREFIX 0xd2 /* RFC 5071 Configuration File */ | ||
155 | //#define DHCP_MS_STATIC_ROUTES 0xf9 /* Microsoft's pre-RFC 3442 code for 0x79? */ | 156 | //#define DHCP_MS_STATIC_ROUTES 0xf9 /* Microsoft's pre-RFC 3442 code for 0x79? */ |
156 | //#define DHCP_WPAD 0xfc /* MSIE's Web Proxy Autodiscovery Protocol */ | 157 | //#define DHCP_WPAD 0xfc /* MSIE's Web Proxy Autodiscovery Protocol */ |
157 | #define DHCP_END 0xff | 158 | #define DHCP_END 0xff |