From owner-dev-commits-src-branches@freebsd.org Fri Sep 10 10:36:11 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BA22C6AA544; Fri, 10 Sep 2021 10:36:11 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H5XNC4xXlz3qxd; Fri, 10 Sep 2021 10:36:11 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 893323314; Fri, 10 Sep 2021 10:36:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18AAaBZ7045167; Fri, 10 Sep 2021 10:36:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18AAaBie045166; Fri, 10 Sep 2021 10:36:11 GMT (envelope-from git) Date: Fri, 10 Sep 2021 10:36:11 GMT Message-Id: <202109101036.18AAaBie045166@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: a83a49502989 - stable/13 - dtrace: fix ipfw_rule_info_t translator MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a83a495029898491ddd070d96ce183fa2796a2c2 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Sep 2021 10:36:11 -0000 The branch stable/13 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=a83a495029898491ddd070d96ce183fa2796a2c2 commit a83a495029898491ddd070d96ce183fa2796a2c2 Author: Andrey V. Elsukov AuthorDate: 2021-09-02 13:35:01 +0000 Commit: Andrey V. Elsukov CommitDate: 2021-09-10 10:35:35 +0000 dtrace: fix ipfw_rule_info_t translator 322e5efda8578b has changed field names in the struct ip_fw. Use correct names in ipfw_rule_info_t translator in the ipfw.d script. Reported by: Keith White (cherry picked from commit 5c8e8e82aeaf3aa788acdd6cfca30ef09094230d) --- share/dtrace/ipfw.d | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/dtrace/ipfw.d b/share/dtrace/ipfw.d index 61d1388c2685..3db51da04887 100644 --- a/share/dtrace/ipfw.d +++ b/share/dtrace/ipfw.d @@ -212,8 +212,8 @@ translator ipfw_rule_info_t < struct ip_fw *r > { flags = r->flags; set = r->set; rule_id = r->id; - cached_id = r->cached_id; - cached_pos = r->cached_pos; + cached_id = r->cache.id; + cached_pos = r->cache.pos; refcnt = r->refcnt; };