From patchwork Fri Sep 6 12:33:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 825961 Delivered-To: patch@linaro.org Received: by 2002:adf:a345:0:b0:367:895a:4699 with SMTP id d5csp778324wrb; Fri, 6 Sep 2024 05:36:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXJfiu/x6B0z3jAhOr/OP8Sm10fYpaG7H6GgJN9Q03SVKVJa9LdGJ0gVdHsEy9QW6nrXubklA==@linaro.org X-Google-Smtp-Source: AGHT+IHUYM/YUwcPMVHmK4nBHaS2MHZRBsv3BBwI8ORyBEc4oijI2GewCMH8mpkjiRJNj9ZptfAK X-Received: by 2002:a17:907:3e9e:b0:a7a:9ca6:528 with SMTP id a640c23a62f3a-a8a885be29fmr200572866b.11.1725626164926; Fri, 06 Sep 2024 05:36:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725626164; cv=none; d=google.com; s=arc-20240605; b=lQMHY/xfkY41kNhfT8Jt2S21A9dHCB38+T1nxjm7AtPbOqyTaUz/i3+61axrxErC9U pqAy1DRBIVA3GHo6LIFjloP/cdI/Wa1wXChitzM76aCIxi1HAawoIfTq3qnRzh9dkANo Wc0wkPw24IeTQL5i/5Muj/EZnAAzcsdBxqc3ps97JPjBeVIWUi08AD2iLo/JgA6/Z8eJ diTMXGdtYA3CNN9UVVbTGj+s+RcI6ymCm/IVQCGv1zNHhL55J4NYyosVWYGQEGEsZHrz F57pQQBYhdJTENLwcNV84yPujrWrdllMkra6lkmbOKboclNW3GmTgYoW9ZnZig8+LNxv SXRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=kxr9l8tl4KPdG2Ogv86zY/91VnfMtlTVI8Ik+nYxeuI=; fh=Npu+gD/Goq5lITR8C++Do9EJooTFKHb/914IcqrF34I=; b=BM7nuUDZalTBkuVpmXrUqSt3tEfpucs3WP+lDOR+Uplg1GADIvEdIVvq4oOa5OeZHj Hz1id0plEpUguD7CNOxQ4l+s45ecqx1ydKpSXJ7Y7YFMOrbw6nV2/8SGYn+Ji4rC002y S7y33niLN3rxwUvWAYaw83CRdYkd62dVmUN6l1UISRxOC+eZWdbygDGruo83rEjePv0l DbQeIHREgyJr8cwxcDVn92cgeaiTjNi6wqjEoy1a7hxRLzI1Zu6ldujOnLfJLXw1xbQi qISjkX34vwfjLNlOvdpFMBXCO17o90D3Ovr6M3Ck42HKQzS6UjE2bZBsCPKsFHS17E12 D9uA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PoGoXTls; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id a640c23a62f3a-a8a62440d90si316566566b.968.2024.09.06.05.36.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Sep 2024 05:36:04 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PoGoXTls; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1B86388CF2; Fri, 6 Sep 2024 14:35:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="PoGoXTls"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0D71A88D17; Fri, 6 Sep 2024 14:35:14 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 138D088A1B for ; Fri, 6 Sep 2024 14:35:12 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jerome.forissier@linaro.org Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-42bbe908380so15833085e9.2 for ; Fri, 06 Sep 2024 05:35:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725626111; x=1726230911; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kxr9l8tl4KPdG2Ogv86zY/91VnfMtlTVI8Ik+nYxeuI=; b=PoGoXTlsrN0KgujCjIVhZwMAmj+3qw7e6FYcp8o+/nKPrDF2jxtK7FkDGnG6Uxl5es uQwah9sieCngKeycvzKuBMlips58bzzjnvEDebweFTdYMnF0OCQlEvYa2dR2BmmHtdqL 4Fx1t41Qss/CUwNybcfbb9/GuNmhFzQZj68J3lOGuKepN+deM67tISXvUmOfixsiwJl1 R2BxYeO2uG/6gUMmub8HUv4XoH7Mm4nNE30JyouITKBPGdjp115g+5TRauIP7tw1U4Ms Wm4APQmEtw/DVtw5sMtl8WERnZPL2ihLWXBvRiK7Y/wMX3IdxOD4O5U7HFlyGWA4Whuw oYJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725626111; x=1726230911; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kxr9l8tl4KPdG2Ogv86zY/91VnfMtlTVI8Ik+nYxeuI=; b=l+YGR28ITuXd4XLUszKcwMJGrmZd4+0Z7oDkVqgp8YHVH+MAD92oaRcCtLNJ2VgV9a DM8yjMfVYGDEZgFmMG38678imnyd3JtxkJtKoe6TuaDtZypYtxjrsKol6kHdQ3wlP8Fd Tnujh797JkQb1UYhRBazr1lzmJ40NsPZlR7PmwfsTtHmiZeTiL7paaFEgeXXOH/LPocD GL4KChnodNizM6KM2Shxcd1+lIjEOjhaqdAv1W9Siu43hHKwPolPmneTjFa2+B+shacS mVTUiXCsUIipLrK6BlsLTQFtja629GPBIcolQqeHS6pPixxB9Leo4NZ9hAhV7t8h3lft 93PQ== X-Gm-Message-State: AOJu0YyOPoBffZaBUG0uiCEnaGvvwsWWHFH+Wi2D2o5d2E9uOZHe7vuu 6gN41Akgr11AfEh2mQt5mjRANAkqbqUppn4hlePYsoat27oAOyhFssBlPJL7+HZlK3p750CBRAc RFcgYac8H X-Received: by 2002:a05:6000:4007:b0:378:7e94:d613 with SMTP id ffacd0b85a97d-37889682ae1mr1915175f8f.42.1725626110998; Fri, 06 Sep 2024 05:35:10 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:1ff1:215c:d8a4:9f99]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42ca05cf0e8sm19640125e9.27.2024.09.06.05.35.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Sep 2024 05:35:10 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Javier Tia , Raymond Mao , Maxim Uvarov , Tim Harvey , Anton Antonov , Jerome Forissier , Tom Rini , Joe Hershberger , Ramon Fried , Simon Glass , Mattijs Korpershoek , AKASHI Takahiro , Heinrich Schuchardt Subject: [PATCH v10 11/25] net-lwip: add dns command Date: Fri, 6 Sep 2024 14:33:27 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Add CMD_DNS when NET_LWIP is enabled to provide the dns command using lwIP. Signed-off-by: Jerome Forissier --- cmd/Kconfig | 11 ++-- cmd/net-lwip.c | 8 +++ include/net-lwip.h | 1 + net/lwip/Makefile | 1 + net/lwip/dns.c | 127 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 143 insertions(+), 5 deletions(-) create mode 100644 net/lwip/dns.c diff --git a/cmd/Kconfig b/cmd/Kconfig index 53e03a85b12..3a92e18996c 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -2026,11 +2026,6 @@ config CMD_SNTP help Synchronize RTC via network -config CMD_DNS - bool "dns" - help - Lookup the IP of a hostname - config CMD_LINK_LOCAL bool "linklocal" select LIB_RAND @@ -2085,6 +2080,12 @@ config CMD_DHCP help Boot image via network using DHCP/TFTP protocol +config CMD_DNS + bool "dns" + select PROT_DNS_LWIP if NET_LWIP + help + Lookup the IP of a hostname + config CMD_MII bool "mii" imply CMD_MDIO diff --git a/cmd/net-lwip.c b/cmd/net-lwip.c index feed719beef..c021da6a674 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 9aa371e962c..ff9d03b23e8 100644 --- a/include/net-lwip.h +++ b/include/net-lwip.h @@ -17,6 +17,7 @@ struct netif *net_lwip_get_netif(void); int net_lwip_rx(struct udevice *udev, struct netif *netif); 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[]); #endif /* __NET_LWIP_H__ */ diff --git a/net/lwip/Makefile b/net/lwip/Makefile index b5af37a9b18..645d8a8c457 100644 --- a/net/lwip/Makefile +++ b/net/lwip/Makefile @@ -2,5 +2,6 @@ ccflags-y += -I$(srctree)/lib/lwip/lwip/src/include -I$(srctree)/lib/lwip/u-boot 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..4b937feaee1 --- /dev/null +++ b/net/lwip/dns.c @@ -0,0 +1,127 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* Copyright (C) 2024 Linaro Ltd. */ + +#include +#include +#include +#include +#include +#include + +#define DNS_RESEND_MS 1000 +#define DNS_TIMEOUT_MS 10000 + +struct dns_cb_arg { + ip_addr_t host_ipaddr; + const char *var; + 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; + char *ipstr = ip4addr_ntoa(ipaddr); + + dns_cb_arg->done = true; + + if (!ipaddr) { + printf("DNS: host not found\n"); + dns_cb_arg->host_ipaddr.addr = 0; + return; + } + + if (dns_cb_arg->var) + env_set(dns_cb_arg->var, ipstr); + + printf("%s\n", ipstr); +} + +static int dns_loop(struct udevice *udev, const char *name, const char *var) +{ + struct dns_cb_arg dns_cb_arg = { }; + bool has_server = false; + struct netif *netif; + ip_addr_t ipaddr; + ip_addr_t ns; + ulong start; + char *nsenv; + int ret; + + dns_cb_arg.var = var; + + netif = net_lwip_new_netif(udev); + if (!netif) + return -1; + + 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"); + 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; + sys_check_timeouts(); + 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 && dns_cb_arg.host_ipaddr.addr != 0) + 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]; + + eth_set_current(); + + return dns_loop(eth_get_dev(), name, var); +}