From nobody Sun Mar 02 15:02:44 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 4Z5QD44h5rz5pV6v; Sun, 02 Mar 2025 15:02:44 +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 4Z5QD42fbMz3TTD; Sun, 02 Mar 2025 15:02:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740927764; 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=S23VVF8kFwUWLxPIlcjX3r1rM/PCkilV1r2dxVDcnh8=; b=nxbNsdNa1kM1dMAqErKsS5D7PLNfPd7utVNRzpVK0wsUPbLf3/Uc/99FysL61P8bYzKc8w lw1jKdTyT0ufcZD4gRdNDU4HWAICXQ92AcyjDF6VWWt5R2DWgWkEAu6NV3PA0/Q49A5zEy 9R9e7/v0L2tdKgUN5BmFYda77pZ1GroaXIeiuFa2q0CkF1Op31FQWJFCEK0oTlmd1Scm0m GPWCTpVmWPX45dgJOQ04hwL0AixJ8bTY19ypqvHpgQLQqprgym9vMQ4B+oZALtyvrNv9Jc lKCsKvc8IGO2s0tdVgUwn6n5R6PL7JvrHu6Cd2NdGoI6p8xecOTZOnufRMqzlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740927764; a=rsa-sha256; cv=none; b=Hdnir07tFhjZZ7lZNG77JA2XkXWDHs2BSLd0Qnyzi1WlbxqQ/WYbZQlVPmmukDlqKXkjo2 ClcjNLrGLYpg2cJbOtP4oRshPAb4byCmi/WdCgf4auH9KKoTgSZP7D5lyYhFk6ttIHTQbt 6rFoJVGtLT/htOIOh/gEdLFdJAmmyr5UW1yphhXRPkRkfEeWXg90T7bV5uiWoAES1SLVwp 0cSu8R5SfLawIhFw7oHh/oVPHQS7rIxrmikqoMQV683V20wO0sEKaU8duL6kSwydG4OI3c KigUX6N8rHoV84g+/Cw5bdhw0QsDeylS9f0hnXcKnnVYiX9L25CNx2ZmRr+VOA== 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=1740927764; 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=S23VVF8kFwUWLxPIlcjX3r1rM/PCkilV1r2dxVDcnh8=; b=PhHsTmvFvw9LccM6mOznZ2/razHr/iUKszukQVDMyd7vs+7RDq+q840dWcxc+VMK83lsR0 a6RlWxOWWXkO/ZqBopnXCuDijubTQ43r8sqlokBWreg7Rj4JB56fcldw6OcMpt/E5fC6gJ fJjLi6/wm87VZN8Cpz3yw1F89tuW3c5k4nm/x76HX0HnFK5wsVd8CpxTskyW9R4zrPLC+x iTEIxFywjCdx3hS0vgnYn+nUAwh+/xTI5w3ruqlYSNg6otj/0I1kGcwuMP2mvvY/cVP9dO p7DpqPXch7uGDKpQm51raDw/aXluX1LMaSGFnRYs6tGwglDkjRyOmI8s+QPflg== 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 4Z5QD42GK4z15wq; Sun, 02 Mar 2025 15:02:44 +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 522F2iNA089790; Sun, 2 Mar 2025 15:02:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 522F2i5x089787; Sun, 2 Mar 2025 15:02:44 GMT (envelope-from git) Date: Sun, 2 Mar 2025 15:02:44 GMT Message-Id: <202503021502.522F2i5x089787@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: 3ae7c763540a - main - netinet: Make in_canforward() 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: 3ae7c763540afc0bc5320eb45f2661d315370eb8 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=3ae7c763540afc0bc5320eb45f2661d315370eb8 commit 3ae7c763540afc0bc5320eb45f2661d315370eb8 Author: Zhenlei Huang AuthorDate: 2025-03-02 15:00:42 +0000 Commit: Zhenlei Huang CommitDate: 2025-03-02 15:00:42 +0000 netinet: Make in_canforward() return bool No functional change intended. MFC after: 5 days --- 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 22adc8277b93..2fcbff8611ff 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -271,19 +271,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 3d087e5b06d5..3f2c388548ec 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -674,7 +674,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); +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 08c48996a798..4d614dfeb0a2 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -924,7 +924,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;