From nobody Fri Jan 2 19:18:49 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 4djYQK590jz6M6dq for ; Fri, 02 Jan 2026 19:18:49 +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 4djYQK4Wpxz3XDv for ; Fri, 02 Jan 2026 19:18:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767381529; 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=+uCBPTIscPsCbD4cbvxcqT0/yukjv1xW18h/l4QojRc=; b=UlX2+x8ugPkefXRo11rcTIktwJV01F+0V5FWLCOfA6I1+LbfK5qwfjwk1WiUfEMeYfLKdH oA9uQuGjko2txP2ZDFxl59lwpOOIe9v31ZNWmxbdpGWxEw5QPi0ToEfh6cKpTAsdTuRr+f cr7fBEQ01TlqclFoW4jPhNSnaWZVtYg+JTjapAaRVcsgW0LC5eg7v0zi7f81j8JDHkyOIy 1xzXcgGxQEmqATLCOvQ1MxcjYiKRMJmmvPa6BcbbMeVrr/sGFa9m4lUCgnOjLcKqrsxf6c +wCJCL9v5jNqKASa32PTzhXggwBJ+NVHInkELnJIMDFtb9wesRwVTAMc7As1jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767381529; 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=+uCBPTIscPsCbD4cbvxcqT0/yukjv1xW18h/l4QojRc=; b=pSV5C31Eegguof9VrRchv4KCBi89B4Pj4Yz0sHD/PZDCqrNUGgtPMQpNCm1HK2UPOXB6sB P1R3kz4QLqIK+LTRWr+FWNQ0CO4AKoxj3uYfPTcEA2KQICucuMza2eDLtLxK+yYLiOTSgh zuCkAoVbGkUyh0+nL5fkAKXtEKxETLA5Ah1gNmKHC2ZVu6J90lmyjgQfJhvPOcG0At9Kr1 +FGXZXfnaPnPVx2KBtOhRd3JbVKS74iuRr75H+ZbK85G/ZCje4wcOKWgviLIDEoSkqrk2u oNycKDPFfU/ewrdKAX9oDgLprGMG50yFO8JizFfpIuUWQcZFRh6TPQNSsrrXOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767381529; a=rsa-sha256; cv=none; b=MujVOt2xfO7C+BV5qI1M7GaPm8PX78aU+3k5bzW0v1SnEOH2qnDwLUCVvH/YIZtt1sLjDY 59F1qZhWDaN4SCJ831+C2hJ9V+6ih2lQ4BloYBp64F5cxvMwu4X7o2G5bSi1hTuO4y3pTr gisO3FhYF4+QMaNhfEkGsvst+Zg7KFFT5vd9kN8HcEr2JZj6Fd3OfUenUe44elNYQ+pPqd F9lpDmLGzFgQ1spluqXXCjG+2DZo9xdO4fO5iFg4C/8x/zXE4zJXaejOx60NmAFsbqnU/2 +DxIF5FdrZceGmQc2PJdbTJIzjcgDh8QSz1R9yWhfJmAy6CSLFjU9ZWZmF+jgQ== 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 4djYQK45GTzWGq for ; Fri, 02 Jan 2026 19:18:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3aac5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 19:18:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 1d0d0a8b4af5 - stable/15 - ipfw.8: fix documentation bug for setmark 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1d0d0a8b4af525c3940647b10df45ec8efa6afb6 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 19:18:49 +0000 Message-Id: <69581a19.3aac5.70db39a0@gitrepo.freebsd.org> The branch stable/15 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=1d0d0a8b4af525c3940647b10df45ec8efa6afb6 commit 1d0d0a8b4af525c3940647b10df45ec8efa6afb6 Author: Eugene Grosbein AuthorDate: 2025-12-28 17:05:22 +0000 Commit: Eugene Grosbein CommitDate: 2026-01-02 19:18:04 +0000 ipfw.8: fix documentation bug for setmark A mark set with "setmark" keyword is intended to be "sticky" and documented as such but in fact it is not yet, as current implementation lacks "sticky" feature and its implementation will be not MFC'd, most probably. Correct the manual page until the implementation improved. Discussed with: Boris Lytochkin (author) (cherry picked from commit a7b8a5d37bcb0009297962137bfb6c6570e5af12) (cherry picked from commit 9fdf49e8a501047b61a615ab1b4b133159ad76e1) --- sbin/ipfw/ipfw.8 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8 index 249bd195b4de..c1df8399c333 100644 --- a/sbin/ipfw/ipfw.8 +++ b/sbin/ipfw/ipfw.8 @@ -841,8 +841,12 @@ When a packet matches a rule with the .Cm setmark keyword, a 32-bit numeric mark is assigned to the packet. The mark is an extension to the tags. -As tags, mark is "sticky" so the value is kept the same within the kernel and -is lost when the packet leaves the kernel. +The mark is preserved for a packet within a single ipfw ruleset traversal +and is lost when the packet is checked against the active ruleset +next time (see +.Sx PACKET FLOW +section) or leaves ipfw context (e.g. accepted, +diverted, bridged or routed). Unlike tags, mark can be matched as a lookup table key or compared with bitwise mask applied against another value. Each packet can have only one mark, so