From nobody Thu Feb 27 15:59:19 2025 X-Original-To: dev-commits-src-main@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 4Z3bcm10qCz5qKXh; Thu, 27 Feb 2025 15:59: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 4Z3bcl4Qvvz43HP; Thu, 27 Feb 2025 15:59:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740671959; 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=ZcINcqUqiKkNO3qxq0fG9f4C2FHXQa6XM5+TV6epi9E=; b=IA+0NliFpHzY5i8T6hLxAhEMhrJWb9/vdk+e+z8yp6vCqAa718ES9Wm8BrtXss5ZDvJqLi rJ0pz0BAdNGv796UAEDrOs/c8/5KVguKiLu+EUI3z8VuCHgqqX/WOZr9RCU96Ob0gA6icj MheKCoKEpLTM5bvi5fQZ2bqgJFCir/yt2WR+1866nI2yi/65PD6wTSrRDBUPlWHykasD3K WY+8ad1s93gCsikVGLjlh7IhCp1JBNNxuf4A8KhsL8/kGZofNDTt8lvRXkbvyP87Je8oLW PookOO73a6nhJZvGuk2HYQ+c8qD7BTxFK3pPgvu78IPiI0rBLHMITvH5t9wGyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740671959; a=rsa-sha256; cv=none; b=UzNv+/A+emvwZQfo0L0UqYfJFtNpb9jyXrGeDKLjFyaXdOJHgXgav8zz6xefTDxgfXHV6B GMNdREWByC44fx23olNEq5QH/zjmKXhPTX4U3fOe2x272SAf7jBVzmLYwzE5lZtNIQbjzs vB36SDqo5VtQw0x4aytI7C1RVlj7WSzX0NQj3BZjBgvFjJomQRXpad9G+aFMVn3fsjDdoH 1ozQhbE9xWQEzp7PhoiBOrryCdh4zI9FJFdnkPJdfFeaXOEj3qeps9gAg1fQsvsPLLiJgT Ija517DlUooLRi4vxqMLKgQ37KxM985t/KfdFirYHOsXHrRxg6ocSEB4w7myug== 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=1740671959; 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=ZcINcqUqiKkNO3qxq0fG9f4C2FHXQa6XM5+TV6epi9E=; b=LkBjlXQqsyT1Ca5569yh5cXapXNbl43KTiFMRliA2zcQho+Zw/dgJZBQ4mDKYkFKBBpA2x oAuSO1lPTNCmsHj14wAeuUD1kacG9FfzbCNRYcO0AUE9wItlFAiH/ZpLq+j3AWWnZaRsRB NaZ7VkFNPHs6eUzqvCYD3k4NHhxKKU2UaGpH0jyYjfBdEGQWxhs4QqUjdOq0CUB/qtitY1 Mk3Gqb4xG1UJ9FMaFbUxnfq7YuQQGKgZR4KoS7vpGcokBMAMzfxHaaD6d/Z+chD51xBnl8 ygpaGJAzpy4+KCNbWDXKnaMhUIAsFGi46QaKt4l0JK+AjjWwfkafr5WbZ6DSGQ== 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 4Z3bcl3zzfzpR5; Thu, 27 Feb 2025 15:59: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 51RFxJ8R004627; Thu, 27 Feb 2025 15:59:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51RFxJ36004624; Thu, 27 Feb 2025 15:59:19 GMT (envelope-from git) Date: Thu, 27 Feb 2025 15:59:19 GMT Message-Id: <202502271559.51RFxJ36004624@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: 69beb162848b - main - netinet: Make in_localaddr() return bool List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 69beb162848b15c967d3b45ac56501dbd8b94e91 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=69beb162848b15c967d3b45ac56501dbd8b94e91 commit 69beb162848b15c967d3b45ac56501dbd8b94e91 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_localaddr() return bool It is used as a boolean function everywhere. No functional change intended. MFC after: 1 week --- 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 4c0908937ddc..5a28eecc6945 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -127,10 +127,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); @@ -140,10 +140,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 e42422341ada..0ebd238d6638 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -675,7 +675,7 @@ struct in_ifaddr; bool in_ifnet_broadcast(struct in_addr, struct ifnet *); bool 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);