From nobody Thu Apr 03 16:42:52 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 4ZT6ws0ml6z5s8NJ; Thu, 03 Apr 2025 16:42:53 +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 4ZT6wr6bFtz4HbG; Thu, 03 Apr 2025 16:42:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743698572; 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=E8jR30DhfkIXBY0NK14td3HeYVomR+ByzAARPvRMt4Y=; b=fxPDwo83WMwh+rW1JkJ+Hxr6OKGIPhw2wiozQRdgN9+BIgQ9IQYOqSw6plyUZ3ABAFViap qUSevHOzIpEZTXcSpBOSzqBx39B/pMiK1qDSZ9f5bv2Gs3mkrocfy7d9AJgXk79XgMjGHe ENkcK5pfBvKOzoMGgBGQ0NQ6UYiyu2P7ysI0N8ae2hB8J4oNpC58kM+yNA8zeWb0w3v5I3 gZP999kgh9gDYWAt+CTnZENwgpbnMt5O3ov4JRKGm7buLbyGMjzlzO3y3C1Psy7n5mOwoc q4eYG4cSYLgscXAt+v4pZWst/02stzUD9kq6Tveq2nSW/e/0IIhCdhob1i0KNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743698572; a=rsa-sha256; cv=none; b=Bnx0tBf5WHvsXPVdDF9DCZfRjlW6s2+zyl1xl9dafblTtI9oSa3pvFmkRU5eQLqiqDKrjW e/yQuwSQrp+PRSpZ5b/rfapgpAB8dSap6MW8Ur6c8o+Hk7qgaHUqeuSPDcm2Wxq/Q2yJho whuLaxsFEookZyRS21iT/XBdvn+kJaDGxCFuZUARVaoGNAWsdz0VVT4S7Tf8LHLsjnQ5z3 vIqekU1fcC71ZUvn3LSsEOlHW2l62h/KM8BTsx1DyjCSTkhxNojNReSH7Co+hYR58ss14h qnNrWe7KDU9FbAjRrZOlipTfoszZc80v0auKru1Jk28kfrI4IlX2ovlnXugTzw== 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=1743698572; 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=E8jR30DhfkIXBY0NK14td3HeYVomR+ByzAARPvRMt4Y=; b=XFs6ILFUykd99/g3dqZ5/DjN/UxEaU0ZF1arhD99VxmF5a9aGy6L8WiT9XJbNHwzlsIpXL g1MoG3zPbLMsiY9sY4co+ZSiM0r/STw/T2o+lqqHSeLq0qdtpeDwF3bP+L44Y2890DWPn2 uzIXH4f8Z4tO1tec0slSg/01pAQHjlqkBdBZi8s1werMZ2zoSQhVU1SvTePfAg3b6wrkop KlpCbM/knzYwLSP60dGNXX0XciNY3xckfQVW+erRg2+F+Nqt/lqMMmhxtPPZILPVIk2W1I m22tbSFXlUpHhyqftVfkBbCYbKEav5PkpMvVsj92aHF0uCYonZPWd7oK5W8wTw== 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 4ZT6wr6025z18TW; Thu, 03 Apr 2025 16:42:52 +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 533GgqQC022469; Thu, 3 Apr 2025 16:42:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 533GgqHL022466; Thu, 3 Apr 2025 16:42:52 GMT (envelope-from git) Date: Thu, 3 Apr 2025 16:42:52 GMT Message-Id: <202504031642.533GgqHL022466@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: c844e848458f - stable/14 - snmp_pf: fix pfInterfacesIfRefsState 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/stable/14 X-Git-Reftype: branch X-Git-Commit: c844e848458f50d77e9fa39b77d6f6e30c39f593 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c844e848458f50d77e9fa39b77d6f6e30c39f593 commit c844e848458f50d77e9fa39b77d6f6e30c39f593 Author: Kristof Provost AuthorDate: 2025-03-19 06:08:55 +0000 Commit: Kristof Provost CommitDate: 2025-04-03 16:41:25 +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)