| Message ID | 20230901102542.609239-3-masahisa.kojima@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Add EFI HTTP boot support | expand |
Kojima-san [...] > } > + > +#if (IS_ENABLED(CONFIG_CMD_DNS)) > +int wget_with_dns(ulong dst_addr, char *uri) > +{ > + int ret; > + char *s, *host_name, *file_name, *str_copy; > + > + /* > + * Download file using wget. > + * > + * U-Boot wget takes the target uri in this format. > + * "<http server ip>:<file path>" e.g.) 192.168.1.1:/sample/test.iso > + * Need to resolve the http server ip address before starting wget. > + */ > + str_copy = strdup(uri); > + if (!str_copy) > + return -ENOMEM; > + > + s = str_copy + strlen("http://"); > + host_name = strsep(&s, "/"); > + if (!s) { > + log_err("Error: invalied uri, no file path\n"); > + ret = -EINVAL; > + goto out; > + } > + file_name = s; > + > + /* TODO: If the given uri has ip address for the http server, skip dns */ > + net_dns_resolve = host_name; > + net_dns_env_var = "httpserverip"; This is not idea, but I understand this is how dns currently works. We can take another look on improving this when LWIP lands > + if (net_loop(DNS) < 0) { > + log_err("Error: dns lookup of %s failed, check setup\n", net_dns_resolve); > + ret = -EINVAL; > + goto out; > + } > + s = env_get("httpserverip"); > + if (!s) { > + ret = -EINVAL; > + goto out; > + } > + > + strlcpy(net_boot_file_name, s, 1024); sizeof(net_boot_file_name) here please > + strlcat(net_boot_file_name, ":/", 1024); /* append '/' which is removed by strsep() */ > + strlcat(net_boot_file_name, file_name, 1024); Don't you have to limit the size of subsequent writes depending on what previous calls wrote? IOW that can't always be 1024. > + image_load_addr = dst_addr; > + ret = net_loop(WGET); > + > +out: > + free(str_copy); > + > + return ret; > +} > +#endif > -- > 2.34.1 > Thanks /Ilias
Hi Ilias, On Thu, 14 Sept 2023 at 21:52, Ilias Apalodimas <ilias.apalodimas@linaro.org> wrote: > > Kojima-san > > [...] > > > } > > + > > +#if (IS_ENABLED(CONFIG_CMD_DNS)) > > +int wget_with_dns(ulong dst_addr, char *uri) > > +{ > > + int ret; > > + char *s, *host_name, *file_name, *str_copy; > > + > > + /* > > + * Download file using wget. > > + * > > + * U-Boot wget takes the target uri in this format. > > + * "<http server ip>:<file path>" e.g.) 192.168.1.1:/sample/test.iso > > + * Need to resolve the http server ip address before starting wget. > > + */ > > + str_copy = strdup(uri); > > + if (!str_copy) > > + return -ENOMEM; > > + > > + s = str_copy + strlen("http://"); > > + host_name = strsep(&s, "/"); > > + if (!s) { > > + log_err("Error: invalied uri, no file path\n"); > > + ret = -EINVAL; > > + goto out; > > + } > > + file_name = s; > > + > > + /* TODO: If the given uri has ip address for the http server, skip dns */ > > + net_dns_resolve = host_name; > > + net_dns_env_var = "httpserverip"; > > This is not idea, but I understand this is how dns currently works. We > can take another look on improving this when LWIP lands Yes. Note that the prototype of this function is the same as the Maxim's LWIP port "int ulwip_wget(ulong addr, char *url)", so we can easily replace it when the LWIP lands. > > > + if (net_loop(DNS) < 0) { > > + log_err("Error: dns lookup of %s failed, check setup\n", net_dns_resolve); > > + ret = -EINVAL; > > + goto out; > > + } > > + s = env_get("httpserverip"); > > + if (!s) { > > + ret = -EINVAL; > > + goto out; > > + } > > + > > + strlcpy(net_boot_file_name, s, 1024); > > sizeof(net_boot_file_name) here please OK. > > > + strlcat(net_boot_file_name, ":/", 1024); /* append '/' which is removed by strsep() */ > > + strlcat(net_boot_file_name, file_name, 1024); > > Don't you have to limit the size of subsequent writes depending on what > previous calls wrote? IOW that can't always be 1024. strlcat() appends the string with the limit of "buf_size - strlen(dst) - 1", so current code should be OK. 1024 should be sizeof(net_boot_file_name) same as above. Thanks, Masahisa Kojima > > > + image_load_addr = dst_addr; > > + ret = net_loop(WGET); > > + > > +out: > > + free(str_copy); > > + > > + return ret; > > +} > > +#endif > > -- > > 2.34.1 > > > > Thanks > /Ilias
diff --git a/include/net.h b/include/net.h index e254df7d7f..b4bbf95732 100644 --- a/include/net.h +++ b/include/net.h @@ -926,4 +926,8 @@ void eth_set_enable_bootdevs(bool enable); static inline void eth_set_enable_bootdevs(bool enable) {} #endif +#if (IS_ENABLED(CONFIG_CMD_WGET) && IS_ENABLED(CONFIG_CMD_DNS)) +int wget_with_dns(ulong dst_addr, char *uri); +#endif + #endif /* __NET_H__ */ diff --git a/net/wget.c b/net/wget.c index 8bf4db4d04..5718f1cf92 100644 --- a/net/wget.c +++ b/net/wget.c @@ -15,6 +15,7 @@ #include <net.h> #include <net/tcp.h> #include <net/wget.h> +#include <stdlib.h> DECLARE_GLOBAL_DATA_PTR; @@ -500,3 +501,56 @@ void wget_start(void) wget_send(TCP_SYN, 0, 0, 0); } + +#if (IS_ENABLED(CONFIG_CMD_DNS)) +int wget_with_dns(ulong dst_addr, char *uri) +{ + int ret; + char *s, *host_name, *file_name, *str_copy; + + /* + * Download file using wget. + * + * U-Boot wget takes the target uri in this format. + * "<http server ip>:<file path>" e.g.) 192.168.1.1:/sample/test.iso + * Need to resolve the http server ip address before starting wget. + */ + str_copy = strdup(uri); + if (!str_copy) + return -ENOMEM; + + s = str_copy + strlen("http://"); + host_name = strsep(&s, "/"); + if (!s) { + log_err("Error: invalied uri, no file path\n"); + ret = -EINVAL; + goto out; + } + file_name = s; + + /* TODO: If the given uri has ip address for the http server, skip dns */ + net_dns_resolve = host_name; + net_dns_env_var = "httpserverip"; + if (net_loop(DNS) < 0) { + log_err("Error: dns lookup of %s failed, check setup\n", net_dns_resolve); + ret = -EINVAL; + goto out; + } + s = env_get("httpserverip"); + if (!s) { + ret = -EINVAL; + goto out; + } + + strlcpy(net_boot_file_name, s, 1024); + strlcat(net_boot_file_name, ":/", 1024); /* append '/' which is removed by strsep() */ + strlcat(net_boot_file_name, file_name, 1024); + image_load_addr = dst_addr; + ret = net_loop(WGET); + +out: + free(str_copy); + + return ret; +} +#endif
Current wget takes the target uri in this format: "<http server ip>:<file path>" e.g.) 192.168.1.1:/bar The http server ip address must be resolved before calling wget. This commit adds the utility function runs wget with dhs. User can call wget with the uri like "http://foo/bar". Signed-off-by: Masahisa Kojima <masahisa.kojima@linaro.org> --- include/net.h | 4 ++++ net/wget.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+)