From nobody Fri Jan 24 10:25:07 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 4YfYpq5Pm1z5lBnp; Fri, 24 Jan 2025 10:25:07 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YfYpq3tHHz3tQM; Fri, 24 Jan 2025 10:25:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737714307; 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=eSqfhlIEexSaFdak9P281G222BiN/5QPemz3f25MEaY=; b=gScJWRE4DOloOgqt+VEyoTfJknI1GNfWA34mFtQzTBqVFX1dQAFCHN71+eErjf5M5+qWFA f0OCsfUpgICFFjtXkafLMr7qz5wHtHJwBvd3X1IZ+dfFKu6upXehsefziqJluNr0svWdYr z8ObOmmhIlJPJBleyezV6zFJFvSZ86/XqfPmoGzTWGhCz055aJ/NayqU6EAqY4pcTsqiK7 lPeOGcFzSgcLi+IC5m1WIrSxM5txLEuA5Ttn4udyP0i+Rl9lFZQAeEzMmpKZ3OdEo3XWJC qHD9pQHkdy51E2nCKEeKXVgDZ8Yprx0oCp1gRYEYZY9nF7srablvpMCxieSZ0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737714307; 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=eSqfhlIEexSaFdak9P281G222BiN/5QPemz3f25MEaY=; b=l/FrVV4k0TyxLfIocLsJX8Or9wsidQSZEVsLpdcqVDp6k0iCnGAWtk3PEC388vrsM8i/4X +8DiNJ6mOylGMGe+90mq5oB/hT2eRREBNuov7uOGhhroXKp+Hk5FbOClTjAXs2A9zojzKJ FsMbwwEvRfzc0Fc85kYfjQRBUSFXjhXpq5GSrorxLEo0Ct112NhPELwOw9UzRNCWI3IDJP jeVZGqQ38yqV/6d4CJQT1rnt9WwSdPwSfO1B4lxiJVCSs9MUNb1SFL/0CpZl3Rty7jo7/o vdoY6idvCoFDWp3IbKAWsbT9ECIUEPIaYWDMuM+OTzri1gRj5qCgV1RmHRuwzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737714307; a=rsa-sha256; cv=none; b=XEeN19GqCRqXVdpGi8uhGee+FkqPzGkusatVFLT6pB2+y+SxbEkVj7650vor+y2zEYXXX0 LXQ2xQDj1UopBKqrJQ9eAVstpRYJENw0zL6l4wTsB3FiExC3jsZbO0JfxJK6n2uar20uJn 9kjP9UiVcFV61/c0Bfk+aIXtMeZW0o+mDUPvOrJ/dFdRHwMso8u0IDY7BwpqFRSSGzpUhi bhlL/JKn4Io21LT/LIILfBQ518U2J128EmGqZjYkLo7DxpMQdJVqmasMg5iS9CUTSWEa77 XYzqzmaZvPRPkeyhby4z5z31/5/pcSUo0Xp2A9LF5j6xkc9la/QEDAGyE3cqZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YfYpq3B70z65C; Fri, 24 Jan 2025 10:25:07 +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 50OAP73b038570; Fri, 24 Jan 2025 10:25:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50OAP7sE038567; Fri, 24 Jan 2025 10:25:07 GMT (envelope-from git) Date: Fri, 24 Jan 2025 10:25:07 GMT Message-Id: <202501241025.50OAP7sE038567@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 06a6ec55fbd0 - main - pf: ignore/preserve ECN bits on ToS matching and scrubbing 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06a6ec55fbd01a372778870cb5039341bdea9e38 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=06a6ec55fbd01a372778870cb5039341bdea9e38 commit 06a6ec55fbd01a372778870cb5039341bdea9e38 Author: Kristof Provost AuthorDate: 2025-01-22 10:56:09 +0000 Commit: Kristof Provost CommitDate: 2025-01-24 10:20:31 +0000 pf: ignore/preserve ECN bits on ToS matching and scrubbing The lower 2 bits of the tos-header are used for ECN. (http://tools.ietf.org/html/rfc2474#section-3) OK henning@, haesbaert@ Obtained from: OpenBSD, mpf , 60dfe711ee Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index a0bc65e78430..0ebc813756f1 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -9986,7 +9986,7 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, pd->dst = (struct pf_addr *)&h->ip_dst; pd->ip_sum = &h->ip_sum; pd->virtual_proto = pd->proto = h->ip_p; - pd->tos = h->ip_tos; + pd->tos = h->ip_tos & ~IPTOS_ECN_MASK; pd->ttl = h->ip_ttl; pd->tot_len = ntohs(h->ip_len); pd->act.rtableid = -1;