From nobody Mon Mar 20 14:14:27 2023 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 4PgGvS2m5xz3yn2j; Mon, 20 Mar 2023 14:14:28 +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 4PgGvS1BdKz3kWT; Mon, 20 Mar 2023 14:14:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679321668; 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=7/FJ8cuNvvjlHErLKhbC/rtSZ2l67C9+jC06s3itEzQ=; b=Cjy3xp77IRxolH3RweZDdaH7Gad7wNKJYRyU9rdosVHoNRI4DRO4nPU/bu44p2OT4lnLrG Vu0UHu+HyoeBcLHt17So2Ods+iVDs2VA4eTQsrxRbcGj55MXSQ6RARTo9VVkW2mMaJFLAn Fh03efW0eJ9nTGJk56zOyO+VubpKLjJb0qnZcHXlyeuIcqNXNNKdy0CQ2aMBANcAIGRxgd pYa4UqwmwGf65uHjE+a1zAy071HoXAUP9gU/EBElBb3bQzkQ4LQtaJV+9wokEW0d3Wtip9 UbffMu3BLkHn8sRPoRTjRd5iclbBiy4ZLyb50f3CjTBdFSDDdAHTDbOrNH8r4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679321668; 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=7/FJ8cuNvvjlHErLKhbC/rtSZ2l67C9+jC06s3itEzQ=; b=TL5i+j8TkTlX2YkWkxoR+XCfsKH80QEFq43MQjUSlCST8KjgPtVQsO1KsoiWCkElnC8zKq txDejx6CG2TPYYlbgti4hBuhmYR7xwZ/ZC+7VJ38Kf/APGLbvSrFZdXWmMm2eR+ZpaUxJV jtd7spR0ImJ/d6PAkaXwkEDDllvF8uk9Rdb4CT/Aklosg/xbIskW1Vpsm1rdZYDLZEZ9Dl 6oIAx/s8PO9v0yVE9I38PTrLXWfXPtiqOJsrs6fcayi9i+3Fl3p78I5LuIQEUqxHVPYKa+ WoF1WoaENTAZzoGPmBp/KUA4UFfoh6XXX6Tbm4818/vpy5mqcOobXuenff7r9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679321668; a=rsa-sha256; cv=none; b=trYmRcsOWPwigxwkRAdYAFWmagtB8HPhcn+9XNs3aHvhIJW4VeffAklKcTUaZ7LFhf35Za n9U4db5gYKbCLIXV/AyCXQzuhyMsavrwcokLNTTXHwRjDMJJBxInvc01EJevhVZG8szezU f/m3IKl9RicvNEkuX3OSq5RyHKkVSlAnGJ1wfKDfWhARfeITf5sMnYnzkL8crpshoJlpU0 NsfhqJVdsz+FoGCzGgTL/SpjJN3Zla8AOxPI4oP2C6vR3S34bFhqenYXxZOxnRQOwtOwsD TFe/dwTAmFOC7rD9Y9cE3ly6CHQJgBLJk0/yu4JAjvong4JDaLBc7egAZkRGHg== 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 4PgGvS05h7zYDX; Mon, 20 Mar 2023 14:14:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32KEERik039874; Mon, 20 Mar 2023 14:14:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32KEERiv039873; Mon, 20 Mar 2023 14:14:27 GMT (envelope-from git) Date: Mon, 20 Mar 2023 14:14:27 GMT Message-Id: <202303201414.32KEERiv039873@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: b1a4ccdd8394 - main - carp: document peer/peer6 and mcast/mcast6 in the relevant man pages 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: b1a4ccdd839431ff0e5a536a444c6e91f5858527 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b1a4ccdd839431ff0e5a536a444c6e91f5858527 commit b1a4ccdd839431ff0e5a536a444c6e91f5858527 Author: Kristof Provost AuthorDate: 2023-03-06 14:02:21 +0000 Commit: Kristof Provost CommitDate: 2023-03-20 13:37:10 +0000 carp: document peer/peer6 and mcast/mcast6 in the relevant man pages Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D38943 --- sbin/ifconfig/ifconfig.8 | 18 +++++++++++++++++- share/man/man4/carp.4 | 19 ++++++++++++++++++- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index 98d2899f1b93..4669e96e28e6 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -28,7 +28,7 @@ .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 .\" $FreeBSD$ .\" -.Dd February 1, 2023 +.Dd March 6, 2023 .Dt IFCONFIG 8 .Os .Sh NAME @@ -3086,6 +3086,22 @@ The following states are recognized: .Cm MASTER and .Cm BACKUP . +.It Cm peer Ar address +Set the address to send (IPv4) +.Xr carp 4 +announcements to. +.It Cm mcast +Restore the default destination address for (IPv4) +.Xr carp 4 +announcements, which is 224.0.0.18. +.It Cm peer6 Ar address +Set the address to send (IPv6) +.Xr carp 4 +announcements to. +.It Cm mcast6 +Restore the default destination address for (IPv4) +.Xr carp 4 +announcements, which is ff02::12. .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 2785b97e76ac..63fa9168dd39 100644 --- a/share/man/man4/carp.4 +++ b/share/man/man4/carp.4 @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 1, 2018 +.Dd March 6, 2023 .Dt CARP 4 .Os .Sh NAME @@ -78,6 +78,23 @@ or through the .Dv SIOCSVH .Xr ioctl 2 . .Pp +CARP defaults to using multicast messages, but can be configured to unicast +announcements to peers using the +.Cm peer +and +.Cm peer6 +parameters. Default addresses can be restored using +.Cm mcast +and +.Cm mcast6 . +Note that TTL verification is disabled if the peer address is not a multicast +address. +These values can be configured using +.Xr ifconfig 8 , +or through the +.Dv SIOCSPEER +.Xr ioctl 2 . +.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.