Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-08 19:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net/lwip: wget: integrate struct wget_info into wget code

Browse source 
Each wget request now fills the struct wget_info. Also, the
efi bootdevice is now set conditionally to the set_bootdevice
variable in wget_info and a buffer size check is performed if
check_buffer_size is set.

Signed-off-by: Adriano Cordova <adrianox@gmail.com>
This commit is contained in:
Adriano Cordova 2024-11-11 18:09:01 -03:00 • committed by Heinrich Schuchardt
parent 6cc4d0492b
commit 1327c2a8d6
1 changed files with 40 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

38
net/lwip/wget.c
View file

@ -34,6 +34,18 @@ struct wget_ctx {
enum done_state done; enum done_state done;
}; };
static void wget_lwip_fill_info(struct pbuf *hdr, u16_t hdr_len, u32_t hdr_cont_len)
{
if (wget_info->headers && hdr_len < MAX_HTTP_HEADERS_SIZE)
pbuf_copy_partial(hdr, (void *)wget_info->headers, hdr_len, 0);
wget_info->hdr_cont_len = (u32)hdr_cont_len;
}
static void wget_lwip_set_file_size(u32_t rx_content_len)
{
wget_info->file_size = (ulong)rx_content_len;
}
static int parse_url(char *url, char *host, u16 *port, char **path) static int parse_url(char *url, char *host, u16 *port, char **path)
{ {
char *p, *pp; char *p, *pp;
@ -178,6 +190,13 @@ static void httpc_result_cb(void *arg, httpc_result_t httpc_result,
struct wget_ctx *ctx = arg; struct wget_ctx *ctx = arg;
ulong elapsed; ulong elapsed;
wget_info->status_code = (u32)srv_res;
if (err == ERR_BUF) {
ctx->done = FAILURE;
return;
}
if (httpc_result != HTTPC_RESULT_OK) { if (httpc_result != HTTPC_RESULT_OK) {
log_err("\nHTTP client error %d\n", httpc_result); log_err("\nHTTP client error %d\n", httpc_result);
ctx->done = FAILURE; ctx->done = FAILURE;
@ -197,8 +216,11 @@ static void httpc_result_cb(void *arg, httpc_result_t httpc_result,
printf("%u bytes transferred in %lu ms (", rx_content_len, elapsed); printf("%u bytes transferred in %lu ms (", rx_content_len, elapsed);
print_size(rx_content_len / elapsed * 1000, "/s)\n"); print_size(rx_content_len / elapsed * 1000, "/s)\n");
printf("Bytes transferred = %lu (%lx hex)\n", ctx->size, ctx->size); printf("Bytes transferred = %lu (%lx hex)\n", ctx->size, ctx->size);
if (wget_info->set_bootdev) {
efi_set_bootdev("Net", "", ctx->path, map_sysmem(ctx->saved_daddr, 0), efi_set_bootdev("Net", "", ctx->path, map_sysmem(ctx->saved_daddr, 0),
rx_content_len); rx_content_len);
}
wget_lwip_set_file_size(rx_content_len);
if (env_set_hex("filesize", rx_content_len) || if (env_set_hex("filesize", rx_content_len) ||
env_set_hex("fileaddr", ctx->saved_daddr)) { env_set_hex("fileaddr", ctx->saved_daddr)) {
log_err("Could not set filesize or fileaddr\n"); log_err("Could not set filesize or fileaddr\n");
@ -209,6 +231,17 @@ static void httpc_result_cb(void *arg, httpc_result_t httpc_result,
ctx->done = SUCCESS; ctx->done = SUCCESS;
} }
static err_t httpc_headers_done_cb(httpc_state_t *connection, void *arg, struct pbuf *hdr,
u16_t hdr_len, u32_t content_len)
{
wget_lwip_fill_info(hdr, hdr_len, content_len);
if (wget_info->check_buffer_size && (ulong)content_len > wget_info->buffer_size)
return ERR_BUF;
return ERR_OK;
}
static int wget_loop(struct udevice *udev, ulong dst_addr, char *uri) static int wget_loop(struct udevice *udev, ulong dst_addr, char *uri)
{ {
httpc_connection_t conn; httpc_connection_t conn;
@ -233,6 +266,7 @@ static int wget_loop(struct udevice *udev, ulong dst_addr, char *uri)
memset(&conn, 0, sizeof(conn)); memset(&conn, 0, sizeof(conn));
conn.result_fn = httpc_result_cb; conn.result_fn = httpc_result_cb;
conn.headers_done_fn = httpc_headers_done_cb;
ctx.path = path; ctx.path = path;
if (httpc_get_file_dns(ctx.server_name, ctx.port, path, &conn, httpc_recv_cb, if (httpc_get_file_dns(ctx.server_name, ctx.port, path, &conn, httpc_recv_cb,
&ctx, &state)) { &ctx, &state)) {
@ -259,6 +293,9 @@ int wget_with_dns(ulong dst_addr, char *uri)
{ {
eth_set_current(); eth_set_current();
if (!wget_info)
wget_info = &default_wget_info;
return wget_loop(eth_get_dev(), dst_addr, uri); return wget_loop(eth_get_dev(), dst_addr, uri);
} }
@ -285,6 +322,7 @@ int do_wget(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[])
if (parse_legacy_arg(url, nurl, sizeof(nurl))) if (parse_legacy_arg(url, nurl, sizeof(nurl)))
return CMD_RET_FAILURE; return CMD_RET_FAILURE;
wget_info = &default_wget_info;
if (wget_with_dns(dst_addr, nurl)) if (wget_with_dns(dst_addr, nurl))
return CMD_RET_FAILURE; return CMD_RET_FAILURE;