From b8ffd11e65734f90ebdaedb0ce32196fb150db01 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Tue, 15 Jul 2014 11:03:17 +0800 Subject: [PATCH] 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 Signed-off-by: Denys Vlasenko --- networking/udhcp/common.c | 2 ++ networking/udhcp/common.h | 1 + 2 files changed, 3 insertions(+) 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[] = { { OPTION_U8 , 0x85 }, /* DHCP_VLAN_PRIORITY */ #endif { OPTION_STRING , 0xd1 }, /* DHCP_PXE_CONF_FILE */ + { OPTION_STRING , 0xd2 }, /* DHCP_PXE_PATH_PREFIX */ { OPTION_6RD , 0xd4 }, /* DHCP_6RD */ { OPTION_STATIC_ROUTES | OPTION_LIST , 0xf9 }, /* DHCP_MS_STATIC_ROUTES */ { OPTION_STRING , 0xfc }, /* DHCP_WPAD */ @@ -130,6 +131,7 @@ const char dhcp_option_strings[] ALIGN1 = "vlanpriority" "\0"/* DHCP_VLAN_PRIORITY */ #endif "pxeconffile" "\0" /* DHCP_PXE_CONF_FILE */ + "pxepathprefix" "\0" /* DHCP_PXE_PATH_PREFIX */ "ip6rd" "\0" /* DHCP_6RD */ "msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */ "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 { //#define DHCP_VLAN_ID 0x84 /* 802.1P VLAN ID */ //#define DHCP_VLAN_PRIORITY 0x85 /* 802.1Q VLAN priority */ //#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_WPAD 0xfc /* MSIE's Web Proxy Autodiscovery Protocol */ #define DHCP_END 0xff -- 2.25.1