diff options
| author | Sean Edmond <seanedmond@microsoft.com> | 2023-07-25 16:20:30 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-11-05 13:28:40 -0500 |
| commit | 91953956d29d104137bb8085a6a73d14fea99e1e (patch) | |
| tree | 9bcf3f88809b500c4ec62aa5b82f3857b54bb8f0 | |
| parent | b2369a19b8249ae45e501dc453a099f2a20a320f (diff) | |
| download | u-boot-91953956d29d104137bb8085a6a73d14fea99e1e.tar.gz u-boot-91953956d29d104137bb8085a6a73d14fea99e1e.tar.bz2 u-boot-91953956d29d104137bb8085a6a73d14fea99e1e.zip | |
net: Get pxe config file from dhcp option 209
Allow dhcp server pass pxe config file full path by using option 209
Signed-off-by: Sean Edmond <seanedmond@microsoft.com>
| -rw-r--r-- | cmd/Kconfig | 4 | ||||
| -rw-r--r-- | cmd/pxe.c | 8 | ||||
| -rw-r--r-- | net/bootp.c | 21 |
3 files changed, 33 insertions, 0 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index fd16c3a48e..df6d71c103 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1840,6 +1840,10 @@ config BOOTP_PXE_CLIENTARCH default 0x15 if ARM 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 string depends on CMD_BOOTP @@ -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) diff --git a/net/bootp.c b/net/bootp.c index 7b0f45e18a..6800290963 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -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 */ @@ -601,6 +602,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; @@ -909,6 +914,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)) |