From owner-svn-src-all@freebsd.org Sat Jan 18 10:44:33 2020 Return-Path: Delivered-To: svn-src-all@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 BEFFE22FA95; Sat, 18 Jan 2020 10:44:33 +0000 (UTC) (envelope-from syrinx@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 480F1F4Syjz3LBc; Sat, 18 Jan 2020 10:44:33 +0000 (UTC) (envelope-from syrinx@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9488520BC8; Sat, 18 Jan 2020 10:44:33 +0000 (UTC) (envelope-from syrinx@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00IAiXdM095623; Sat, 18 Jan 2020 10:44:33 GMT (envelope-from syrinx@FreeBSD.org) Received: (from syrinx@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00IAiXJU095621; Sat, 18 Jan 2020 10:44:33 GMT (envelope-from syrinx@FreeBSD.org) Message-Id: <202001181044.00IAiXJU095621@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: syrinx set sender to syrinx@FreeBSD.org using -f From: Shteryana Shopova Date: Sat, 18 Jan 2020 10:44:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r356864 - stable/12/usr.sbin/bsnmpd/modules/snmp_pf X-SVN-Group: stable-12 X-SVN-Commit-Author: syrinx X-SVN-Commit-Paths: stable/12/usr.sbin/bsnmpd/modules/snmp_pf X-SVN-Commit-Revision: 356864 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jan 2020 10:44:33 -0000 Author: syrinx Date: Sat Jan 18 10:44:32 2020 New Revision: 356864 URL: https://svnweb.freebsd.org/changeset/base/356864 Log: MFC r349264: Unbreak snmp_pf(3) after the changes introduced in r338209 PR: 237011 Event: Vienna Hackathon 2019 Modified: stable/12/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c stable/12/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c ============================================================================== --- stable/12/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c Sat Jan 18 04:48:05 2020 (r356863) +++ stable/12/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c Sat Jan 18 10:44:32 2020 (r356864) @@ -907,7 +907,7 @@ pf_tbladdr(struct snmp_context __unused *ctx, struct s } int -pf_altq(struct snmp_context __unused *ctx, struct snmp_value *val, +pf_altq_num(struct snmp_context __unused *ctx, struct snmp_value *val, u_int sub, u_int __unused vindex, enum snmp_op op) { asn_subid_t which = val->var.subs[sub - 1]; Modified: stable/12/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def ============================================================================== --- stable/12/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def Sat Jan 18 04:48:05 2020 (r356863) +++ stable/12/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def Sat Jan 18 10:44:32 2020 (r356864) @@ -174,7 +174,7 @@ ) ) (10 pfAltq - (1 pfAltqQueueNumber INTEGER32 pf_altq GET) + (1 pfAltqQueueNumber INTEGER32 pf_altq_num GET) (2 pfAltqQueueTable (1 pfAltqQueueEntry : INTEGER32 pf_altqq (1 pfAltqQueueIndex INTEGER32)