From nobody Wed Aug 6 20:09:59 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 4by1c74bZfz649Bc; Wed, 06 Aug 2025 20:09:59 +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 4by1c73gnvz41KB; Wed, 06 Aug 2025 20:09:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754510999; 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=MN/KS7PijVl9e1NdS3n9GKlsDdMKodoFk4tsYlUT6EQ=; b=FnZ5SiQwBF2V2Q6p+NFVt1edZVnvDbLTA7FsKtUFPaLtL4e7h8CcQrSMmpnxKSj+NNCW0a 5rWN2wEBREXoFuSjmWNlHoW/8ArFHDK9augljjsBqi383TCCzodKpROzG4oPKHyCWamqZT QQlsWhYiF7H9myFFuk/2ycQDxkdqt9UAElsS+i5YQHs2vuQrowHAcdLuXPS0mqCFQ8pI6B 5TdrtSgvRjPY/T3L2ZO3ZYewcR7FxpdRGuZxWw35OFG1fasWp3gFaKD9iWwzbM9Bl2lhct VINVZMrYsyh++vmTlY1yu2x0IlnBQ32JyQ3qKWpxmLdyyOsxYPx/0iLMMd6VCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754510999; 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=MN/KS7PijVl9e1NdS3n9GKlsDdMKodoFk4tsYlUT6EQ=; b=wIR59Yxw+kVExGT9c+jzkKbRKa6mus8osiQZU2PMtBXZ+trDsHUH0m1YuzAwlv8rBdXsD/ 3h62xLOb/BtE9QDSD6V8eCB9gEI+JZyJP20K8brw3zBg0R5WRcunsLfhAVo8SSXAWb6it9 U0CutCRytaPmfO6U33+8D0I4B5X/HxH2sWSUkNd8TlxGXMJNfLMbXKpf65Ug8lUWpBwUjJ imLaXuws3OfIM1sr50u7htYIgXiFu7UqNRJ7qJCBcZoNCMBX1u3gY0qc4J2hsAjlXror80 mGbV/rRSXMiCm3wVuRrydSUwkoN9GH4iZV1y11lUTpeyNcZ1WfU5WGBHZD/3IA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754510999; a=rsa-sha256; cv=none; b=v9641tD/6GuCiqZ3i4JY7gUGKV/5KM/RGqXzjwa36kZJP0xyhr69id7W6N61kYWV/5S3e1 SqIPyYQ8jwvw5XYhY/+aRcJcSI+1WPjrHtkpJTjzK1qK3M1Vsp92nJTlIw61y+T3feyg4v eRvci8Qn3vAYgNtqe58sOEzMo9p+WodBMi9vgxgv6Yua+qTB9Vo+e3zfRpkLPYx9VGU67U xCePFH7uxIqZQuRwwmRywpFk+87aVzj2Ox5ujE76QlDOXOVCBmjYLiUznr+29PAmjdCvxV ltxXPX3EwfAjwGvSkmHJgq+DlGuLkmIRUqesp6GhIZwZ0z1GcWs0Qw5cDprUFg== 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 4by1c738zwzc9h; Wed, 06 Aug 2025 20:09:59 +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 576K9xRO060004; Wed, 6 Aug 2025 20:09:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 576K9xc7060001; Wed, 6 Aug 2025 20:09:59 GMT (envelope-from git) Date: Wed, 6 Aug 2025 20:09:59 GMT Message-Id: <202508062009.576K9xc7060001@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: ffb02a356dfa - main - ctld: Refactor auth_group to support NVMe 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ffb02a356dfaed258b5c0c7065ab83c530d64aa7 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ffb02a356dfaed258b5c0c7065ab83c530d64aa7 commit ffb02a356dfaed258b5c0c7065ab83c530d64aa7 Author: John Baldwin AuthorDate: 2025-08-06 19:56:18 +0000 Commit: John Baldwin CommitDate: 2025-08-06 19:56:18 +0000 ctld: Refactor auth_group to support NVMe Split out a private method to parse a listen address and optional mask. This will avoid having to duplicate that code for NVMe host addresses. Rename the ag_names and ag_portals members to include "initiator" to indicate they are iSCSI-specific. Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D51728 --- usr.sbin/ctld/ctld.cc | 12 ++++++------ usr.sbin/ctld/ctld.hh | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/usr.sbin/ctld/ctld.cc b/usr.sbin/ctld/ctld.cc index 23d01364a6a4..29fc95c76a4f 100644 --- a/usr.sbin/ctld/ctld.cc +++ b/usr.sbin/ctld/ctld.cc @@ -301,17 +301,17 @@ bool auth_group::add_initiator_name(std::string_view name) { /* Silently ignore duplicates. */ - ag_names.emplace(name); + ag_initiator_names.emplace(name); return (true); } bool auth_group::initiator_permitted(std::string_view initiator_name) const { - if (ag_names.empty()) + if (ag_initiator_names.empty()) return (true); - return (ag_names.count(std::string(initiator_name)) != 0); + return (ag_initiator_names.count(std::string(initiator_name)) != 0); } bool @@ -390,7 +390,7 @@ auth_group::add_initiator_portal(const char *portal) return (false); } - ag_portals.emplace_back(ap); + ag_initiator_portals.emplace_back(ap); return (true); } @@ -429,10 +429,10 @@ auth_portal::matches(const struct sockaddr *sa) const bool auth_group::initiator_permitted(const struct sockaddr *sa) const { - if (ag_portals.empty()) + if (ag_initiator_portals.empty()) return (true); - for (const auth_portal &ap : ag_portals) + for (const auth_portal &ap : ag_initiator_portals) if (ap.matches(sa)) return (true); return (false); diff --git a/usr.sbin/ctld/ctld.hh b/usr.sbin/ctld/ctld.hh index 059f719668f9..53479aa09d9d 100644 --- a/usr.sbin/ctld/ctld.hh +++ b/usr.sbin/ctld/ctld.hh @@ -124,8 +124,8 @@ private: std::string ag_label; auth_type ag_type = auth_type::UNKNOWN; std::unordered_map ag_auths; - std::unordered_set ag_names; - std::list ag_portals; + std::unordered_set ag_initiator_names; + std::list ag_initiator_portals; }; using auth_group_sp = std::shared_ptr;