From nobody Sat Feb 22 19:28:29 2025 X-Original-To: dev-commits-src-main@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 4Z0cVQ022Lz5pFr7; Sat, 22 Feb 2025 19:28:30 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z0cVP5HPyz3lgL; Sat, 22 Feb 2025 19:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740252509; 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=aLI70eWLJAkyDWo7J2uhLl29uJXGpppmuhqt/ZEI224=; b=tL/ykITOiDAfXJaRxEd7V3Sp4aexB6FkkRCIMUYf95KQWnsUngleXR71J7rTaKee+u3KTy MXpG49aF5nnWHVE5XBcoXZUWG283UcxuYIV/qZjQRUMID8Bian/dV/8GIktqZWkWv07Q0P w23sMQ92DcCZRsMTQHzHRRwFHh5tpJwTj9LvvySUgsSEp15a2+xJK388Ll6z4ZAE6O611M +yhENaitaxKVUF3G10bxTqQNra9L2hFdrW/mdfIQQa0ZwAjdTx0eXsp9knNVAaPI6QnBUS 23AE1uycmpHWGFqpXWkAObUrsB8o66ioj7lr2KNdF+1ZuZ5h58yP3kndG/pSWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740252509; a=rsa-sha256; cv=none; b=SF3qVT1qDvpLrfcFww5LF1NDsW0zwjrHSaZQ8AXEt8tO9/KQjQLQpPHQY3qzA+bTN/zMZY TxvnahmCCk7IQVjlqDw1AHEI5rJoY2lG0pZHJ8U7scVZNl9BqH9IuOQOIQLseiUHbEhMio A0LJoITgXkAgStI7ll7juUCnb5QDOfVUaklXdf6urmNjTNWV20sBwndPdXhv8g1lHAdWtP mtc+Y/5n7w5eVhhze6N7FXwycNt+1Xlze6ci5d75o0DYbEAXvEiYUwCslA0zAU0neqzrO/ GTITe7/AUPRKGgzpEnSFgTgh40IFzXiIBzJvD6k0aC1QDW5auyG0xdzqreAbAw== 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=1740252509; 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=aLI70eWLJAkyDWo7J2uhLl29uJXGpppmuhqt/ZEI224=; b=CX8AHqMKVtrc64H1EgrlnToepHMDOTj5acXawlWGLvGCeaCueKkJDqeOUTFNdETc/HNg1x 2hEk7QsG3vNLCMCsHKth2uPH2tviqW6yOug4sgVPUo1zniKG7fnW9xUbXRpxB1HVKDEM4n iTIkXTOk547LXtoOMtNEmsdx3DobbPQtDDuc8kPFMKkJN/mujYzwruW+ec1WTqZ7fTmNU1 XXZjtmFWlfvUNrrCqfQenaBDxZ0MIETSbc3VfkKr8n1DFDy70iSXYrmwouWlJ0RGlJW1Cc PHvzzVKcDgrh5omQiqT2Jgw59ABjImOEiYh9p5Eg/5X1uzpKP9oRX0Auv6ImIg== 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 4Z0cVP4pV4z6HV; Sat, 22 Feb 2025 19:28:29 +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 51MJSTNY035429; Sat, 22 Feb 2025 19:28:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51MJSTWc035426; Sat, 22 Feb 2025 19:28:29 GMT (envelope-from git) Date: Sat, 22 Feb 2025 19:28:29 GMT Message-Id: <202502221928.51MJSTWc035426@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 1776633438f2 - main - carp: Fix checking IPv4 multicast address List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1776633438f24df09cb9815650891bcef0152874 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=1776633438f24df09cb9815650891bcef0152874 commit 1776633438f24df09cb9815650891bcef0152874 Author: Zhenlei Huang AuthorDate: 2025-02-22 19:26:33 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-22 19:26:33 +0000 carp: Fix checking IPv4 multicast address An IPv4 address stored in `struct in_addr` is in network byte order but `IN_MULTICAST` wants host order. PR: 284872 Reported by: Steven Perreau Reported by: Brett Merrick Reviewed by: Franco Fichtner , ae, kp, glebius Tested by: Steven Perreau Fixes: 137818006de5 carp: support unicast MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D49053 --- sys/netinet/ip_carp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index 5bec8fce3fcb..6fde7bd70c6b 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -855,7 +855,7 @@ carp_input_c(struct mbuf *m, struct carp_header *ch, sa_family_t af, int ttl) } if (ifa->ifa_addr->sa_family == AF_INET) { - multicast = IN_MULTICAST(sc->sc_carpaddr.s_addr); + multicast = IN_MULTICAST(ntohl(sc->sc_carpaddr.s_addr)); } else { multicast = IN6_IS_ADDR_MULTICAST(&sc->sc_carpaddr6); } @@ -1245,7 +1245,7 @@ carp_send_ad_locked(struct carp_softc *sc) m->m_pkthdr.rcvif = NULL; m->m_len = len; M_ALIGN(m, m->m_len); - if (IN_MULTICAST(sc->sc_carpaddr.s_addr)) + if (IN_MULTICAST(ntohl(sc->sc_carpaddr.s_addr))) m->m_flags |= M_MCAST; ip = mtod(m, struct ip *); ip->ip_v = IPVERSION;