From nobody Fri Mar 07 04:03:19 2025 X-Original-To: dev-commits-src-branches@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 4Z8CLv3Hs2z5qZsY; Fri, 07 Mar 2025 04:03:19 +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 4Z8CLv2g6Wz3xt6; Fri, 07 Mar 2025 04:03:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741320199; 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=hgftDIdWzU3w+yjteAskvoDTcUuP7ktGvxzNWhFkwbk=; b=by+YkkdJF4tZoF6Ksm7bQs6ahRMDiyWjGqe0waMF8i4mN3XRVdUBVwHwtjw9BmUQpZ+Aqe 1NqZSINDyAwwq1C2m04BVnve3UqcyrSifwsByHswNHaBVfWarXMCeCiQO2uA/Enw/NDpsi PSlUGn0XkIwYWkEVIISWSZQrOjkwgP+cbj7/w+W5w+i7phySmsS+r/SwJDjfsIvu9K6GT8 GLiXTNfCw3ORKCdUsl+o46l9FNH2iDYWZVvRyp42vidPEg3XIwj+TGHFnzM3cxka0r6zll UjSclLhfY7Pj3+dsmttWEIO3ZZ39KkvQqr6pb3woFYQR5KKYaOkEL3To51S68A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741320199; a=rsa-sha256; cv=none; b=bA+jYW1WGrnHMNIyHaRzM9HJrl1fxDnGbNEIMyK33Y5akwqYEkeLGTiFtjOI/NMDfQTpx4 nzVkdoBxC5/cP4oIExryYRO3TfiSHYcGVvMIzNg7ZK7gW60yk5EKPjVkDU0985O7qSgnMt cl45uAqOmIoN2RfJAXtdpMq+u1xh9c1p+7ejc9aWEfoZdsQcPi6COealZhUuaZvGfoFcsZ fGI0LbMC/I6A2sEHUc8p3WWqkHf2sJReQV3yhMc+iqwM9Xxs+d/EGKsba8SrKXSPHP27iK jf3GyKt2pYXrSrKCidtUWLuui0eUzyBViX/EvDk7KADBN0ZvK3v9E10zCRwwRg== 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=1741320199; 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=hgftDIdWzU3w+yjteAskvoDTcUuP7ktGvxzNWhFkwbk=; b=Pr4XwXveWmpsFqUfwqOy0KDUHunmXGoreTgM1BM8wAj/327soF9134QM0syao5gsZ03dSG HZ81ckE8m0MdUxyIcp8OpihSPszWfpJJ/4H9Ws4FOfT2qC8HEtd/AJJ5dkFZwiFQR9XJQF GxmOeltoTJpOK4eFglr+KiNlaMy95J7vTgBDHxCRpkXIDxL54VC17xo6Lp3O4zpPYZwhVc ARWCTrazPOZiAhF6hc4xOHqzT2SWuZvHOLj5jnNPh7QkY4n4HJSRSO/4txH64NY1KxgefE eKILIYAp8S6Wey5rBzSbeneUWzwm19tD0TGVcnlD/rSHvIg1fqIMB5QOxXy1lg== 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 4Z8CLv27KYz52p; Fri, 07 Mar 2025 04:03:19 +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 52743JWD030274; Fri, 7 Mar 2025 04:03:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52743Jg3030271; Fri, 7 Mar 2025 04:03:19 GMT (envelope-from git) Date: Fri, 7 Mar 2025 04:03:19 GMT Message-Id: <202503070403.52743Jg3030271@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: 1b2715c0581e - stable/14 - netinet: Make in_localaddr() return bool List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 1b2715c0581ec725968131b2ca8d2238df2d2287 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=1b2715c0581ec725968131b2ca8d2238df2d2287 commit 1b2715c0581ec725968131b2ca8d2238df2d2287 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_localaddr() return bool It is used as a boolean function everywhere. No functional change intended. MFC after: 1 week (cherry picked from commit 69beb162848b15c967d3b45ac56501dbd8b94e91) --- sys/netinet/in.c | 8 ++++---- sys/netinet/in.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/netinet/in.c b/sys/netinet/in.c index de6224ad9ebc..664dffb4e6cc 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -129,10 +129,10 @@ static struct sx in_control_sx; SX_SYSINIT(in_control_sx, &in_control_sx, "in_control"); /* - * Return 1 if an internet address is for a ``local'' host + * Return true if an internet address is for a ``local'' host * (one to which we have a connection). */ -int +bool in_localaddr(struct in_addr in) { u_long i = ntohl(in.s_addr); @@ -142,10 +142,10 @@ in_localaddr(struct in_addr in) CK_STAILQ_FOREACH(ia, &V_in_ifaddrhead, ia_link) { if ((i & ia->ia_subnetmask) == ia->ia_subnet) - return (1); + return (true); } - return (0); + return (false); } /* diff --git a/sys/netinet/in.h b/sys/netinet/in.h index 80c872367f93..db36962aadb1 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -677,7 +677,7 @@ struct in_ifaddr; int in_broadcast(struct in_addr, struct ifnet *); int in_ifaddr_broadcast(struct in_addr, struct in_ifaddr *); int in_canforward(struct in_addr); -int in_localaddr(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);