From nobody Tue Feb 11 16:53:12 2025 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 4YsnZJ5D45z5nqt4; Tue, 11 Feb 2025 16:53:12 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YsnZJ4hv0z48Km; Tue, 11 Feb 2025 16:53:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739292792; 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=rm5o6mL+PDTgMbtpjo6n1k8hhMK/IqiTTMvEKZjadUk=; b=XEcmAxIYoVoyIdbZuMWZ/snIWC3rjJqXCsBodYbhwt4UimV7M+Olpo+O52a50Nhzq8W7PE mnnyias2NPAkmQuJNRy4FbyQ2X7NZJvJkJBUU2K1U1+0ds1oUtax2EocBOUyXSGY+IAOiY b0MeGXWsvTQUuzaJ9fM4z77oO5gNVFJESeytKML5LT/bk8tluO0hFFEYWCDmbGSga04nRE FlDYpuSdVMSvUXkM7FOQrMiHxPPz2/MGNa7so9YIbqaLXbnJxUh4tm7bw0FaOFCrmIBzeJ UDQWTPickmGGwIRkFBCbLvDgYKYLJHXRxwyBti2N2ZvxJyx2VsQxpzzuCCp5vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739292792; 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=rm5o6mL+PDTgMbtpjo6n1k8hhMK/IqiTTMvEKZjadUk=; b=LqqxHMgLK3u5A5yRSFkIOVe4WuJFa/ZAFQLJaHxXRW6xQRna8p5B/Vmt4nU1C2jYvc1uaC /NBb+D7A0F+9p1eAnxU5OIAmfMoAGh8DYYqKCE+FCzfbZXaYd7UwhN+He/5Fokk4NB06Vt ncdHlS+mtVaiKjUDYN1sQMUbKAXoeoDOFq/JG+HUBgU/q78VEMq5sJmoPeHoOYeIvbMgmv fhHgQ+gaDmhd1ziAhdLAnrTpPsIw6DPueCVbrYiC/w2Ogq6oh40JZNP58Xguo+oPHeCiwO XxNlkYqmVFMtDBW4sXYU+Uq98bgboRTT5Ts+Tl9l/UEYVnK2KCyiHzevInOUvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739292792; a=rsa-sha256; cv=none; b=aUGrWmRdfNV63sT7g+BaXW7w/IaJ06svTRMMtYQhfstm53c/tReb6NitmHjpPol4qM71Hs x/l+Ao1bBdfJ2vrNc+05Ai4RjECHvm+1wGF1C3bB+WHM8KXD4bFxs2Upj0348wuW0zsoDk L/4bhLtYh1J63p04Us/JY6dUGFbS9F3FqGueHWBpt4b7biE7AMayU/Tyf30RxgY7Qnrmp5 4BOBKLpT63htcMYUjngc/NlaDhtrGLqpXvCI9aI1CO2xXwUn449z8V1sBHMO3x65WeBmml IwBA2W7AbmN1wGPcDLKnJIS60KgAaMQmBkPWwSNi4aYAMefv34QVxF4za/pTWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YsnZJ3zkGz5Zt; Tue, 11 Feb 2025 16:53:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51BGrCk5057489; Tue, 11 Feb 2025 16:53:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51BGrCPO057486; Tue, 11 Feb 2025 16:53:12 GMT (envelope-from git) Date: Tue, 11 Feb 2025 16:53:12 GMT Message-Id: <202502111653.51BGrCPO057486@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: 8921c82b76e3 - stable/14 - carp: don't unintentionally revert to multicast mode 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 8921c82b76e355deadf6a7810dfe20d65de49daa Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8921c82b76e355deadf6a7810dfe20d65de49daa commit 8921c82b76e355deadf6a7810dfe20d65de49daa Author: Kristof Provost AuthorDate: 2025-01-21 09:49:55 +0000 Commit: Kristof Provost CommitDate: 2025-02-11 16:52:42 +0000 carp: don't unintentionally revert to multicast mode PR: 284140 MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit af33f86e6aef6b15c8aa3da615167272aa7a3ee3) --- sbin/ifconfig/carp.c | 4 ---- tests/sys/netinet/carp.sh | 7 +++++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sbin/ifconfig/carp.c b/sbin/ifconfig/carp.c index dd09838b5d8b..a23c245f7fe6 100644 --- a/sbin/ifconfig/carp.c +++ b/sbin/ifconfig/carp.c @@ -246,10 +246,6 @@ static struct afswtch af_carp = { static __constructor void carp_ctor(void) { - /* Default to multicast. */ - setcarp_mcast(NULL, NULL, 0); - setcarp_mcast6(NULL, NULL, 0); - for (size_t i = 0; i < nitems(carp_cmds); i++) cmd_register(&carp_cmds[i]); af_register(&af_carp); diff --git a/tests/sys/netinet/carp.sh b/tests/sys/netinet/carp.sh index d0e10bc2c085..8cea2f4cbf1b 100755 --- a/tests/sys/netinet/carp.sh +++ b/tests/sys/netinet/carp.sh @@ -155,8 +155,11 @@ unicast_v4_body() atf_check -s exit:0 -o ignore jexec carp_uni_v4_one \ ping -c 3 192.0.2.1 - jexec carp_uni_v4_two ifconfig - jexec carp_uni_v4_three ifconfig + # Check that we remain in unicast when tweaking settings + atf_check -s exit:0 -o ignore \ + jexec carp_uni_v4_two ifconfig ${epair_one}b vhid 1 advskew 2 + atf_check -s exit:0 -o match:"peer 198.51.100.130" \ + jexec carp_uni_v4_two ifconfig ${epair_one}b } unicast_v4_cleanup()