From nobody Tue Jan 31 20:03:10 2023 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 4P5wvy6Mwgz3c80b; Tue, 31 Jan 2023 20:03:10 +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 4P5wvy5kY2z3CMd; Tue, 31 Jan 2023 20:03:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675195390; 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=Uhlz1bLbq+iyi+ytX+MJ+12nZIR3Vs/aU7C7W3MMrBc=; b=W0yzIJxONrYZoGXU2N5d4jL6dsokjfUXwr8dMpzWJ1WAtfzC2xSXU4jq4XAtOKjaylzNV+ /Cgdtt7JmyN9o3ELzV/mp1EEjMKmT0chswpbYEph8PbEpV5SuRKU0KCgvJk9Lx0yY/psoM tsGqRn/HDtixCot4LWDKDDqVNGdmKl34apIyC3UUWZ5ZQFXaA7IGQU+1Oxawzomqf/NihQ 1WuM5qTFCZgkMxBf1qeQB6gB7Dha3GM7sqgAsbk8oeWd0K8/6vLdRfNWWHHJe70LLY5C4w LzZB8SRWY/8tm9IbQH+cdHvOnwkKdzX6be/a/7QV7jHxDCdk75VJ7tYkpJ/JEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675195390; 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=Uhlz1bLbq+iyi+ytX+MJ+12nZIR3Vs/aU7C7W3MMrBc=; b=TI6wUHoLobtQDRCHIlBPb59JvDntzJBo3pGnmDc+epPWo3xETJCEKg/hD8B7lsZpvbzURO IUatvwPAf2dke6pFY+QfqhbCM1XG/Z/0V6qji2JQKjiJHvnT5Z+gV2VhIuB36HQlzxvUlA btBVb5IeAqhOIzTZrgoV5ByijDMwgB8motK+KW9m4rpdQbAVBXT0jknOHXmR+MWksnTGo0 y1a97ODupihpYKhcXP1w3F3/ahLtlUGu2YHe0gXaqyg3hDrogEymhcBSOKRToQhjYlGSNA 7GD55Vwg+xghLAXk4vAPvW86efUWSOykHzsrYQ3mxoSnYp1TjNGQ4kLFJ4f4sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675195390; a=rsa-sha256; cv=none; b=G0EGEHe2vofDk4MfAcl8IRKehiHdoPhjJwraMRxD9YOyAu0PYZinn4JNY/iSNlhr2LTPMA WVQzdrcUNfXMTAJGJ9OF3NI/rkB2nt7A1818ZspHIwIpX9YzI0GKjUp5UO+btA4Ym9qqer hiyDWgWdDUn21pNtkjArdWCBbY42KTmzmXFgCOZ9qQoGNjTjxcgz+vzHMpVUj597mEsv9G R9DcB9JMTcDwWzYlkvI9TCDgApeN1EhJ6+VR9v9ZaD55XETn7UA49CGM4x/unZd8cQ6xGv q0BttQiBTsoxhwh8tOLg/UKPQUdLZlVKG6A3+z8a4upy34ZPqB4Ggj11Kw2QSw== 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 4P5wvy4pwxz12KH; Tue, 31 Jan 2023 20:03:10 +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 30VK3Ab7024777; Tue, 31 Jan 2023 20:03:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30VK3Afc024776; Tue, 31 Jan 2023 20:03:10 GMT (envelope-from git) Date: Tue, 31 Jan 2023 20:03:10 GMT Message-Id: <202301312003.30VK3Afc024776@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 361ac40b0ff6 - main - IfAPI: Hide the in6m_lookup_locked() implementation. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 361ac40b0ff6776fb65269c41759abdff6560044 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=361ac40b0ff6776fb65269c41759abdff6560044 commit 361ac40b0ff6776fb65269c41759abdff6560044 Author: Justin Hibbits AuthorDate: 2023-01-25 19:09:09 +0000 Commit: Justin Hibbits CommitDate: 2023-01-31 20:02:14 +0000 IfAPI: Hide the in6m_lookup_locked() implementation. Summary: in6m_lookup_locked() iterates over the ifnet's multiaddrs list. Keep this implementation detail private, by moving the implementation to the netstack source from the header. Sponsored by: Juniper Networks, Inc. Reviewed by: glebius, melifaro Differential Revision: https://reviews.freebsd.org/D38201 --- sys/netinet6/in6_mcast.c | 25 +++++++++++++++++++++++++ sys/netinet6/in6_var.h | 26 ++------------------------ 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/sys/netinet6/in6_mcast.c b/sys/netinet6/in6_mcast.c index 0cc8971d60d3..04c4f1aa9d93 100644 --- a/sys/netinet6/in6_mcast.c +++ b/sys/netinet6/in6_mcast.c @@ -345,6 +345,31 @@ im6o_mc_filter(const struct ip6_moptions *imo, const struct ifnet *ifp, return (MCAST_PASS); } +/* + * Look up an in6_multi record for an IPv6 multicast address + * on the interface ifp. + * If no record found, return NULL. + * + * SMPng: The IN6_MULTI_LOCK and must be held and must be in network epoch. + */ +struct in6_multi * +in6m_lookup_locked(struct ifnet *ifp, const struct in6_addr *mcaddr) +{ + struct ifmultiaddr *ifma; + struct in6_multi *inm; + + NET_EPOCH_ASSERT(); + + CK_STAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { + inm = in6m_ifmultiaddr_get_inm(ifma); + if (inm == NULL) + continue; + if (IN6_ARE_ADDR_EQUAL(&inm->in6m_addr, mcaddr)) + return (inm); + } + return (NULL); +} + /* * Find and return a reference to an in6_multi record for (ifp, group), * and bump its reference count. diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h index d1192201bd44..63dadf6b5207 100644 --- a/sys/netinet6/in6_var.h +++ b/sys/netinet6/in6_var.h @@ -776,35 +776,13 @@ static __inline struct in6_multi * in6m_ifmultiaddr_get_inm(struct ifmultiaddr *ifma) { - NET_EPOCH_ASSERT(); - return ((ifma->ifma_addr->sa_family != AF_INET6 || (ifma->ifma_flags & IFMA_F_ENQUEUED) == 0) ? NULL : ifma->ifma_protospec); } -/* - * Look up an in6_multi record for an IPv6 multicast address - * on the interface ifp. - * If no record found, return NULL. - * - * SMPng: The IN6_MULTI_LOCK and must be held and must be in network epoch. - */ -static __inline struct in6_multi * -in6m_lookup_locked(struct ifnet *ifp, const struct in6_addr *mcaddr) -{ - struct ifmultiaddr *ifma; - struct in6_multi *inm; - - CK_STAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { - inm = in6m_ifmultiaddr_get_inm(ifma); - if (inm == NULL) - continue; - if (IN6_ARE_ADDR_EQUAL(&inm->in6m_addr, mcaddr)) - return (inm); - } - return (NULL); -} +struct in6_multi * +in6m_lookup_locked(struct ifnet *ifp, const struct in6_addr *mcaddr); /* * Wrapper for in6m_lookup_locked().