| Message ID | 20241111210959.560738-3-adrianox@gmail.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | Heinrich Schuchardt |
| Headers | show |
| Series | efi_loader: efi http and ipconfig drivers | expand |
On 11/11/24 22:09, Adriano Cordova wrote: > This was marked as TODO in the code: > -Enable use of wget_with_dns even if CMD_DNS is disabled if > the given uri has the ip address for the http server. > -Check for port in the uri when transforming to legacy wget > syntax inside wget_with_dns. > -Move the check for CMD_DNS inside wget_with_dns. > > Signed-off-by: Adriano Cordova <adrianox@gmail.com> > --- > > (no changes since v2) > > net/wget.c | 38 ++++++++++++++++++++++++-------------- > 1 file changed, 24 insertions(+), 14 deletions(-) > > diff --git a/net/wget.c b/net/wget.c > index 3bc2522cde..36158e0a9c 100644 > --- a/net/wget.c > +++ b/net/wget.c > @@ -530,12 +530,10 @@ 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; > - > + char *s, *host_name, *file_name, *str_copy, *port; > /* > * Download file using wget. > * > @@ -556,18 +554,31 @@ int wget_with_dns(ulong dst_addr, char *uri) > } > 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) { > + port = host_name; > + host_name = strsep(&port, ":"); > + > + if (string_to_ip(host_name).s_addr != 0) { In U-Coot code we prefer to remove the '!= 0': if (string_to_ip(host_name).s_addr) { > + s = host_name; > + } else { > +#if IS_ENABLED(CONFIG_CMD_DNS) > + net_dns_resolve = host_name; > + net_dns_env_var = "httpserverip"; > + if (net_loop(DNS) < 0) { > + log_err("DNS lookup of %s failed, check setup\n", net_dns_resolve); > + ret = -EINVAL; > + goto out; > + } > + s = env_get("httpserverip"); > + if (!s) { > + log_err("DNS could not resolve %s\n", net_dns_resolve); In EFI protocols we don't want any message output. The wget command may write a message when receiving EINVAL. > + ret = -EINVAL; > + goto out; > + } > +#else > + log_err("DNS disabled, %s could not be resolved\n", host_name); ditto Best regards Heinrich > ret = -EINVAL; > goto out; > +#endif > } > > strlcpy(net_boot_file_name, s, sizeof(net_boot_file_name)); > @@ -581,7 +592,6 @@ out: > > return ret < 0 ? ret : 0; > } > -#endif > > /** > * wget_validate_uri() - validate the uri for wget
diff --git a/net/wget.c b/net/wget.c index 3bc2522cde..36158e0a9c 100644 --- a/net/wget.c +++ b/net/wget.c @@ -530,12 +530,10 @@ 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; - + char *s, *host_name, *file_name, *str_copy, *port; /* * Download file using wget. * @@ -556,18 +554,31 @@ int wget_with_dns(ulong dst_addr, char *uri) } 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) { + port = host_name; + host_name = strsep(&port, ":"); + + if (string_to_ip(host_name).s_addr != 0) { + s = host_name; + } else { +#if IS_ENABLED(CONFIG_CMD_DNS) + net_dns_resolve = host_name; + net_dns_env_var = "httpserverip"; + if (net_loop(DNS) < 0) { + log_err("DNS lookup of %s failed, check setup\n", net_dns_resolve); + ret = -EINVAL; + goto out; + } + s = env_get("httpserverip"); + if (!s) { + log_err("DNS could not resolve %s\n", net_dns_resolve); + ret = -EINVAL; + goto out; + } +#else + log_err("DNS disabled, %s could not be resolved\n", host_name); ret = -EINVAL; goto out; +#endif } strlcpy(net_boot_file_name, s, sizeof(net_boot_file_name)); @@ -581,7 +592,6 @@ out: return ret < 0 ? ret : 0; } -#endif /** * wget_validate_uri() - validate the uri for wget
This was marked as TODO in the code: -Enable use of wget_with_dns even if CMD_DNS is disabled if the given uri has the ip address for the http server. -Check for port in the uri when transforming to legacy wget syntax inside wget_with_dns. -Move the check for CMD_DNS inside wget_with_dns. Signed-off-by: Adriano Cordova <adrianox@gmail.com> --- (no changes since v2) net/wget.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-)