| Message ID | a81309b7d6f3a5bbccc7a5ad45b11f071a3f50b1.1717680809.git.jerome.forissier@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Introduce the lwIP network stack | expand |
> @@ -7,6 +7,7 @@ obj-$(CONFIG_$(SPL_)DM_ETH) += ../net/eth_common.o > obj-$(CONFIG_$(SPL_)DM_ETH) += ../net/eth-uclass.o > obj-$(CONFIG_$(SPL_)DM_ETH) += net-lwip.o > obj-$(CONFIG_CMD_DHCP) += dhcp.o > +obj-$(CONFIG_CMD_DNS) += dns.o > obj-$(CONFIG_CMD_PING) += ping.o > obj-$(CONFIG_CMD_TFTPBOOT) += tftp.o > > diff --git a/net-lwip/dns.c b/net-lwip/dns.c > new file mode 100644 > index 00000000000..24a5149343a > --- /dev/null > +++ b/net-lwip/dns.c > @@ -0,0 +1,107 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* Copyright (C) 2024 Linaro Ltd. */ > + > +#include <command.h> > +#include <console.h> > +#include <lwip/dns.h> > +#include <lwip/timeouts.h> > +#include <net-lwip.h> > +#include <time.h> > + > +#define DNS_RESEND_MS 1000 > +#define DNS_TIMEOUT_MS 10000 > + > +static ulong start; > +static ip_addr_t host_ipaddr; > +static bool done; > + > +static void do_dns_tmr(void *arg) > +{ > + dns_tmr(); > +} > + > +static void dns_cb(const char *name, const ip_addr_t *ipaddr, void *arg) > +{ > + const char *var = arg; > + char *ipstr = ip4addr_ntoa(ipaddr); > + > + done = true; > + > + if (!ipaddr) { > + printf("DNS: host not found\n"); > + host_ipaddr.addr = 0; > + return; > + } > + > + if (var) > + env_set(var, ipstr); Do we need this? Won't this set <dns_name> == ipaddr? If we do not need it repurpose the void *arg and get rid of the global 'done' > + > + printf("%s\n", ipstr); > +} > + > +int do_dns(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) > +{ > + bool has_server = false; > + ip_addr_t ipaddr; > + ip_addr_t ns; > + char *nsenv; > + char *name; > + char *var; > + int ret; [...] Thanks /Ilias
On 6/6/24 17:46, Ilias Apalodimas wrote: >> @@ -7,6 +7,7 @@ obj-$(CONFIG_$(SPL_)DM_ETH) += ../net/eth_common.o >> obj-$(CONFIG_$(SPL_)DM_ETH) += ../net/eth-uclass.o >> obj-$(CONFIG_$(SPL_)DM_ETH) += net-lwip.o >> obj-$(CONFIG_CMD_DHCP) += dhcp.o >> +obj-$(CONFIG_CMD_DNS) += dns.o >> obj-$(CONFIG_CMD_PING) += ping.o >> obj-$(CONFIG_CMD_TFTPBOOT) += tftp.o >> >> diff --git a/net-lwip/dns.c b/net-lwip/dns.c >> new file mode 100644 >> index 00000000000..24a5149343a >> --- /dev/null >> +++ b/net-lwip/dns.c >> @@ -0,0 +1,107 @@ >> +// SPDX-License-Identifier: GPL-2.0+ >> +/* Copyright (C) 2024 Linaro Ltd. */ >> + >> +#include <command.h> >> +#include <console.h> >> +#include <lwip/dns.h> >> +#include <lwip/timeouts.h> >> +#include <net-lwip.h> >> +#include <time.h> >> + >> +#define DNS_RESEND_MS 1000 >> +#define DNS_TIMEOUT_MS 10000 >> + >> +static ulong start; >> +static ip_addr_t host_ipaddr; >> +static bool done; >> + >> +static void do_dns_tmr(void *arg) >> +{ >> + dns_tmr(); >> +} >> + >> +static void dns_cb(const char *name, const ip_addr_t *ipaddr, void *arg) >> +{ >> + const char *var = arg; >> + char *ipstr = ip4addr_ntoa(ipaddr); >> + >> + done = true; >> + >> + if (!ipaddr) { >> + printf("DNS: host not found\n"); >> + host_ipaddr.addr = 0; >> + return; >> + } >> + >> + if (var) >> + env_set(var, ipstr); > > Do we need this? Won't this set <dns_name> == ipaddr? No, the syntax of the dns command is: 'dns hostname [env_var]' so one can pretty much give any variable name to receive the IP address. > If we do not need it repurpose the void *arg and get rid of the global 'done' I could probably use a struct to get rid of the globals. Let me see what I can do. >> + >> + printf("%s\n", ipstr); >> +} >> + >> +int do_dns(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) >> +{ >> + bool has_server = false; >> + ip_addr_t ipaddr; >> + ip_addr_t ns; >> + char *nsenv; >> + char *name; >> + char *var; >> + int ret; > > [...] > > Thanks > /Ilias
[...] > >> + > >> + if (!ipaddr) { > >> + printf("DNS: host not found\n"); > >> + host_ipaddr.addr = 0; > >> + return; > >> + } > >> + > >> + if (var) > >> + env_set(var, ipstr); > > > > Do we need this? Won't this set <dns_name> == ipaddr? > > No, the syntax of the dns command is: 'dns hostname [env_var]' so one can > pretty much give any variable name to receive the IP address. > > > If we do not need it repurpose the void *arg and get rid of the global 'done' > > I could probably use a struct to get rid of the globals. Let me see what I can do. Yea just pass a struct with char* and a bool * and you should be fine Thanks /Ilias > > >> + > >> + printf("%s\n", ipstr); > >> +} > >> + > >> +int do_dns(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) > >> +{ > >> + bool has_server = false; > >> + ip_addr_t ipaddr; > >> + ip_addr_t ns; > >> + char *nsenv; > >> + char *name; > >> + char *var; > >> + int ret; > > > > [...] > > > > Thanks > > /Ilias
On 6/6/24 18:02, Ilias Apalodimas wrote: > [...] > >>>> + >>>> + if (!ipaddr) { >>>> + printf("DNS: host not found\n"); >>>> + host_ipaddr.addr = 0; >>>> + return; >>>> + } >>>> + >>>> + if (var) >>>> + env_set(var, ipstr); >>> >>> Do we need this? Won't this set <dns_name> == ipaddr? >> >> No, the syntax of the dns command is: 'dns hostname [env_var]' so one can >> pretty much give any variable name to receive the IP address. >> >>> If we do not need it repurpose the void *arg and get rid of the global 'done' >> >> I could probably use a struct to get rid of the globals. Let me see what I can do. > > Yea just pass a struct with char* and a bool * and you should be fine Done in v4. Thanks,
diff --git a/cmd/Kconfig b/cmd/Kconfig index 07cfe824e3f..6ef0b52cd34 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -2098,6 +2098,12 @@ config CMD_DHCP help Boot image via network using DHCP/TFTP protocol +config CMD_DNS + bool "dns" + select PROT_DNS_LWIP + help + Lookup the IP of a hostname + config CMD_PING bool "ping" select PROT_RAW_LWIP diff --git a/cmd/net-lwip.c b/cmd/net-lwip.c index 13856703fcf..3abafdf7969 100644 --- a/cmd/net-lwip.c +++ b/cmd/net-lwip.c @@ -27,3 +27,11 @@ U_BOOT_CMD( "[loadAddress] [[hostIPaddr:]bootfilename]" ); #endif + +#if defined(CONFIG_CMD_DNS) +U_BOOT_CMD( + dns, 3, 1, do_dns, + "lookup the IP of a hostname", + "hostname [envvar]" +); +#endif diff --git a/include/net-lwip.h b/include/net-lwip.h index 2abaaa3b4e3..0019d1524e5 100644 --- a/include/net-lwip.h +++ b/include/net-lwip.h @@ -82,6 +82,7 @@ int net_lwip_init(void); struct netif *net_lwip_get_netif(void); int do_dhcp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); +int do_dns(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ping(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_tftpb(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); diff --git a/net-lwip/Makefile b/net-lwip/Makefile index e68d4e24197..aa247859483 100644 --- a/net-lwip/Makefile +++ b/net-lwip/Makefile @@ -7,6 +7,7 @@ obj-$(CONFIG_$(SPL_)DM_ETH) += ../net/eth_common.o obj-$(CONFIG_$(SPL_)DM_ETH) += ../net/eth-uclass.o obj-$(CONFIG_$(SPL_)DM_ETH) += net-lwip.o obj-$(CONFIG_CMD_DHCP) += dhcp.o +obj-$(CONFIG_CMD_DNS) += dns.o obj-$(CONFIG_CMD_PING) += ping.o obj-$(CONFIG_CMD_TFTPBOOT) += tftp.o diff --git a/net-lwip/dns.c b/net-lwip/dns.c new file mode 100644 index 00000000000..24a5149343a --- /dev/null +++ b/net-lwip/dns.c @@ -0,0 +1,107 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* Copyright (C) 2024 Linaro Ltd. */ + +#include <command.h> +#include <console.h> +#include <lwip/dns.h> +#include <lwip/timeouts.h> +#include <net-lwip.h> +#include <time.h> + +#define DNS_RESEND_MS 1000 +#define DNS_TIMEOUT_MS 10000 + +static ulong start; +static ip_addr_t host_ipaddr; +static bool done; + +static void do_dns_tmr(void *arg) +{ + dns_tmr(); +} + +static void dns_cb(const char *name, const ip_addr_t *ipaddr, void *arg) +{ + const char *var = arg; + char *ipstr = ip4addr_ntoa(ipaddr); + + done = true; + + if (!ipaddr) { + printf("DNS: host not found\n"); + host_ipaddr.addr = 0; + return; + } + + if (var) + env_set(var, ipstr); + + printf("%s\n", ipstr); +} + +int do_dns(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) +{ + bool has_server = false; + ip_addr_t ipaddr; + ip_addr_t ns; + char *nsenv; + char *name; + char *var; + int ret; + + if (argc == 1 || argc > 3) + return CMD_RET_USAGE; + + if (argc >= 2) + name = argv[1]; + + if (argc == 3) + var = argv[2]; + + dns_init(); + + nsenv = env_get("dnsip"); + if (nsenv && ipaddr_aton(nsenv, &ns)) { + dns_setserver(0, &ns); + has_server = true; + } + + nsenv = env_get("dnsip2"); + if (nsenv && ipaddr_aton(nsenv, &ns)) { + dns_setserver(1, &ns); + has_server = true; + } + + if (!has_server) { + log_err("No valid name server (dnsip/dnsip2)\n"); + return CMD_RET_FAILURE; + } + + done = false; + + ret = dns_gethostbyname(name, &ipaddr, dns_cb, var); + + if (ret == ERR_OK) { + dns_cb(name, &ipaddr, var); + } else if (ret == ERR_INPROGRESS) { + start = get_timer(0); + sys_timeout(DNS_RESEND_MS, do_dns_tmr, NULL); + do { + eth_rx(); + if (done) + break; + sys_check_timeouts(); + if (ctrlc()) { + printf("\nAbort\n"); + break; + } + } while (get_timer(start) < DNS_TIMEOUT_MS); + sys_untimeout(do_dns_tmr, NULL); + } + + if (done && host_ipaddr.addr != 0) + return CMD_RET_SUCCESS; + + return CMD_RET_FAILURE; +} +
Add CMD_DNS when NET_LWIP is enabled to provide the dns command using lwIP. Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org> --- cmd/Kconfig | 6 +++ cmd/net-lwip.c | 8 ++++ include/net-lwip.h | 1 + net-lwip/Makefile | 1 + net-lwip/dns.c | 107 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 123 insertions(+) create mode 100644 net-lwip/dns.c