From nobody Fri Mar 7 04:03: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 4Z8CLw684Fz5qb1G; Fri, 07 Mar 2025 04:03:20 +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 4Z8CLw3b56z3xnD; Fri, 07 Mar 2025 04:03:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741320200; 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=hiDRygSyiup/w2+z8kgCBpEERN209b5rmdmO9F8C/EA=; b=D4baBkehHaxaQgxRfaXyGfAt0HJn1v5qXLe3Pzl46G4ywcDR290e8RSqFoovPMNPq1sM1h ptx5rllrmoeJ1kYF1wWZdYN8IB8zaxXFYLLaEBBskyAia1gzaYIgN3WiUeVjvXpjOeQCbw lj7i2jouktjCAa6ZTwFcDUF/GyDd8OBZ2kjgXk0OVNz/yYwLaVScG/c3bmiX66nbQThu6L y1WM6yGd4KU3vJfolSIIpLOX6WlTKdvIhqrnJ+dE5KgkTudYt8xoTRh4H72S3sc4+uF26p pwpQZv9utb2ZaREb6q5MRw8+fk9RySvsSMEGFf+ZpIk6zza63hNmw7oneqf1hw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741320200; a=rsa-sha256; cv=none; b=NjnvQxeit8tXJRoWC2fvN5iRyguErxwEfRmkYjRb524a2QEs4JihpbBnHVjTvClB1rveYj /wMEZ9wJ4dEv21KIfKdQOOvhGvozPdwnR0N1JX6xLOJUU/cOEMlr3fD/yUvkoGBWxR1Emz OATQVSElAbmTm1s6KSHicvx3uLGxc6+QXtU4+iHUlaBZFLwbCa4bdzTKu8P+TbeDZhLtO+ FBjS42yJEBE7rSVjzMlej2L0RIXjYNYInZ3xwMOJK7wgpQpu6cJQBnl7ikTuy5aW/aHg4G 3dkzjP5YJLKYdjhKqCEh1F56hgwBz2WKi/PixFIh1aC6i6HElcxhOGIuGL5gig== 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=1741320200; 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=hiDRygSyiup/w2+z8kgCBpEERN209b5rmdmO9F8C/EA=; b=uWcdNZvF1+CYZmrp/7Gjp5DfoB3QBsYbk4jxZb7fukXhO+HnW6sQ1EK05cm+QMYU9EaYem Bz2xts47yPiqVlYPYCqXj99j3dvx6MTcNSmDBVhnJ7WFXaDrFOTalFoEHApJaE5rFbZ2UE yQJxJX19spddrqeITuumSQAGc8dJyUOSM8RHxPS2iawwB4gSLxtKAJmAPabIRYTC+fGFBZ baEYLecFV2e9gHYRFpv0sb8ibiBkFYo9KA6i5eN6Zmcl055yNdmQQFESk1QZtCUFj653o5 JyRCVbuvtWk6W8vZVxawyQpA3RyKw6kolzOCxlcsLigLKCOByNl0/4vliDCojw== 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 4Z8CLw37LTz50B; Fri, 07 Mar 2025 04:03: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 52743KBu030307; Fri, 7 Mar 2025 04:03:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52743KoF030304; Fri, 7 Mar 2025 04:03:20 GMT (envelope-from git) Date: Fri, 7 Mar 2025 04:03:20 GMT Message-Id: <202503070403.52743KoF030304@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 841c38b5a028 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 841c38b5a028cd812a056092a410c0028d010761 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=841c38b5a028cd812a056092a410c0028d010761 commit 841c38b5a028cd812a056092a410c0028d010761 Author: Zhenlei Huang AuthorDate: 2025-02-27 15:58:20 +0000 Commit: Zhenlei Huang CommitDate: 2025-03-07 04:02:40 +0000 netinet: Make in_ifhasaddr() return bool No functional change intended. MFC after: 1 week (cherry picked from commit 97309cec6f31f1f4f7a76f9ec5c7dd359c56de02) --- 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 664dffb4e6cc..e30f63e5bec9 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -187,9 +187,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; @@ -202,10 +202,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 db36962aadb1..8e7e3548c6ad 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -680,7 +680,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 9a3d9a810481..0ea065f15ce4 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1048,7 +1048,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); }