From nobody Tue May 26 09:00:54 2026 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 4gPmtt3zRsz6ff5F for ; Tue, 26 May 2026 09:00:54 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gPmtt3LkZz3FBd for ; Tue, 26 May 2026 09:00:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779786054; 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=517NtHwkKXZTOerbDn1o9HsZD/wP55HRaqu1ATY8id0=; b=cfsB8ZbHNxAHj77Squ4vxAvnlcHllIxi0d143KxxnDWJPVpaE68JVzfS0IvM9QgCNG6fnB eGfqKOA/zutt+huU+LqJJcN+5BvQx5PNFfVCAWX6f2cMwmDRUT28txebI1OJQkoEfl+r+f 0GgtxunzCUPIxWDeJrwkd89fASkbzquHkTPtOOE9JpI2t5sZmsx+NbuWvGkP1l83JvKawl mGfBPvDNfP+HIAJLxfHGb7r6lRmd5mzCVxU5iaP35LnMUDrFfL1Z3zor+h9ha07DmoVOoU KRP7gNqkysO7pIvJxF1mBXUqX/TX5sFhxyuo2d/OD1kQsILKu8jDqAExBuQfMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779786054; a=rsa-sha256; cv=none; b=km/548hDGnSBpstS58vlAgZLigg3bzf0ROOcFQC1dV+/rLwYCerslrnmb1YsiLQUgw4dIQ hXnBAOYlRk/6eTg7XstZssfqtyOcQA9bSL3WHN2JmVSfjjS83mymU7IK/+LPwnlpVMyL+C waWqJBNa2gA2mEqkbEV04KiOZ26EAHGFbwssxWOXYjQeOP/ObnsYUYf8mzutSkZ5BJSwYm QQxMYoYRXvf6DDRwbEEFplJU9IqpcTWeJX+t9+gndJ8M7hPYqsbEJmmlP2pha5n1zfR3sr 4D+9c3umtla61oeOdXTHkwBvqT/63gfL15ru9GmaSfPrq4/JoHabq4H/C83/8A== 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=1779786054; 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=517NtHwkKXZTOerbDn1o9HsZD/wP55HRaqu1ATY8id0=; b=uLnhJk8zLTUPhZGtazVLYz0wcb1B3oIN4ZpAEmKVheU9oOAFnPogdvGKi9N+3JZQTkKGVP FXJZXtBFZQ0ogl7iwTkjETDcONhaM7CV0beDumeW9KRy/ZvRuVMweofzdXvKnRDNIsr6ey ZMzgOqXvJWY4KZ1Vb3E5YUFKBTKrHqerkZuHJ2IrXqcgfjWiuRt8UFRou77TyotLbWeAbI I/PXfck19etU+rB3hlrEuLogrSb2TxbMDWFY+9W7FNFMLO8nB30OuRKKrmpSy9q/uJYuUg MeUcVTXE9Hyr/wlpAZzTcfSLOX7dPJ59a7k8aoXaBlk2TKTYJL/GFqgWzfmeiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gPmtt2RNZz1KQ3 for ; Tue, 26 May 2026 09:00:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 248d7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 26 May 2026 09:00:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: e0d4064bcae3 - stable/14 - snmp_pf: fix refresh 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: e0d4064bcae396d06c08a24c9670c1e68afb03d3 Auto-Submitted: auto-generated Date: Tue, 26 May 2026 09:00:54 +0000 Message-Id: <6a156146.248d7.6907aac7@gitrepo.freebsd.org> The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e0d4064bcae396d06c08a24c9670c1e68afb03d3 commit e0d4064bcae396d06c08a24c9670c1e68afb03d3 Author: Kristof Provost AuthorDate: 2025-12-17 13:22:05 +0000 Commit: Kristof Provost CommitDate: 2026-05-26 08:53:20 +0000 snmp_pf: fix refresh Some refresh functions had two layers of 'do we need to refresh now?' checks, leading to inconsistent refreshes. Consolidate them. PR: 291725 Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit a862e4b5a27c356e2584ee74fd9e211c18b1b125) --- usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c index a5786007d3f4..c6f288d0a608 100644 --- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c +++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c @@ -675,7 +675,7 @@ pf_tables(struct snmp_context __unused *ctx, struct snmp_value *val, return (SNMP_ERR_NOT_WRITEABLE); if (op == SNMP_OP_GET) { - if ((time(NULL) - pft_table_age) > PFT_TABLE_MAXAGE) + if (! started || (time(NULL) - pft_table_age) > PFT_TABLE_MAXAGE) if (pft_refresh() == -1) return (SNMP_ERR_GENERR); @@ -814,7 +814,7 @@ pf_tbladdr(struct snmp_context __unused *ctx, struct snmp_value __unused *val, asn_subid_t which = val->var.subs[sub - 1]; struct pfa_entry *e = NULL; - if ((time(NULL) - pfa_table_age) > PFA_TABLE_MAXAGE) + if (! started || (time(NULL) - pfa_table_age) > PFA_TABLE_MAXAGE) pfa_refresh(); switch (op) { @@ -1037,7 +1037,7 @@ pf_lbltable(struct snmp_context __unused *ctx, struct snmp_value *val, asn_subid_t which = val->var.subs[sub - 1]; struct pfl_entry *e = NULL; - if ((time(NULL) - pfl_table_age) > PFL_TABLE_MAXAGE) + if (! started || (time(NULL) - pfl_table_age) > PFL_TABLE_MAXAGE) pfl_refresh(); switch (op) { @@ -1307,9 +1307,6 @@ pft_refresh(void) struct pft_entry *e; int i, numtbls = 1; - if (started && this_tick <= pf_tick) - return (0); - while (!TAILQ_EMPTY(&pft_table)) { e = TAILQ_FIRST(&pft_table); TAILQ_REMOVE(&pft_table, e, link); @@ -1441,9 +1438,6 @@ pfa_refresh(void) struct pfa_entry *e; int i, numtbls = 1, cidx, naddrs; - if (started && this_tick <= pf_tick) - return (0); - while (!TAILQ_EMPTY(&pfa_table)) { e = TAILQ_FIRST(&pfa_table); TAILQ_REMOVE(&pfa_table, e, link); @@ -1612,9 +1606,6 @@ pfl_refresh(void) { struct pfl_entry *e; - if (started && this_tick <= pf_tick) - return (0); - while (!TAILQ_EMPTY(&pfl_table)) { e = TAILQ_FIRST(&pfl_table); TAILQ_REMOVE(&pfl_table, e, link);