From nobody Sat Jan 24 09:18:05 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 4dyq312qkCz6PV85 for ; Sat, 24 Jan 2026 09:18: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dyq311ymMz45dJ for ; Sat, 24 Jan 2026 09:18:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769246285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+agXfWxVf438z6H6ItxEvBn+zMH+UHLo4+yuF6gJHQY=; b=VX/cjEvSpP96mDDKXCQGtMo9x4jfssyqMGm5G95Qcr7l5DRv6CMe76Z/QcnPQz6AgHytZV Ucyxz4ZPNAFqF73hSoHIqNjCy6iHmBz4oPX/T11bazkJ2WyBKTRq9Ga95nEnJA1DGr7V3w blgrCURhgjD8laUZQC9VMni1c1js6rn1IxnMIDp1A8peGeYexrjfFDassrizDRBfjsZ3xm rmeSDk39sT68mP6GuaVMzkb4txC0HizGJTaACjVIiSqPvqghKVM87nR5J/mvHhIPhEfy85 f+cUJa5bMCDtoo/9F8/rvt7pi+Fxfs5+HZoXsN7jIO14PFtX1QixtBvkJxovUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769246285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+agXfWxVf438z6H6ItxEvBn+zMH+UHLo4+yuF6gJHQY=; b=jWZrm+SIEEjDUR4ZGzCnINBSOJbpsb3g7RrkrxV11JTfcZVzEKcH7Xvq7addFtzyxVbV8v F7U7sq216Uw1AUr1m3rTW7L7LM8gMRDfM4b6EYLgHUApWhXbJiMW5hukrFCAKkd8AtaOB9 7E6+aeWfe7af7b7woehxTvffu+Kgud1/0PzB5CZY7JPf7cC3DAwje1I2RpfLBQhdwrfQqk YVwQmZOJL8S61aNMW7D0wPHtBKcMn8H1+2EBv3bxT8NhyjzXydXRPYy1G4ohGxASNsguV3 0aOc219dEgnapzqo6IBcHXujPLy+uv88OyZuxHt4K634nfkhXoxS3sOZH7Kyaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769246285; a=rsa-sha256; cv=none; b=xyuxsLyl6OX3BzCAy1tZFIMqPQIqxbODxQ+7rpd/sh4If5UybdZu7N5WUFCufRLKSCy10X +ZKpJIKeWadK3AxNxuuSVqsFZ0rxfaO0xN+Ak9FvGh4xA28i4icP1DtHADRmEqjsZpiB2k MSY5/wQCWwunkLcBK2suHf4+1ulpcccAxckfwZD3EEi/zkwtc43UB8kDZj3/npiC1JuxLZ HmLYftiFOXXpQwJgJWkSgu9XQB4QrRY23D0zttGnTrvdj/vTffBpYbNa7dUltIkks1MpUf GSyvUBaBitohCEGjYtw1m8ZNmCmE0haFEJmGTTZZ8OUJrcpnnKpTT47KhXHcqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dyq311YTQzysN for ; Sat, 24 Jan 2026 09:18:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2669a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 09:18:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Marek Zarychta From: Pouria Mousavizadeh Tehrani Subject: git: f51e0f5e69cf - stable/15 - ng_netflow v9: fix template re-announcement using packet count 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f51e0f5e69cf9e3806d64b3ce85d70aca63d922b Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 09:18:05 +0000 Message-Id: <69748e4d.2669a.387333ea@gitrepo.freebsd.org> The branch stable/15 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=f51e0f5e69cf9e3806d64b3ce85d70aca63d922b commit f51e0f5e69cf9e3806d64b3ce85d70aca63d922b Author: Marek Zarychta AuthorDate: 2026-01-16 10:12:11 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-01-24 09:09:02 +0000 ng_netflow v9: fix template re-announcement using packet count Increment fe->sent_packets after export9_send(). Previously, NetFlow v9 templates were only re-announced based on time, ignoring the packet count parameter (`templ_packets`). PR: 270083 Reviewed by: glebius pouria Approved by: glebius (mentor) MFC after: 1 week Sponsored by: Subcarpathian BSD User Group (cherry picked from commit d836dae9f0d888d441234ea11e3cd91614c86aa2) --- sys/netgraph/netflow/netflow_v9.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netgraph/netflow/netflow_v9.c b/sys/netgraph/netflow/netflow_v9.c index b6e9fca98408..e6b63a8aa36b 100644 --- a/sys/netgraph/netflow/netflow_v9.c +++ b/sys/netgraph/netflow/netflow_v9.c @@ -227,6 +227,7 @@ export9_send(priv_p priv, fib_export_p fe, item_p item, struct netflow_v9_packet else NG_FREE_ITEM(item); + fe->sent_packets++; free(t, M_NETFLOW_GENERAL); return (error);