mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-05-05 12:46:14 +02:00
8d89b16ea4
The ip_addr_t of lwIP has support for both IPv6 and IPv4 addresses. Some lwIP commans is directly accessing the internal addr field of the ip_addr_t instead of using ipaddr helper functions. Change to use ipaddr helper functions where appropriate to remove direct access of the internal addr field. Also change a few instances from ip4 to the version less ipaddr helpers. There is no intended functional change, besides the change from using ip4 addr helper to using version less ipaddr helper. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Jerome Forissier <jerome.forissier@arm.com>
108 lines
2.0 KiB
C
108 lines
2.0 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/* Copyright (C) 2024 Linaro Ltd. */
|
|
|
|
#include <command.h>
|
|
#include <console.h>
|
|
#include <env.h>
|
|
#include <lwip/dns.h>
|
|
#include <lwip/timeouts.h>
|
|
#include <net.h>
|
|
#include <time.h>
|
|
|
|
#define DNS_RESEND_MS 1000
|
|
#define DNS_TIMEOUT_MS 10000
|
|
|
|
struct dns_cb_arg {
|
|
ip_addr_t host_ipaddr;
|
|
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)
|
|
{
|
|
struct dns_cb_arg *dns_cb_arg = arg;
|
|
|
|
dns_cb_arg->done = true;
|
|
|
|
if (!ipaddr)
|
|
printf("DNS: host not found\n");
|
|
|
|
ip_addr_set(&dns_cb_arg->host_ipaddr, ipaddr);
|
|
}
|
|
|
|
static int dns_loop(struct udevice *udev, const char *name, const char *var)
|
|
{
|
|
struct dns_cb_arg dns_cb_arg = { };
|
|
struct netif *netif;
|
|
const char *ipstr;
|
|
ip_addr_t ipaddr;
|
|
ulong start;
|
|
int ret;
|
|
|
|
netif = net_lwip_new_netif(udev);
|
|
if (!netif)
|
|
return CMD_RET_FAILURE;
|
|
|
|
if (net_lwip_dns_init()) {
|
|
net_lwip_remove_netif(netif);
|
|
return CMD_RET_FAILURE;
|
|
}
|
|
|
|
dns_cb_arg.done = false;
|
|
|
|
ret = dns_gethostbyname(name, &ipaddr, dns_cb, &dns_cb_arg);
|
|
|
|
if (ret == ERR_OK) {
|
|
dns_cb(name, &ipaddr, &dns_cb_arg);
|
|
} else if (ret == ERR_INPROGRESS) {
|
|
start = get_timer(0);
|
|
sys_timeout(DNS_RESEND_MS, do_dns_tmr, NULL);
|
|
do {
|
|
net_lwip_rx(udev, netif);
|
|
if (dns_cb_arg.done)
|
|
break;
|
|
if (ctrlc()) {
|
|
printf("\nAbort\n");
|
|
break;
|
|
}
|
|
} while (get_timer(start) < DNS_TIMEOUT_MS);
|
|
sys_untimeout(do_dns_tmr, NULL);
|
|
}
|
|
|
|
net_lwip_remove_netif(netif);
|
|
|
|
if (dns_cb_arg.done && !ip_addr_isany(&dns_cb_arg.host_ipaddr)) {
|
|
ipstr = ipaddr_ntoa(&dns_cb_arg.host_ipaddr);
|
|
if (var)
|
|
env_set(var, ipstr);
|
|
else
|
|
printf("%s\n", ipstr);
|
|
return CMD_RET_SUCCESS;
|
|
}
|
|
|
|
return CMD_RET_FAILURE;
|
|
}
|
|
|
|
int do_dns(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
|
|
{
|
|
char *name;
|
|
char *var = NULL;
|
|
|
|
if (argc == 1 || argc > 3)
|
|
return CMD_RET_USAGE;
|
|
|
|
name = argv[1];
|
|
|
|
if (argc == 3)
|
|
var = argv[2];
|
|
|
|
if (net_lwip_eth_start() < 0)
|
|
return CMD_RET_FAILURE;
|
|
|
|
return dns_loop(eth_get_dev(), name, var);
|
|
}
|