net: Get pxe config file from dhcp option 209
PATCH 1/1 net: Get pxe config file from dhcp option 209
From: Sean Edmond <[email protected]>
Allow dhcp server pass pxe config file full path by using option 209
Signed-off-by Sean Edmond <[email protected]>
--- cmd/Kconfig | 4 ++++ cmd/pxe.c | 8 ++++++++ net/bootp.c | 21 +++++++++++++++++++++ 3 files changed, 33 insertions(+)
cmd/Kconfig +4 -0
@@ -1806,6 +1806,10 @@ config BOOTP_PXE_CLIENTARCH default 0x15 if ARM default 0 if X86 +config BOOTP_PXE_DHCP_OPTION + bool "Request & store 'pxe_configfile' from BOOTP/DHCP server" + depends on BOOTP_PXE + config BOOTP_VCI_STRING string depends on CMD_BOOTP
cmd/pxe.c +8 -0
@@ -141,6 +141,14 @@ int pxe_get(ulong pxefile_addr_r, char **bootdirp, ulong *sizep, bool use_ipv6) env_get("bootfile"), use_ipv6))return -ENOMEM ; +if (IS_ENABLED (CONFIG_BOOTP_PXE_DHCP_OPTION ) && + pxelinux_configfile && !use_ipv6) { +if (pxe_dhcp_option_path (&ctx, pxefile_addr_r) >0 ) + goto done; + + goto error_exit; + } +if (IS_ENABLED (CONFIG_DHCP6_PXE_DHCP_OPTION ) && pxelinux_configfile && use_ipv6) {if (pxe_dhcp_option_path (&ctx, pxefile_addr_r) >0 )
net/bootp.c +21 -0
@@ -26,6 +26,7 @@#ifdef CONFIG_BOOTP_RANDOM_DELAY #include "net_rand.h" #endif +#include <malloc.h> #define BOOTP_VENDOR_MAGIC 0x63825363/* RFC1048 Magic Cookie */
@@ -604,6 +605,10 @@ static int dhcp_extended(u8 *e, int message_type, struct in_addr server_ip, *e++ =42 ; *cnt +=1 ;#endif +if (IS_ENABLED (CONFIG_BOOTP_PXE_DHCP_OPTION )) { + *e++ =209 ;/* PXELINUX Config File */ + *cnt +=1 ; + }/* no options, so back up to avoid sending an empty request list */ if (*cnt ==0 ) e -=2 ;
@@ -912,6 +917,22 @@ static void dhcp_process_options(uchar *popt, uchar *end) net_boot_file_name[size] =0 ; }break ; +case 209 :/* PXELINUX Config File */ +if (IS_ENABLED (CONFIG_BOOTP_PXE_DHCP_OPTION )) { +/* In case it has already been allocated when get DHCP Offer packet, +* free first to avoid memory leak. +*/ +if (pxelinux_configfile) +free (pxelinux_configfile); + + pxelinux_configfile = (char *)malloc ((oplen +1 ) *sizeof (char )); + +if (pxelinux_configfile) +strlcpy (pxelinux_configfile, popt +2 , oplen +1 ); +else +printf ("Error: Failed to allocate pxelinux_configfile\n" ); + } +break ;default :#if defined(CONFIG_BOOTP_VENDOREX )if (dhcp_vendorex_proc (popt))
Signature · 1 line
2.40.0
Quoted 5 lines · On Tue, Jul 25, 2023 at 04:20:30PM -0700, [email protected] wrote:
From: Sean Edmond <[email protected]>
Allow dhcp server pass pxe config file full path by using option 209
Signed-off-by Sean Edmond <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom