From nobody Fri Mar 07 04:03:22 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 4Z8CLz15yPz5qb1K; Fri, 07 Mar 2025 04:03:23 +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 4Z8CLy5d7bz3xqj; Fri, 07 Mar 2025 04:03:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741320202; 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=JSlET4/JT+En+BeMSx04HyomGx0b3LLc7A0LVbgKHW0=; b=QNaXBIz/q4CCLUHWjb4TFISbCSPwSv4//omGBrKsULkac+62oy9LVSptJi9SkvbU5rUARj srwtVNpX4Pl86y38VQDbpV94/LWxPt50SjcgFyl9m9Gjf77zFD/wFS+eqI3ZQIPK/+b/Qr 2iBSipKLQqc3TXdU32VblLf7CpsYa6mdGUOrxrsSjlh0xhvutSKNsbnyhpEBBUB3Wx8d/G Wj8uW8A9taW876HOEu3HTvayIkAAvbZUgFuon9qJMQ9DMIjaW4WbDLEJteQpa5rVVi270E oqBhJzNRnsytAocGoHl/ZQXxWK2Hc3UR9GjfVJBC8okOrT5bnBHfldYLz3n3aA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741320202; a=rsa-sha256; cv=none; b=Yi3IyBW6cTXnnck2CC5c5ezCqj1qSVTKgOcIKLPgu0G/mCFQCzkf3XLJ7DMegdTFBg9vSo qjAogNqrbgBuYBi5Q8YlZEwwoaD2Dt4sR8tb7TR3729qvCX6u5edWaPFv5EHsZ+LUsJ96Y 3HFK8g2GQXnfev9I8dNjrRA4yTnuBW2fEhbihPVgU6tpsHCcSkBPT/XZKz+5BJ7EglVCiU AHnVTB1HilEExjJRou22sjAPToL+ajxQ0e35oUlzqHnWMRyu3Sa9Y3e+xc8aufFOrkTzX/ 9ULlaiWOBwExuvEO0vrzkoODdYztLoSobrdnpvYYYkQ6svmkbKYnfmEARiLNhw== 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=1741320202; 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=JSlET4/JT+En+BeMSx04HyomGx0b3LLc7A0LVbgKHW0=; b=dsm2TZfYmT7Re+oyg0VbiTvWfXbJpka97hpviv+ZTfoTp20rLNm53SZxAnvp9IJ+sJVoka WTxJqiL03ed3hHkCTqdJmFeOaDbmFFq4ob4GywxySlH9evn/3XeYhdYjavGJYfZ+w14+EA lr0ROBCI5u0O9fJnNEt/AhTpiHVJBko1+FwJX8ax2MhLKY7feq0iqp3Bx1FBCo6j7T4PBo ewfe3UcmS5jW3VNn0W6sjpG5av/ekS2A4kCToJ5qEPWSsEVsPNOUS2zVmx14jDrnXSkKck 8IUTpSgJRcB3Ep73fIYOxzJRJRstdGZTn8T2x9ZVVRNHRnQrNJzgy43ArULUDw== 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 4Z8CLy5B8Nz52q; Fri, 07 Mar 2025 04:03:22 +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 52743MCn030381; Fri, 7 Mar 2025 04:03:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52743MsU030377; Fri, 7 Mar 2025 04:03:22 GMT (envelope-from git) Date: Fri, 7 Mar 2025 04:03:22 GMT Message-Id: <202503070403.52743MsU030377@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: 70831490663b - stable/14 - netinet: Make in_canforward() 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: 70831490663b7509203ff3f87beff1c8eda806a9 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=70831490663b7509203ff3f87beff1c8eda806a9 commit 70831490663b7509203ff3f87beff1c8eda806a9 Author: Zhenlei Huang AuthorDate: 2025-03-02 15:00:42 +0000 Commit: Zhenlei Huang CommitDate: 2025-03-07 04:02:41 +0000 netinet: Make in_canforward() return bool No functional change intended. MFC after: 5 days (cherry picked from commit 3ae7c763540afc0bc5320eb45f2661d315370eb8) --- sys/netinet/in.c | 10 +++++----- sys/netinet/in.h | 2 +- sys/netinet/ip_input.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/netinet/in.c b/sys/netinet/in.c index bb36ef18d3e2..bafd1b549848 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -273,19 +273,19 @@ in_findlocal(uint32_t fibnum, bool loopback_ok) * that may not be forwarded, or whether datagrams to that destination * may be forwarded. */ -int +bool in_canforward(struct in_addr in) { u_long i = ntohl(in.s_addr); if (IN_MULTICAST(i) || IN_LINKLOCAL(i) || IN_LOOPBACK(i) || in_nullhost(in)) - return (0); + return (false); if (IN_EXPERIMENTAL(i) && !V_ip_allow_net240) - return (0); + return (false); if (IN_ZERONET(i) && !V_ip_allow_net0) - return (0); - return (1); + return (false); + return (true); } /* diff --git a/sys/netinet/in.h b/sys/netinet/in.h index 8e7e3548c6ad..5c781d39d33e 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -676,7 +676,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); +bool 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); diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 6d8165003950..7c01c4959841 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -932,7 +932,7 @@ ip_forward(struct mbuf *m, int srcrt) NET_EPOCH_ASSERT(); - if (m->m_flags & (M_BCAST|M_MCAST) || in_canforward(ip->ip_dst) == 0) { + if (m->m_flags & (M_BCAST|M_MCAST) || !in_canforward(ip->ip_dst)) { IPSTAT_INC(ips_cantforward); m_freem(m); return;