From nobody Fri Jan 24 10:25:01 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 4YfYpk1pbPz5lBjh; Fri, 24 Jan 2025 10:25:02 +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 4YfYpj5vV7z3tH3; Fri, 24 Jan 2025 10:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737714301; 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=fz6Gv/mKJldSvwB8GoqxQl0UB619Pdp0O/nEyaZKgoE=; b=QvRlsJl0VRLQB1ZpraiEgryLIw2MLw/Oh7R7pguxjxE044iBH0IcN3EdKki0hEzprYhhSS xqLTzrCxToEcdwqBM+v/3BXAUCimoa7HXcXYluTf/zlreqxWtV0mR8Uk/ES4JRnox741O1 yp7nTJVliWpLEnEv/vJrp2rEjUNM/Gjh2oTHJjCu1ZmdOWlu7i/yKxMCQSCP7Hq7OPPTIE 9JGTVbNkqPgzXp4UrdihaKOTaXZ/Grm6S8WDedoMkbMRuQG2k2Vl5wIqR4p0rE6dUDqhUT yKrYzs4tTx+Wu2ednqhrURHHXY83qOUMNlaDgwmiuhTRAFW16R3DqJFf4Ru5GA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737714301; 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=fz6Gv/mKJldSvwB8GoqxQl0UB619Pdp0O/nEyaZKgoE=; b=HofCkRYGHxvlbBxmrDOyouYa11Ny3eBgXtLfT0j7vL8CUEGYu0X4PiJF50tDQlnaEUVPei 8jVXWJEfbG6objI2cVomkZD8nOn+Qq9U23g44moaKtT1QpDdqvSQSOhd11YFi6CF6+Si3d H4qrqhuQQqtV6/iBpC6c/MJpB6FivWqmwKsQcHHLEmwxXoBCdugPsQ/4KS/MRaZ+TaiSKf Lb/+U25HLRFpdy1Qr/ljRZzLj9DghFMowebLA+H1ZMcJ3dN1Lto6JLkTfFza4A45AFRclN jcH1fH58zD4aRw57RYqF39j3y4HKqtFjDEiajPANHXupudkR7NFbWgdENMe8xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737714301; a=rsa-sha256; cv=none; b=UlNH9SQ0cFURVnRfjHgPCl0JxZsVcHqXB8l7crsAE2NU2n+yEVFgUR1++qoj3heMLX+mCr fP3luaArgvOFGkZoFWINUV/Tr42lzuAlMWX5D0nyOt1997/A0ZJklPqNdv/9mo5YmQENQ0 BTLDJM3ujd7617O/TSdL2TQAsfkLUnDu/doW6DDvvgvk7o+UDA7y3Sg2Df8OGcDt+iPacv wzIz6QV/DxvyBewmlGGXVinDTIcDJIhU61/+d2lOd3IV7c2I4Z+3hncmYaLi+7GU4YPdXE dCYx5FWeNQoCRzsd1BmwZbXxMTETXWY+yqpkNFqL+BDsjgdJMYYMc1rsEsI96A== 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 4YfYpj5Pzmz5f7; Fri, 24 Jan 2025 10:25:01 +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 50OAP1Qe038396; Fri, 24 Jan 2025 10:25:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50OAP14W038393; Fri, 24 Jan 2025 10:25:01 GMT (envelope-from git) Date: Fri, 24 Jan 2025 10:25:01 GMT Message-Id: <202501241025.50OAP14W038393@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: af33f86e6aef - main - 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/main X-Git-Reftype: branch X-Git-Commit: af33f86e6aef6b15c8aa3da615167272aa7a3ee3 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=af33f86e6aef6b15c8aa3da615167272aa7a3ee3 commit af33f86e6aef6b15c8aa3da615167272aa7a3ee3 Author: Kristof Provost AuthorDate: 2025-01-21 09:49:55 +0000 Commit: Kristof Provost CommitDate: 2025-01-24 10:20:30 +0000 carp: don't unintentionally revert to multicast mode PR: 284140 MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") --- 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 36b5d85ab7b8..7c7398f92d48 100644 --- a/sbin/ifconfig/carp.c +++ b/sbin/ifconfig/carp.c @@ -292,10 +292,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 39cfad14907c..f9e47c70f492 100755 --- a/tests/sys/netinet/carp.sh +++ b/tests/sys/netinet/carp.sh @@ -202,8 +202,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()