From nobody Wed Jan 29 19:33:28 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 4YjslF3p3Nz5lrPf; Wed, 29 Jan 2025 19:33:29 +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 4YjslF0Tjtz3Qsm; Wed, 29 Jan 2025 19:33:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738179209; 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=0rJTfiKJHF351GBY5aHte8Oz/gswHpiqc+wyfw6Qnd0=; b=To7b055ZJ43NoLFHDVpiwi6VTScheSlGk4rY/BOeF/tNa1PNvMY31uFkqjV72UPOZgc3UK 4136EDpgaZGMtn9jXgR600AUQvq9zbl6inMytXVwnx3H3VcUUcJMwKNkBDABl1v+S+j1rX D+40ZYYe139JqhRnnddoyhHKPHco33AMcVXOcYiBXoBXK0gJqz7C69tyhVhAkJlu6GkPAS Y12UTxa3dnzv0lBQySaL1X8c6WyX632zD17qo44oe9bAWzL3Km0Dnj/Qx6ULQaTISiEIVx l+NUl1v+YhN4wUZYdIvsurGifHpXNRV9MkFOYQrlkTNiGvEPVPtj9Nc9ooOTig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738179209; 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=0rJTfiKJHF351GBY5aHte8Oz/gswHpiqc+wyfw6Qnd0=; b=NFWP7FBmeoE2SMgTJy0JyLGWzQ3by9xznHrFHLjCc39YN3OnMuMg/4aTOhd/oduXVL7PAu cxtN+/9y5GoXNOjtxAE3wtUX1r5ley3rw368iIeC2aYzcGZAL5dncLZssI6xTqq0OivRuQ 9Jj4B5ESBRoTxglOvcgfsNUG7exwRWKqJ2f4OaFTAMI5goUKZkn9hyGu8fcJ5CqEM4B2im OIJI72Ezu5+RLzYaaokq4epmZQupVQtDcAFCeZElAhDCEmpy+rqUyfbGlPOArme0LNkceJ 7Tn9WZTbwNnvqhD/Jukut5SD0pSUWALu29uDqkLciTl+JsfIZdN28Tq6e6HkFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738179209; a=rsa-sha256; cv=none; b=uTtudi1le3yaWUOUDZ+zw/NCMAhYb4dkURjs0gFEHqnnAaHCSeVwQ/xOPMDgFuE1aG6I/S pkwG2z+avhgLT7rgpKcUlsI30FCH/k5nGZwLnCOxaQp0nuX9VUy4OMRXHIBl4FhqxPRhYp HOqLhhrcaoxPXf6unduM35G8tfAcUwenot3yDtoexEHiS/dbup3x52+colZ/tlVFTu1Gq2 5n+tuD8qem3RWGCx7Uw6ns0hhNlRWgNH0e4ZrljZDdEuz/xeL25h781B5ZDcB+nuD1jw8V JBDt7q/krXw914TEgBda5Nss1pgwiN/obWihmumyQJQaxzLnZbqKbReGKyw0lA== 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 4YjslF03fHz16m; Wed, 29 Jan 2025 19:33:29 +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 50TJXSB8039670; Wed, 29 Jan 2025 19:33:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50TJXSIY039667; Wed, 29 Jan 2025 19:33:28 GMT (envelope-from git) Date: Wed, 29 Jan 2025 19:33:28 GMT Message-Id: <202501291933.50TJXSIY039667@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Joseph Mingrone Subject: git: f904cde2ea10 - stable/13 - tcpdump: add missing pf reasons and actions 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: jrm X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f904cde2ea104ca5b0a0af880a9094793fd8f4ef Auto-Submitted: auto-generated The branch stable/13 has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=f904cde2ea104ca5b0a0af880a9094793fd8f4ef commit f904cde2ea104ca5b0a0af880a9094793fd8f4ef Author: Kajetan Staszkiewicz AuthorDate: 2023-04-18 07:33:33 +0000 Commit: Joseph Mingrone CommitDate: 2025-01-29 19:29:28 +0000 tcpdump: add missing pf reasons and actions Reviewed by: kp Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D39586 (cherry picked from commit 56cd7716b63d84190e6308d50717ec8bbbdfe1c0) --- contrib/tcpdump/print-pflog.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/tcpdump/print-pflog.c b/contrib/tcpdump/print-pflog.c index 49994507e728..31f25ded6915 100644 --- a/contrib/tcpdump/print-pflog.c +++ b/contrib/tcpdump/print-pflog.c @@ -57,6 +57,7 @@ static const struct tok pf_reasons[] = { { 12, "12(state-limit)" }, { 13, "13(src-limit)" }, { 14, "14(synproxy)" }, + { 15, "15(map-failed)" }, { 0, NULL } }; @@ -64,6 +65,7 @@ static const struct tok pf_actions[] = { { PF_PASS, "pass" }, { PF_DROP, "block" }, { PF_SCRUB, "scrub" }, + { PF_NOSCRUB, "scrub" }, { PF_NAT, "nat" }, { PF_NONAT, "nat" }, { PF_BINAT, "binat" }, @@ -71,6 +73,8 @@ static const struct tok pf_actions[] = { { PF_RDR, "rdr" }, { PF_NORDR, "rdr" }, { PF_SYNPROXY_DROP, "synproxy-drop" }, + { PF_DEFER, "pfsync-defer" }, + { PF_MATCH, "match" }, { 0, NULL } };