From nobody Wed May 08 11:20:00 2024 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 4VZCNd2XDkz5Kt0k; Wed, 08 May 2024 11:20:01 +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 4VZCNd157hz49Rv; Wed, 8 May 2024 11:20:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715167201; 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=iWR5LOCYm6K/crt+Tbpe1Q82bnfLCUE906fcHYfJRZA=; b=ygxUrNX9rB1+TxmPFdML14gmhxELzuNJYtSUvX1q0Mgq+mfVn+MkjWy2zHR4jFp318XWDW SGdADN1c5l3CtsI84aVkath82nSQjDjQYjIuoALHPfg/otpNapwRdEl1hV+jUSNBgCyU58 HsQykdJifa5kJc8Zfst/rc/3zEwltBpwzJYURbsDJqwuOkCtQryHgSgsY3EbloOwnHXcvl quFAboX3yJ9WFiVaW5ywuUDGqzi/5ZJVyR0S67DDCZQBVI/b+ZXQimp8RUmGYKQ2EK0XMZ wNyjXbdtAyCgXY+Tm9s2pw7OaEbAxDgL8yierkVYqtWc0+igVST/1F6TjxgQbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715167201; a=rsa-sha256; cv=none; b=Xg558qmyTNzeUpBOwgSkFn34PWXmAcCzyHvuSYGqSluydJlHxEHyFsegIndkrTEwvTvPvI V92cMFnLpQfeNrU5DhKgp5u4BQSFxX3Jaq73vlM5T4x0ZGN964r6lwSGBT7cpGqeLT/KS4 PthTc7bEC0ye8uJl6QJ7kdA/vnMan17MuLnb51fDTmTOtvv3WcO21P6QWpxauswIVuAd33 dOapWrs9TaKGZ4HsULS5Zzj9ujv3F+M/6JGteSTVakEf097f4hP3+TqhlkMZLeJAne/1Dl TTLbMM8HZIRdArDeZ27Q4Ftr0XZzBV7M9m4/zx1qCQd9cdSGwcIQLFp5SoE/JA== 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=1715167201; 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=iWR5LOCYm6K/crt+Tbpe1Q82bnfLCUE906fcHYfJRZA=; b=x4HuGZGmqnT36X51YAAVpvJOrMeniR6HPBm3DMFpY288BhrLucycnPIz8Rjw3xkQdYQl/u AOsurqEqxp5KhRzV0K+5JlYGNmhSJRkykZorLua0jWM2kBt49G6lb0dsraUAz0NNn0KlCY u4q6dKIi5W611+kdwz5KnQwpPug51dxmKsXZ6E0LgLbMQP0jNtC0wi0Uz0Tqy0BMJoh0vT OEfXBInmmwSgv2M5KHX2e+7JUhwGv99SkhzIUZy5sMXYTJau4QyzB0z5C7+7TCpu+pG27X vYB0wNl+F4FJ892aJnyXIASsIlMmbAvM2yT5js6G6ZffTFPI936jgsbnhPxGgw== 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 4VZCNd02jmzN00; Wed, 8 May 2024 11:20:01 +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 448BK0gU096532; Wed, 8 May 2024 11:20:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 448BK0jS096510; Wed, 8 May 2024 11:20:00 GMT (envelope-from git) Date: Wed, 8 May 2024 11:20:00 GMT Message-Id: <202405081120.448BK0jS096510@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: 0d446a4303a8 - main - carp: document the new VRRPv3 support 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d446a4303a8444c5ba9c7d4a3caee846579d101 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=0d446a4303a8444c5ba9c7d4a3caee846579d101 commit 0d446a4303a8444c5ba9c7d4a3caee846579d101 Author: Kristof Provost AuthorDate: 2024-04-12 14:09:04 +0000 Commit: Kristof Provost CommitDate: 2024-05-08 11:19:04 +0000 carp: document the new VRRPv3 support Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D44776 --- sbin/ifconfig/ifconfig.8 | 16 +++++++++++++++- share/man/man4/carp.4 | 13 ++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index e8a18d08635b..99a4cf8c9751 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 08, 2023 +.Dd May 1, 2024 .Dt IFCONFIG 8 .Os .Sh NAME @@ -3151,6 +3151,20 @@ announcements to. Restore the default destination address for (IPv4) .Xr carp 4 announcements, which is ff02::12. +.It Cm carpver +Set the protocol version. +Valid choices are 2 (for +.Xr carp 4) +and 3 (for VRRPv3). +This can only be set when +.Xr carp 4 +is initiated. +.It Cm vrrpprio +Set the VRRPv3 priority. +Valid values are 1-255. +.It Cm vrrpinterval +Set the VRRPv3 Master Advertisement Interval. +Values are in centiseconds. .El .Sh ENVIRONMENT The following environment variables affect the execution of diff --git a/share/man/man4/carp.4 b/share/man/man4/carp.4 index 19079a2cc97e..c972e0288791 100644 --- a/share/man/man4/carp.4 +++ b/share/man/man4/carp.4 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 6, 2023 +.Dd April 12, 2024 .Dt CARP 4 .Os .Sh NAME @@ -93,6 +93,17 @@ or through the .Dv SIOCSPEER .Xr ioctl 2 . .Pp +.Xr carp 4 +can be configured to use either the non-standard CARP protocol, or VRRPv3 (RFC 5798). +Use the +.Cm carpver +parameter to select either 2 (CARP) or 3 (VRRPv3). +VRRPv3 specific parameters can be configured using the +.Cm vrrpprio +and +.Cm vrrpinterval +parameters. +.Pp CARP virtual hosts can be configured on multicast-capable interfaces: Ethernet, layer 2 VLAN, FDDI and Token Ring. An arbitrary number of virtual host IDs can be configured on an interface.