From nobody Thu Mar 20 04:31:04 2025 X-Original-To: dev-commits-src-main@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 4ZJCLx6YHsz5rGCk; Thu, 20 Mar 2025 04:31:05 +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 4ZJCLw6T9Gz41hJ; Thu, 20 Mar 2025 04:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742445064; 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=nji1qr+BURCs7wVeRlJh+F4uDrAX942U9wIwn25DCis=; b=b+Uys80AX/C+N/yAXf3li7JqGwjp/04QalsBvSKdW5HUcy865VpZ5kbxg1oFf0pJBr4aYK wILtGSmws5gphOYTBNbI2HwNUHEgZZozPnJABZPzaD3oMRSKvhFGrOTpfscYMVutubcNOT 2LnU0vkwF5J1sN5wT5zhiqvOobMsAbOaYCBdKT2WZnMjMSJTQbUirVNXykHrLnM5Qe+aHc oz69qcB0frggeQfjWiul8DF+kpegJYVd0Sa9cKFAMvu2LPHt9Wyv1/744eN6AOY85OqYAc +Lw3Xf9j+M+W3F8qeCfvKyeptBdODXDo6kKqcf2Nj9sNcsLevJuTaetYfBFuLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742445065; a=rsa-sha256; cv=none; b=obaE3S8jkr9bNmlmpszUKGkvR5wY4z4V0SGcPfbIsjWso4S3pCsZJHT5PjjPCbrEKM39Ma sn+C+u6DvxzvhwFHCG9AjUupcq4wt5v78w+j88WtDVOe0aaRQ0WQdJOxD3t3mkwlp1aleg D9I2mVLT/VHEX403T3M/tMP1gooHycJ8HToY2+bNvHdk2lOmpYqDn6y5r+oOPDn/zxgBO4 t3D83280XtJWTkUOXzMDGH3T7tGcR8tk2+a7OnPjVwLfQzBUVI0/UCVI56pFt1/5+Jv8Vl oj53J4BZ8bdXBVutYL4yCKOQnh9qDeLt4P6R6XdwaOuaLsgdY9DRw9kz3yZjTw== 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=1742445065; 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=nji1qr+BURCs7wVeRlJh+F4uDrAX942U9wIwn25DCis=; b=XDYTdRlgniroO704euRiY/dzU1L5DKvbgycpdJ/51PLoDaKNngoFXtkRCDCc9G3OUC72/J bsnLSP6UPVr04hioRVwj9XBHaLzthgDgix8kE9Fd2OioDNM55B5zRBhfD5+5fipXaMW0up 44PYueMB8Hb8NJnRnaFCINwyPXVAwhZQcyoDR8vuHzYWRIv6LiWJPFaaXHOGCBHqVF16vo eawVwVf3GeNEvBX8tWo8HElksz6oVZXI0xLoTg8QjKkguRnqoXaYF8gM5MsFunx6j54RqN yKmyrzix3rewPg/at1XN+WAl+9G9X2XB4z4sFIOpX6UmYbAyQ8Rp/MA3KRNLLg== 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 4ZJCLw4qJdzr4s; Thu, 20 Mar 2025 04:31: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 52K4V4nH030908; Thu, 20 Mar 2025 04:31:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K4V4KK030905; Thu, 20 Mar 2025 04:31:04 GMT (envelope-from git) Date: Thu, 20 Mar 2025 04:31:04 GMT Message-Id: <202503200431.52K4V4KK030905@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: 712309a64512 - main - snmp_pf: fix pfInterfacesIfRefsState List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 712309a64512c7e4ebf0e10de8a5c59d5a185ae8 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=712309a64512c7e4ebf0e10de8a5c59d5a185ae8 commit 712309a64512c7e4ebf0e10de8a5c59d5a185ae8 Author: Kristof Provost AuthorDate: 2025-03-19 06:08:55 +0000 Commit: Kristof Provost CommitDate: 2025-03-20 04:29:53 +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 --- 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)