From nobody Tue Oct 17 06:40:12 2023 X-Original-To: dev-commits-src-main@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 4S8kqx1JWZz4x8cm; Tue, 17 Oct 2023 06:40:13 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8kqw6mKgz4LWn; Tue, 17 Oct 2023 06:40:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697524813; 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=TaMicHHhUt9q3vkJsny2Odxm55yBZz1qDqR3/T9Pzb4=; b=cMq4LMEaEfkhwKMjnzDBZMG8lyFNOQQXCYurOEPnpuiWVXzcRKUoj4EXG5iiEYzInQgym3 b9ZJ5Q7pN8qLhRe2UUY6seR1pE4fwUhisCN1e8nSuZvWvR3h32c6cOOxDkQhWwDPUb3/se mzmAd34t0DQxU6mdGdgZzBcH9a9KwJwtTW/51K2w2V3wGgnmzmeCTCK9HbTWLfbXvERTqp iTEpEh1BBzmMjUWyPGzq71HmY8+fl4ZFCfA/I1ocxL7aMAewGCF6bGMON/7P5Rv4JTH9l7 nv2bq1ExwrIbp+oBSfeAiJITRDzL9J0y3SMhZN1MZNoOi60kK976sKEvSPVAcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697524812; a=rsa-sha256; cv=none; b=M7XKUCWI2EYRXwJQEIUUhnBTBGEmqf0/N9hL5dFle9XPUE4Iq9FipJaYXOc2vNDtWZ3Z8M 2/0ZcJ6I83/TbmFnY2fui575aujHqFc8hBWMxWiWWXKL4t1vcUqlbef0sbSudhx2d3S7FU bCSt1GpD/aqK4s1CGm/IiaIkHJdsKfmHQ9pTCmbJGHGKA7C3XlauOguQfmImheI50TP1OT XMRf+oKRYe+zrbZmWJx7VW+IJkqbQ+TCA6wAmoOvTUK78Bmb6a7qGGmNzFFHC7FMI8kLB3 vchnf29kWlbiOtfC5rMAF6EoMVJeFlRyk5KM/uOyEqwjei51bjHDu/CzbeC8yw== 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=1697524812; 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=TaMicHHhUt9q3vkJsny2Odxm55yBZz1qDqR3/T9Pzb4=; b=ylW5vR8Pcc1r3WBQukBXnwaCBZhirly/dXzEvAVu8aFvjYMkRXDTKuPtz8qW+bfX6ODOB4 hcyjro1m7TMD1+cc5o3aUiINUs9K/4i0XL0xiVQGl39Gakh0Cttsq7P4+jfAeJN486ye0n WfEacBCVJJhuZku5rpuzxnKrgJPSEYnqYF1/IUJDE8jyLniwSRu9Z2iBMn6S1tmvcVP9/v tPrAQ+DP+NI6MxtDZ4w3gvL0kNLCJPCyOOKqriQh7ZRmP7qxnfeSg6JljLPtsJfMPGe9FO 3G+dWFlOooIfNdwTq552pRzhHdULgv/Vqn2uZ4Xl+hgXFWImnnHLnj9Bt5uv9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8kqw5r9Rz1CFT; Tue, 17 Oct 2023 06:40:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39H6eCNE001160; Tue, 17 Oct 2023 06:40:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39H6eCcQ001148; Tue, 17 Oct 2023 06:40:12 GMT (envelope-from git) Date: Tue, 17 Oct 2023 06:40:12 GMT Message-Id: <202310170640.39H6eCcQ001148@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 18be782c4e5f - main - pfsync: Provide documentation regarding message version List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org 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/main X-Git-Reftype: branch X-Git-Commit: 18be782c4e5fcbe4d37a951a6c77c13b3c11b8be Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=18be782c4e5fcbe4d37a951a6c77c13b3c11b8be commit 18be782c4e5fcbe4d37a951a6c77c13b3c11b8be Author: Kajetan Staszkiewicz AuthorDate: 2023-10-17 04:38:47 +0000 Commit: Kristof Provost CommitDate: 2023-10-17 04:38:47 +0000 pfsync: Provide documentation regarding message version Reviewed by: kp MFC after: 3 days Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D42235 --- sbin/ifconfig/ifconfig.8 | 7 ++++++- share/man/man4/pfsync.4 | 28 +++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index 1dc4c2e1b56d..bd6cbd05210e 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -27,7 +27,7 @@ .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 .\" -.Dd June 20, 2023 +.Dd October 17, 2023 .Dt IFCONFIG 8 .Os .Sh NAME @@ -2886,6 +2886,11 @@ acknowledged that the associated state has been inserted. .It Fl defer Do not defer the first packet in a state. This is the default. +.It Fl version Ar n +Configure message format for compatibility with older versions of FreeBSD. +Refer to +.Xr pfsync 4 +for details. .El .Ss VLAN Parameters The following parameters are specific to diff --git a/share/man/man4/pfsync.4 b/share/man/man4/pfsync.4 index 5a1d576824e6..4decb50feb7b 100644 --- a/share/man/man4/pfsync.4 +++ b/share/man/man4/pfsync.4 @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd December 6, 2018 +.Dd October 17, 2023 .Dt PFSYNC 4 .Os .Sh NAME @@ -113,6 +113,32 @@ dedicated to pfsync messages such as a crossover cable between two firewalls, or specify a peer address and protect the traffic with .Xr ipsec 4 . .Pp +When new features are introduced to +.Xr pf 4 +the format of messages used by +.Nm +might change. +.Nm +will by default use the latest format. +If synchronization with a peer running an older version of FreeBSD is needed the +.Ar version +parameter can be used. +E.g.: +.Bd -literal -offset indent +# ifconfig pfsync0 version 1301 +.Ed +.Pp +.Bd +Currently the following versions are supported: +.Bl -tag -width indent +.It Cm 1301 +FreeBSD releases 13.2 and older. +Compatibility with FreeBSD 13.1 has been verified. +.It Cm 1400 +FreeBSD release 14.0. +.El +.Ed +.Pp .Nm has the following .Xr sysctl 8