From nobody Tue Mar 28 01:18:34 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 4PlsJV6XlKz42MF5; Tue, 28 Mar 2023 01:18:34 +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 4PlsJV67qqz4FQn; Tue, 28 Mar 2023 01:18:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679966314; 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=+WRBacscvjE8vzUHigWkEYbNv8Dfad964cpNNksVLMM=; b=vfkllbD5qrFHuTZ2GTIC5Xz7CHSS1cP627iXWk1trRm/3lymQnGkGAbdGdper2Kdzn2t3S pE751BUYiI/YydfTvAVXKzobypGiBUA/C7nkMXiigJQMGjvUmwtJscCjoQXETQI4fIozBe bCU3KbE7ptJgtVttBacvCgNPCAo0gUfHw4xpEXOWiUoq7+MlXH8oc+fhXKCyLISGiExhau GmBkF3qn5vid31o5JKMwYfs3UVngsYzAM64X4XQZqMHzpA9Nitj7iVGPs+U5fqBTsxdt+z dv6J42L9sZqxRQhJoVQYtrGDG+FSO1vemmgVsxuBLkpLQZ27+l6ujv2hNtubjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679966314; 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=+WRBacscvjE8vzUHigWkEYbNv8Dfad964cpNNksVLMM=; b=K7M+O+71xM+O1/jsXzKlRs4UJoSuPtRFHSunrCYYAqGpB8mKP6nORx599lwjbSX/8EtAvX 5LD/6wXQYQGtScmHENlhCW0vnDb04gwsdfI4v0V4vvUw1jG3enp9HijqxZNoXpYrfdX/1V L2GNwc/iHJkcsMi0flDHubytjGUJ2MfpRG/lTIqUVPLWmyeQjHbauLQGdsTJJeooPdkpwY Q83bVnu8+Xx/O5qAbIYCbLj4oRrAHloyiWX3NJwtFKOy0ZmXUzcRfAf0G1jxXKbrBZSQV1 CZFbVJkSsuw04v4xZ1q4GVU3nRyWT+hxVSBtBInhMGidNjVd/890LOw8BLufFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679966314; a=rsa-sha256; cv=none; b=o1Sz/hNq8Pj1O/7KVsWVwhpbT7UoEUq++vs3qiPnfkY4CAp95/hyWF95yCdbLnqGNfTFqm gOEItX/HL+0fxLGRgU6x/P8g1I4liBTDMklqtk/AQ1x2+CeE8hz0SqJFmopyUEAPaMqwu4 5p/o8XP1KAsmKwoF+tfqgxsiGqW9aL1RdrQxBARCaU3lwdx2vLhh/miQcI9yW88Fo2yd8x hcGg1wz2RJ5Re0fw5Hj84ZOBPBN9BVaV56mNwCWgGzSXA2A8SK52+1B0TBfrm15ZEND/+n ViZ1eYv3W91icDqew/DR7qxNo4TfyAM085hHORo5bkh7gNOoUxddQkkVCzzHUQ== 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 4PlsJV55vTzkRc; Tue, 28 Mar 2023 01:18:34 +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 32S1IYFJ028174; Tue, 28 Mar 2023 01:18:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32S1IY1N028173; Tue, 28 Mar 2023 01:18:34 GMT (envelope-from git) Date: Tue, 28 Mar 2023 01:18:34 GMT Message-Id: <202303280118.32S1IY1N028173@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: ccff2078af42 - main - carp: fix source MAC 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: ccff2078af42dc066e1c38d25fcb83d960c3c22b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ccff2078af42dc066e1c38d25fcb83d960c3c22b commit ccff2078af42dc066e1c38d25fcb83d960c3c22b Author: Kristof Provost AuthorDate: 2023-03-27 22:01:37 +0000 Commit: Kristof Provost CommitDate: 2023-03-27 23:18:18 +0000 carp: fix source MAC When we're not in unicast mode we need to change the source MAC address. The check for this was wrong, because IN_MULTICAST() assumes host endianness and the address in sc_carpaddr is in network endianness. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netinet/ip_carp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index deb2f3f347d9..2e1c8e084b4b 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -1588,7 +1588,7 @@ carp_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *sa) switch (sa->sa_family) { case AF_INET: - if (! IN_MULTICAST(sc->sc_carpaddr.s_addr)) + if (! IN_MULTICAST(ntohl(sc->sc_carpaddr.s_addr))) return (0); break; case AF_INET6: