[PATCH] lwip: wget: Fix incorrect rebase of 5907c81 on top of 5907c81

[Adriano Córdova]

El jue, 28 nov 2024 a las 12:11, Ilias Apalodimas (<
ilias.apalodimas at linaro.org>) escribió:

> Hi Adriano,
>
> On Thu, 28 Nov 2024 at 16:37, Adriano Cordova <adrianox at gmail.com> wrote:
> >
> >   Commit 5907c81 ("net: lwip: Enable https:// support for wget") was not
> >   correctly rebased on top of the changes introduced by Commit 6cc4d04
> >   ("net/lwip: wget: put server_name and port into wget_ctx") in next.
> >   This commit re-applies a  couple of lines from 6cc4d04.
> >
> >   Fixes: Commit 5907c81 ("net: lwip: Enable https:// support for wget")
>
> Does it fix anything in -next? Fixes tags are used on actual fixes
>
Yes, the lwip wget command does not work in next

>
> Other than that
> Acked-by: Ilias Apalodimas <ilias.apalodimas at linaro.org>
>
> >
> > Signed-off-by: Adriano Cordova <adrianox at gmail.com>
> > ---
> >  net/lwip/wget.c | 4 +---
> >  1 file changed, 1 insertion(+), 3 deletions(-)
> >
> > diff --git a/net/lwip/wget.c b/net/lwip/wget.c
> > index af48d741a4..8b3e5cf29b 100644
> > --- a/net/lwip/wget.c
> > +++ b/net/lwip/wget.c
> > @@ -288,7 +288,6 @@ static err_t httpc_headers_done_cb(httpc_state_t
> *connection, void *arg, struct
> >
> >  static int wget_loop(struct udevice *udev, ulong dst_addr, char *uri)
> >  {
> > -       char server_name[SERVER_NAME_SIZE];
> >  #if defined CONFIG_WGET_HTTPS
> >         altcp_allocator_t tls_allocator;
> >  #endif
> > @@ -297,7 +296,6 @@ static int wget_loop(struct udevice *udev, ulong
> dst_addr, char *uri)
> >         struct netif *netif;
> >         struct wget_ctx ctx;
> >         char *path;
> > -       u16 port;
> >         bool is_https;
> >
> >         ctx.daddr = dst_addr;
> > @@ -307,7 +305,7 @@ static int wget_loop(struct udevice *udev, ulong
> dst_addr, char *uri)
> >         ctx.prevsize = 0;
> >         ctx.start_time = 0;
> >
> > -       if (parse_url(uri, server_name, &port, &path, &is_https))
> > +       if (parse_url(uri, ctx.server_name, &ctx.port, &path, &is_https))
> >                 return CMD_RET_USAGE;
> >
> >         netif = net_lwip_new_netif(udev);
> > --
> > 2.43.0
> >
>