From nobody Tue May 26 09:06:54 2026 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 4gPn1q0b71z6fffm for ; Tue, 26 May 2026 09:06:55 +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 4gPn1q00Xdz3Fks for ; Tue, 26 May 2026 09:06:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779786415; 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=YP9vnSXCXNpxrdEZbHr3fu++QkEkot/6IiR1ddMrG0E=; b=CnBHFlzB9PSskw0H54b03p5mXEmmTEvV4MJO5XfHAYn8Bdg9GDOx6nPAZ8me1KoteVmm7r I6ZV6TrSZLec/bq1wfGYOc+yxkHOnJ19StQnWe66tF66Hk/ZXhv9lqx5jgq7lE5hYMIk+W fAA6WjeQ/zXz9IfK0O3DGgA+RFwySkF4xphYKMhRa8HVq9LRqP41ORO02pnc2mkDjO6mOG lotjsQgTDGnX3kyNvgJkGevNcyeEp8HnzpaqYJ0cdS1WwMo0JzgzHgwxI+Z7tUZW85ZPwV N0Tz0tk85CkHVBSG8tUDOC5ZeD5XC23aXP/+gluEzx1eDbZn/1I2jrN1vL0zKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779786415; a=rsa-sha256; cv=none; b=n5jE4sW7/2YzCi6vEB6JjVX2wEZ8811l8sxyQtrX7AnHsLy9jsJxOkBrMAD+/JAQIBAHLw iEK4kN5Eh7JIsF5c7JcIl8K3a9qUHgeHqFn7gRM6ifLrXzMGVi5Gr16gAgJ3W1EpTkZiaw U/VZDu9zK0x+TTH/IvMgnkJs+Df706KqtWyqpsvutZ/zQNWnG0NBI3FAhL2HWgkZa1U3pX dfJeIOnvJHixt3PuGc79QKXCYz7GAkdr2Oh11aH7bg4P5pZWZFE1x5sKs2UzUa+G6pNqTP wjyl+U2J1eWaAVJ3ASHwUj3DsAKzDLkARUqM2MHCcO3cphy1i9WOvB9FPW53bw== 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=1779786415; 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=YP9vnSXCXNpxrdEZbHr3fu++QkEkot/6IiR1ddMrG0E=; b=RLeGLhJ8qLVimuR2Af3FlCvtkpP4JkoI2N2sAJfHzW6J7bOZ3hDxhpcG23HJoUPJ7SsJSz TiVNjv8zbAwSqA7NyPjCBsk7pgAeJUuE5YItvht8uSoqkKMZh/cBCwPrnx5tMJehV9bH2D Wf83n59GCiHbNfQaF5qbfcfaq6ydZxZMQQRhT7nxnkMLF/vHIyaQCFZ8t0GL+PcRmLkBle y2Zi5UBcuPnYlN5E7j+2neYE9tpCfjFjRs5HZgzQZXHY3PYQyqGJmtV82mlpqUd6Chfzsn kNlLU8XQWq81168vB40nTfg+5V+/v4jwl8ozNrbZ3c/uQSOpwwwcrOKpCPqJFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gPn1p6M8Sz1KB2 for ; Tue, 26 May 2026 09:06:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26584 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 26 May 2026 09:06:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: fda33ae0a1ac - stable/15 - snmp_pf: fix refresh 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 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/15 X-Git-Reftype: branch X-Git-Commit: fda33ae0a1ac8fd070efd6a0da2c1beae9f3428a Auto-Submitted: auto-generated Date: Tue, 26 May 2026 09:06:54 +0000 Message-Id: <6a1562ae.26584.799e7852@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=fda33ae0a1ac8fd070efd6a0da2c1beae9f3428a commit fda33ae0a1ac8fd070efd6a0da2c1beae9f3428a Author: Kristof Provost AuthorDate: 2025-12-17 13:22:05 +0000 Commit: Kristof Provost CommitDate: 2026-05-26 09:03:06 +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 f0f9e0f0e149..12cb7bb71616 100644 --- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c +++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c @@ -673,7 +673,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); @@ -812,7 +812,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) { @@ -1035,7 +1035,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) { @@ -1322,9 +1322,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); @@ -1427,9 +1424,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); @@ -1595,9 +1589,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);