From nobody Wed Feb 12 19:39:05 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 4YtTCG4HkSz5nGYY; Wed, 12 Feb 2025 19:39:06 +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 4YtTCF5yxCz3Xby; Wed, 12 Feb 2025 19:39:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739389145; 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=UGnstng+LF3gatKVXvYCavQeGuYy9+ZhWjXby41imx0=; b=jHREXoDCzRgZHmBsSS68sZ1E0XmwtmSnCykYegb+zONbWF/3vwVDLPYUHY34jlT3P7x1re TRpFTlmEgobGNpZCWMqwlNFeT0YRnLSFqvPJLnttRTJqXlqgfJEhALo79qCW+XRfLWWDfJ pDGxLa8emrCfb1nJzwa/7J+Fbll8Z+CywfYhmftRTG+DytKxO29dE6zSINFbVbb+pXxakJ kNql7pBe9g/A2BYLlrxxPGoJC95YazkBgyAxfjfznj+rdWn0H6lJjn0V2LY9p+lguSjkhB sGtmTybbjsz6L4aWYuDDVRYdgpN76MC4zk7/AF6a8cyka7HNQdcRpK+m31r3xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739389145; 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=UGnstng+LF3gatKVXvYCavQeGuYy9+ZhWjXby41imx0=; b=w4tGsHu2js0koeXaqPOGoGTwEqTDP/14o4If1N5xoETJ78lRnR/v/wEF0Ej9ZTJWLaYiH4 SyvRP1P4IyqGymOq5FF61RJoSbHihqy7vURzil0/mm8Hg+yxHED3H0Z9uD4Qlyv7fV5gz4 pXKuyciURmb9XroTRo02Qou+7r7r8kSrwmhJk3jrikc++x8TXZDUhwy1+ioZPcSW9Yes3J rMRbTPx+aYS82jAEQTZD6ElFdYgzNntImEPmnETh4LwyjBBhAx810kF2nYziKUXhgILntG HOCi1Aew18VKk8Q0Toe1O+RcAuiOsuRSjbAW3tzmAyvBF8Mk7IRTewGGb4rVcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739389145; a=rsa-sha256; cv=none; b=IIjkUWiGsfMPv5A8+mSPensCCidDwyrzlrcIpZ/1qJX8MwMpDFt2CqrWiqQ/Fvy07OdzFI NEmVK0Xd5nhQK5ce83KZxMmVyxDQOofkDVzQor+XFdTdrNqYQxmFdv99Pwa6udMp89QmDp E3/Qbdq3ycxSzqURFDT9oQwi6qDYNJiPao7kVY37mvi79evd5KELogNrRuPnhrp9aw6seS 1mOca87xe5U9em4VyOAdhmIXnNccHkQUhm05XEk6xsA/jKK6PnSbgOjTZatk4lgT5uJFW3 ZjQwej2e+yU8EqOefOzAR+l3remcKElhwPml6Nl1zQGv14DWQHj+iexmpc6/4g== 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 4YtTCF5B3jz1BV4; Wed, 12 Feb 2025 19:39:05 +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 51CJd5v6061607; Wed, 12 Feb 2025 19:39:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CJd5QR061604; Wed, 12 Feb 2025 19:39:05 GMT (envelope-from git) Date: Wed, 12 Feb 2025 19:39:05 GMT Message-Id: <202502121939.51CJd5QR061604@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: c56650fd791d - main - pf: add a pointer to the protocol checksum header field to pf_pdesc 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: c56650fd791dbaa4a5c677bdac6cff3d4027264a Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c56650fd791dbaa4a5c677bdac6cff3d4027264a commit c56650fd791dbaa4a5c677bdac6cff3d4027264a Author: Kristof Provost AuthorDate: 2025-02-05 16:40:00 +0000 Commit: Kristof Provost CommitDate: 2025-02-12 19:38:38 +0000 pf: add a pointer to the protocol checksum header field to pf_pdesc Set it up in pf_setup_pdesc(). ok ryan benno mikeb bluhm Obtained from: OpenBSD, henning , 14255d4d87 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pfvar.h | 1 + sys/netpfil/pf/pf.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 65be1a0ce19b..d4c3831b49f8 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1614,6 +1614,7 @@ struct pf_pdesc { struct pf_addr *src; /* src address */ struct pf_addr *dst; /* dst address */ + u_int16_t *pcksum; /* proto cksum */ u_int16_t *sport; u_int16_t *dport; u_int16_t osport; diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 874fd0678f7a..3957d39edc13 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -10090,6 +10090,7 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, pd->p_len = pd->tot_len - pd->off - (th->th_off << 2); pd->sport = &th->th_sport; pd->dport = &th->th_dport; + pd->pcksum = &th->th_sum; break; } case IPPROTO_UDP: { @@ -10111,6 +10112,7 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, } pd->sport = &uh->uh_sport; pd->dport = &uh->uh_dport; + pd->pcksum = &uh->uh_sum; break; } case IPPROTO_SCTP: { @@ -10176,6 +10178,7 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0, return (-1); } pd->hdrlen = icmp_hlen; + pd->pcksum = &pd->hdr.icmp.icmp_cksum; break; } #endif