From nobody Fri Oct 20 08:23:52 2023 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 4SBd085t60z4xVff; Fri, 20 Oct 2023 08:23:52 +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 4SBd085CR0z4D92; Fri, 20 Oct 2023 08:23:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697790232; 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=X+yo4z8TyPreV0AY+HtIDfL0OFY4c3qHWF3XdzcQNBs=; b=FtJSnSOCUZr/6qy+HylNwc9E/P2yo+nqSatP/fmiBwzeWYTVUfyE13h21rtHv/HtMeg5Mx ueWhMD8N4X18DxL0cF/xAalQGVjmwSKSCOumifACbXLLA2zKldnQn/dT+P/zXty2ZL5s1o Kk57DG3GS0VBj68+XP8n9nxF5f8RUsBa7l/hU1tWZSzRBhvS4I8Wil5AlonaQ2HYmuGHSB +3Tl9wNcRfEEUM5wzCEElIDr2Ye4o9KFnV5uX24q7wgISvRnAH6NY6Z92VdDRiclho9KI4 OYZ7JU2kj7rh8poMz0InfqXMYehZxoPIlLOSeR5xLdvzla8UxDijqxtsKAkaYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697790232; a=rsa-sha256; cv=none; b=WcqHSrhnKT8+g+fcKQH9zfDAig0hxSW+AMYdgZoZQYgx1v5/Pz25Je2KctlxWGdDXC6uod ryDjfjFzYyvOVElOh+229EAYra+8NFn7VSKW3LVRoYroRMFcJ1uw2qWb4EcGYItoiTmYrr Fuxa9Pmgvq57ncW4wruG5wK3cGo7U24G8dm1uEZ3QL6MCDwlF3cSgXb/sweY/9nwJLz78X qEjWE+wy/4CitdrxMW0ncXwZ7mWPDALuPJRYaxsoZdJ7+GylXrLwcx4PjlDxMrTK7NfLxJ BJDLKtszy63Y/1MBz8DXDqNufJ5nbms5GQhbFKL/byA7CG7WS8rYwfjIPaPW1g== 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=1697790232; 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=X+yo4z8TyPreV0AY+HtIDfL0OFY4c3qHWF3XdzcQNBs=; b=yj17uxsyGzLE20C7qePfzwC41ngpraWkYpFduYxzcqoYTCyeGq5QO/Cm0TX6OST/f4msJI J691yAX+RwPNI3Yp8ZVz/yThZ09D5L5DFHvvtuub6L1tyZiA2BmRY4HOw1QxyrXG3QWsVo rwrbObakBNc4O7UOy1e64lezXDsspb72uOWf2zTQoqJpuW36BA5N0ZG7kqcKhi+aqZkygZ 2jcIdz0Nbt/btIcOqcbX4kCZvyEqMPlL7ZYHfaXaLY3xs9cIutJ3kCRHJycKlw+9iylTkI XExqdO3IemlNARNEv5XiqsJUPCXm9VnibZGInfHDjEHSiOQV/BBB9ZlqV7EoWg== 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 4SBd084GWSz9v6; Fri, 20 Oct 2023 08:23:52 +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 39K8NqbT072905; Fri, 20 Oct 2023 08:23:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39K8NqoJ072902; Fri, 20 Oct 2023 08:23:52 GMT (envelope-from git) Date: Fri, 20 Oct 2023 08:23:52 GMT Message-Id: <202310200823.39K8NqoJ072902@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 6134250f777b - stable/14 - pfsync: Provide documentation regarding message version 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 6134250f777bb4c32813eb056d4c0775f5f43986 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=6134250f777bb4c32813eb056d4c0775f5f43986 commit 6134250f777bb4c32813eb056d4c0775f5f43986 Author: Kajetan Staszkiewicz AuthorDate: 2023-10-17 04:38:47 +0000 Commit: Kristof Provost CommitDate: 2023-10-20 08:23:41 +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 (cherry picked from commit 18be782c4e5fcbe4d37a951a6c77c13b3c11b8be) --- 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