Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-30 08:07:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: Get pxe config file from dhcp option 209

Browse source 
Allow dhcp server pass pxe config file full path by using option 209

Signed-off-by: Sean Edmond <seanedmond@microsoft.com>
This commit is contained in:
Sean Edmond 2023-07-25 16:20:30 -07:00 • committed by Tom Rini
parent b2369a19b8
commit 91953956d2
3 changed files with 33 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/Kconfig
View file

@ -1840,6 +1840,10 @@ config BOOTP_PXE_CLIENTARCH
default 0x15 if ARM default 0x15 if ARM
default 0x0 if X86 default 0x0 if X86
config BOOTP_PXE_DHCP_OPTION
bool "Request & store 'pxe_configfile' from BOOTP/DHCP server"
depends on BOOTP_PXE
config BOOTP_VCI_STRING config BOOTP_VCI_STRING
string string
depends on CMD_BOOTP depends on CMD_BOOTP

8
cmd/pxe.c
View file

@ -141,6 +141,14 @@ int pxe_get(ulong pxefile_addr_r, char **bootdirp, ulong *sizep, bool use_ipv6)
env_get("bootfile"), use_ipv6)) env_get("bootfile"), use_ipv6))
return -ENOMEM; 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) && if (IS_ENABLED(CONFIG_DHCP6_PXE_DHCP_OPTION) &&
pxelinux_configfile && use_ipv6) { pxelinux_configfile && use_ipv6) {
if (pxe_dhcp_option_path(&ctx, pxefile_addr_r) > 0) if (pxe_dhcp_option_path(&ctx, pxefile_addr_r) > 0)

21
net/bootp.c
View file

@ -26,6 +26,7 @@
#ifdef CONFIG_BOOTP_RANDOM_DELAY #ifdef CONFIG_BOOTP_RANDOM_DELAY
#include "net_rand.h" #include "net_rand.h"
#endif #endif
#include <malloc.h>
#define BOOTP_VENDOR_MAGIC 0x63825363 /* RFC1048 Magic Cookie */ #define BOOTP_VENDOR_MAGIC 0x63825363 /* RFC1048 Magic Cookie */
@ -601,6 +602,10 @@ static int dhcp_extended(u8 *e, int message_type, struct in_addr server_ip,
*e++ = 42; *e++ = 42;
*cnt += 1; *cnt += 1;
#endif #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 */ /* no options, so back up to avoid sending an empty request list */
if (*cnt == 0) if (*cnt == 0)
e -= 2; e -= 2;
@ -909,6 +914,22 @@ static void dhcp_process_options(uchar *popt, uchar *end)
net_boot_file_name[size] = 0; net_boot_file_name[size] = 0;
} }
break; 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: default:
#if defined(CONFIG_BOOTP_VENDOREX) #if defined(CONFIG_BOOTP_VENDOREX)
if (dhcp_vendorex_proc(popt)) if (dhcp_vendorex_proc(popt))