mirror of
https://github.com/u-boot/u-boot.git
synced 2025-04-19 19:34:35 +00:00
net/lwip: wget: put server_name and port into wget_ctx
Currently server_name and port are local variables in wget_loop. This commit puts them inside ctx, so that they are accessible from the http callbacks. Signed-off-by: Adriano Cordova <adrianox@gmail.com>
This commit is contained in:
parent
de28a2a5f2
commit
6cc4d0492b
1 changed files with 4 additions and 4 deletions
|
@ -23,6 +23,8 @@ enum done_state {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct wget_ctx {
|
struct wget_ctx {
|
||||||
|
char server_name[SERVER_NAME_SIZE];
|
||||||
|
u16 port;
|
||||||
char *path;
|
char *path;
|
||||||
ulong daddr;
|
ulong daddr;
|
||||||
ulong saved_daddr;
|
ulong saved_daddr;
|
||||||
|
@ -209,13 +211,11 @@ static void httpc_result_cb(void *arg, httpc_result_t httpc_result,
|
||||||
|
|
||||||
static int wget_loop(struct udevice *udev, ulong dst_addr, char *uri)
|
static int wget_loop(struct udevice *udev, ulong dst_addr, char *uri)
|
||||||
{
|
{
|
||||||
char server_name[SERVER_NAME_SIZE];
|
|
||||||
httpc_connection_t conn;
|
httpc_connection_t conn;
|
||||||
httpc_state_t *state;
|
httpc_state_t *state;
|
||||||
struct netif *netif;
|
struct netif *netif;
|
||||||
struct wget_ctx ctx;
|
struct wget_ctx ctx;
|
||||||
char *path;
|
char *path;
|
||||||
u16 port;
|
|
||||||
|
|
||||||
ctx.daddr = dst_addr;
|
ctx.daddr = dst_addr;
|
||||||
ctx.saved_daddr = dst_addr;
|
ctx.saved_daddr = dst_addr;
|
||||||
|
@ -224,7 +224,7 @@ static int wget_loop(struct udevice *udev, ulong dst_addr, char *uri)
|
||||||
ctx.prevsize = 0;
|
ctx.prevsize = 0;
|
||||||
ctx.start_time = 0;
|
ctx.start_time = 0;
|
||||||
|
|
||||||
if (parse_url(uri, server_name, &port, &path))
|
if (parse_url(uri, ctx.server_name, &ctx.port, &path))
|
||||||
return CMD_RET_USAGE;
|
return CMD_RET_USAGE;
|
||||||
|
|
||||||
netif = net_lwip_new_netif(udev);
|
netif = net_lwip_new_netif(udev);
|
||||||
|
@ -234,7 +234,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;
|
||||||
ctx.path = path;
|
ctx.path = path;
|
||||||
if (httpc_get_file_dns(server_name, 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)) {
|
||||||
net_lwip_remove_netif(netif);
|
net_lwip_remove_netif(netif);
|
||||||
return CMD_RET_FAILURE;
|
return CMD_RET_FAILURE;
|
||||||
|
|
Loading…
Add table
Reference in a new issue