From nobody Thu Feb 27 15:59:20 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Z3bcn1H0Qz5qKcl; Thu, 27 Feb 2025 15:59:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z3bcm5BgVz43WZ; Thu, 27 Feb 2025 15:59:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740671960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4lafgwD9w4GGx0ZwQM1MNNFPt6gcE7UeBvQep5RpCDI=; b=Yu0Cog3+cObxenNx5vxfzIWRDGIGoJq5K+1cC9j6a17oKo45Dny4HTDWQ5QqVwhHkbJ95+ WxsquAY4Wc49Mc7txgw/JzH0j71wo68TLd18TGmJoC/VrdDplmq+Saczx5/pPjmiEuWwMZ 4uDxrQHrTFoFJkL0dVtJiCstrgHf3mRKslrnH7wsL1rcczrFWdl9E/v+Zwjjz8TFOcIDmn lCbitvAN5No/okRt2VNhcRbnWScJpTjuKL7s1mG2WWKjPpgEUcScuNr2ytsqEUurme/d9b pu/uR8SRrb7qWEDlDVi/l916/ZeV8l8L5yi9QUpKleASEWE5eyIXjSzS3J5YJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740671960; a=rsa-sha256; cv=none; b=WEjhgdsbAwBtzmZbU4krlubs1Qnwjk1clEP75q16UzA+BsqCy6/ofOB3M7bnktUg6MdgRd cN6vhVO8sBoQtRoirE4iuXQw0vIH7+CQx6b+Pqq0PnK4c8/Cy+xV7xg2V/1Y03AlRTdp2J 7Uo50r4i9wdYZb8z+kK0Sky7b9blT2CoNvEUoGTfTVqthrMt9eHJg3n/k/dR5bPbhdw97D tnD3OUIBkLJpUlRQg4kCY5AOnRa+VeWpcl7sGTI7kdCi5n2HyKDDDb9uoCzftcskO4YUGy S/EItUf2fb1uTVCzWR7QOmnEe6DTiOjIu/+nmD7SXtWwGZEHN1iY7MF5sVXpKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740671960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4lafgwD9w4GGx0ZwQM1MNNFPt6gcE7UeBvQep5RpCDI=; b=LuR5i7wnR0bGN4WqqntuMr+fZNHUL8mcMfXQ/D/ePfFz78uhGXgnF2+aEeEaxs1EdVtzzs n/fYTv1+rqiKcIO+qvQu3knu9RhWYu1gSCv7WYt7iUpUWAVl4napu0llugnVf/e0AX4jYf rjVom4Q64MxiOb4rBzCc77SqIQmI9AVjyCM9GVU/3ht4djM+04fSafYTxW2rLXB5A1zeHu IemCXdPqMrqrrXGuRRUKZxSpw4p/sXEvmiobu1Khvcz3JhMk7vPORT33ZM7UeGfLgqMhr3 yEtHuXxYGHFWnn5FDQbNfL110/+TtiiVmsJuELM8hdEuFWMKL705kA/7E7T3WA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Z3bcm4dVkzqP2; Thu, 27 Feb 2025 15:59:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51RFxKPp004670; Thu, 27 Feb 2025 15:59:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51RFxKme004667; Thu, 27 Feb 2025 15:59:20 GMT (envelope-from git) Date: Thu, 27 Feb 2025 15:59:20 GMT Message-Id: <202502271559.51RFxKme004667@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 97309cec6f31 - main - netinet: Make in_ifhasaddr() return bool List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97309cec6f31f1f4f7a76f9ec5c7dd359c56de02 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=97309cec6f31f1f4f7a76f9ec5c7dd359c56de02 commit 97309cec6f31f1f4f7a76f9ec5c7dd359c56de02 Author: Zhenlei Huang AuthorDate: 2025-02-27 15:58:20 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-27 15:58:20 +0000 netinet: Make in_ifhasaddr() return bool No functional change intended. MFC after: 1 week --- sys/netinet/in.c | 8 ++++---- sys/netinet/in.h | 2 +- sys/netinet/udp_usrreq.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 5a28eecc6945..9a644c60e541 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -185,9 +185,9 @@ in_localip_fib(struct in_addr in, uint16_t fib) } /* - * Return 1 if an internet address is configured on an interface. + * Return true if an internet address is configured on an interface. */ -int +bool in_ifhasaddr(struct ifnet *ifp, struct in_addr in) { struct ifaddr *ifa; @@ -200,10 +200,10 @@ in_ifhasaddr(struct ifnet *ifp, struct in_addr in) continue; ia = (struct in_ifaddr *)ifa; if (ia->ia_addr.sin_addr.s_addr == in.s_addr) - return (1); + return (true); } - return (0); + return (false); } /* diff --git a/sys/netinet/in.h b/sys/netinet/in.h index 0ebd238d6638..3d087e5b06d5 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -678,7 +678,7 @@ int in_canforward(struct in_addr); bool in_localaddr(struct in_addr); bool in_localip(struct in_addr); bool in_localip_fib(struct in_addr, uint16_t); -int in_ifhasaddr(struct ifnet *, struct in_addr); +bool in_ifhasaddr(struct ifnet *, struct in_addr); struct in_ifaddr *in_findlocal(uint32_t, bool); int inet_aton(const char *, struct in_addr *); /* in libkern */ char *inet_ntoa_r(struct in_addr ina, char *buf); /* in libkern */ diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 131242ce9859..2c68d0880100 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1072,7 +1072,7 @@ udp_v4mapped_pktinfo(struct cmsghdr *cm, struct sockaddr_in * src, ifp = NULL; if (ifp != NULL && !IN6_IS_ADDR_UNSPECIFIED(&pktinfo->ipi6_addr)) { ia.s_addr = pktinfo->ipi6_addr.s6_addr32[3]; - if (in_ifhasaddr(ifp, ia) == 0) + if (!in_ifhasaddr(ifp, ia)) return (EADDRNOTAVAIL); }