From nobody Thu Apr 3 16:43:04 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 4ZT6x45T5zz5s8NK; Thu, 03 Apr 2025 16:43:04 +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 4ZT6x433CYz4JJT; Thu, 03 Apr 2025 16:43:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743698584; 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=+jb0CTBcF9votHOCyF3ERUOYvuDkngNuzI6ez97FGK4=; b=CV4Jw2qIpdyzSmTwgRbtfKlfcGjYSVITyS08veBSMwx4njXNkBR++zTc3o5HAdmJuxuzNM TMe/9RoV+ZX0b876mH5elL7CO3kWVBqY0ihHDXPyOPUqy3gj2P5JYVOmvrqtj8KIxxpeki Ydh8ch6BRvl9CmX9kgZLo0Ph8o5lr4hnSxyrL9/0uNEiyid74CCBtMpyHGC9nYVyQkr6pm 63gPpscC37W57u7pKLgwqNhmNaOt2gmIzSVWIYqhszvIBPkuezo5cQl9vghjZzedqPHs34 /0W9mmmzrJMC+5P67ppc2O6nHY5ZnGW/ze+vVysKUIVljrl92cNJiAFzzCZXqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743698584; a=rsa-sha256; cv=none; b=UCCg1Iejrxu77mWyBrAKLJHV2DFqMNgIoUFaUswUsVLDuUl96o6tDGX2qP1v684ywo6XqF yal8EP/nVUAml6L/CLSyrd+Su+YnRaFusxV9cKj0DU3lxFPVxoARjDtM5H1Ztw87BkKhGo LYhcwWGTs37kHul3sEd4ktQGNFymuUt3/4ZYYM2wbkqbQYdFvJ3A7ZoiE/bh05amV9j5Wq kkz3xVJ5WVf2BhvMaydhDUUokjcVQVabnG83c046g3+DhAZDeY8nmMYNRHemEeYJ17FGWS 6GSsYnXP3grBhtFJ+uT7aWJDuS5+/nrFWX6fMhPM2OpZmQ6Six1NWRT8MgmLTQ== 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=1743698584; 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=+jb0CTBcF9votHOCyF3ERUOYvuDkngNuzI6ez97FGK4=; b=BBNDIk+Mx27P0j8inDv1lD1TJb4ve2k1/Jt/H1a22v+bzK8+IEf6LF4MbdVIjqcPBDAZKv b4hWaK7GJUlsB4Me1FwrNh0l5+4AlM8C+KvyVutD9rsZ1Dog48W7TtR1UkQOfSdyEJcndQ EDRFTdSzlLVeYc+Ef2QHIspwi7U/c6/GsnxvmTHlMBz8jS34RbHhcmPfySUruNpgZ70wje npZbLQN2zb5KVRf1mSwm4MnVFYDz2sF1oAGbb/eDlm0HI+E1fMsTV+LKyhRxk2qKf2Kaly 6i+sfFHjE55j8+Y5z4fr7rjvwUEErLMA8ZZtC8vR6ui8P6QjM8V/lJUmba+Ttg== 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 4ZT6x42TXVz18Fx; Thu, 03 Apr 2025 16:43:04 +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 533Gh4KK022748; Thu, 3 Apr 2025 16:43:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 533Gh4Zq022746; Thu, 3 Apr 2025 16:43:04 GMT (envelope-from git) Date: Thu, 3 Apr 2025 16:43:04 GMT Message-Id: <202504031643.533Gh4Zq022746@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 861b8faca9e3 - stable/13 - snmp_pf: fix pfInterfacesIfRefsState 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 861b8faca9e3644cc88e391e852bf034e5cfc298 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=861b8faca9e3644cc88e391e852bf034e5cfc298 commit 861b8faca9e3644cc88e391e852bf034e5cfc298 Author: Kristof Provost AuthorDate: 2025-03-19 06:08:55 +0000 Commit: Kristof Provost CommitDate: 2025-04-03 05:57:30 +0000 snmp_pf: fix pfInterfacesIfRefsState pfInterfacesIfRefsState was described as 'Null', which upset bsnmpwalk's attempt to resolve OIDs to symbolic names: > bsnmpwalk: Error adding leaf pfInterfacesIfRefsState to list This was done back in d6d3f01e0a339, because we don't return this value any more. Return it to 'Unsigned32', which fixes things, even if we still don't actually return this value. While here update the ORGANIZATION to reflect current ownership. Reviewed by: philip MFC after: 2 weeks Event: Tokyo Hackathon 202503 Differential Revision: https://reviews.freebsd.org/D49413 (cherry picked from commit 712309a64512c7e4ebf0e10de8a5c59d5a185ae8) --- usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt | 14 ++++++-------- usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt index 13a4a646a669..8127eb92601f 100644 --- a/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt +++ b/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt @@ -21,19 +21,17 @@ IMPORTS FROM BEGEMOT-MIB; begemotPf MODULE-IDENTITY - LAST-UPDATED "201003180000Z" - ORGANIZATION "NixSys BVBA" + LAST-UPDATED "202503190000Z" + ORGANIZATION "Alternative Enterprises (HK) Limited" CONTACT-INFO " Philip Paeps - Postal: NixSys BVBA - Louizastraat 14 - BE-2800 Mechelen - Belgium - E-Mail: philip@FreeBSD.org" DESCRIPTION "The Begemot MIB for the pf packet filter." + REVISION "202503190000Z" + DESCRIPTION + "Reverted pfInterfacesIfRefsState to Unsigned32" REVISION "201003180000Z" DESCRIPTION "Modified pfTablesAddrEntry to support IPv6 @@ -583,7 +581,7 @@ PfInterfacesIfEntry ::= SEQUENCE { pfInterfacesIfDescr OCTET STRING, pfInterfacesIfType INTEGER, pfInterfacesIfTZero TimeTicks, - pfInterfacesIfRefsState Null, + pfInterfacesIfRefsState Unsigned32, pfInterfacesIfRefsRule Unsigned32, pfInterfacesIf4BytesInPass Counter64, pfInterfacesIf4BytesInBlock Counter64, diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def b/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def index dcdf676aa752..7a517a876fab 100644 --- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def +++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def @@ -107,7 +107,7 @@ (2 pfInterfacesIfDescr OCTETSTRING GET) (3 pfInterfacesIfType ENUM ( 0 group 1 instance 2 detached ) GET) (4 pfInterfacesIfTZero TIMETICKS GET) - (5 pfInterfacesIfRefsState NULL GET) + (5 pfInterfacesIfRefsState UNSIGNED32 GET) (6 pfInterfacesIfRefsRule UNSIGNED32 GET) (7 pfInterfacesIf4BytesInPass COUNTER64 GET) (8 pfInterfacesIf4BytesInBlock COUNTER64 GET)