From nobody Tue Feb 4 19:53:01 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 4YnYv134T7z5mMVl; Tue, 04 Feb 2025 19:53:01 +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 4YnYv11Fttz3G31; Tue, 04 Feb 2025 19:53:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738698781; 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=CKcnoMUumMvpo/jlqstN8hyNsXdh7GiXX2sGPxyZWP4=; b=A8jJUGqfbJCBN3whTeCDMa8TVL1wrb2rPKRFrcSN966erwDOEdhUnAYVJP/Hyr1gH/lUtp vYnjnOKC7kODawgvMcUML3SThJVkp2fFuIPe0A4gPNlmth+dGEgAiSJpDJ+1wfDNLO8EnX F5ayoy0SniZBqA1Tv0/SUwtxfRgYcyn6PkcVp0VsaXtRE7L0KtEI+wmh3AXG3ANizuQqN8 KaBf1k3LykifjRiXtzJ6mdNUmKP7VBKu+g6QWVDs/YEAFSeWUu9nhVLzVVhkMQAfVfiN5V Jac+0FZtyv5cKhqhbwtW8jVFaqXUiJV3Ky/0sPxqh5qcfdxfxk1cnkUbF6V1aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738698781; 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=CKcnoMUumMvpo/jlqstN8hyNsXdh7GiXX2sGPxyZWP4=; b=F0JZO+9dr9K9LgZY6a06thfBq8RaHSimYWsei453h5ncsB+1uqVL01VJTmaHPDpi0GwI/w buk+0tnbA5M3bu1P1pzFu212WU5wBl/d0UQie9NYKmxnuaFQRBtbpg72juawS2nqKJ/sNj vJ2sdyHt71KK6stgwK/4w8KHrtAAZ00tGa0Bhna8QvrCtdx9rggkIO1bEVRfSPx+uYWNs4 AZSzte/iAMHslX4dBpszvXumnE30duBZm/hgqBFV5ySoKm7Z2h2Wq8FrTrNrAPIGpPElR4 Qsi0M/08QoeDu03kq/eMsKqxIrfpaBcavjbmKGOaeUwrbSzKLdJUQa54+eI99A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738698781; a=rsa-sha256; cv=none; b=yOt1e5QIkfL/pRbupT96he9cN2Qoos7ZyopgTFfClrnIrYIAjYN4nxP2YNp1AEMBeHF54o NX2hhv6QzW9JngBAk8DSZ/TwODlFus3U/BYqy5va46BCIeQZ3mypUNAfuoor8IlE1PrJtq SLDtNjIJlhXr64aD7830yVkkXM4R8zsxUQJpOqyyiJ20DQxyYNGJLTO09NXN+YRsv/KB5Z fBiXOZQxB+hv06i5w/ImnAxh2chyt0bMjg0xBZCOyLr6IE82HPooomtuLmVVaL2DHWguio hwruTx8M7dAA7+2MLBD+xJjaAZsgjQexL9AdoHfHsWhje386XoUxmIpK8laUKw== 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 4YnYv10s7Cz4Xb; Tue, 04 Feb 2025 19:53: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 514Jr1uF086351; Tue, 4 Feb 2025 19:53:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 514Jr1Ed086348; Tue, 4 Feb 2025 19:53:01 GMT (envelope-from git) Date: Tue, 4 Feb 2025 19:53:01 GMT Message-Id: <202502041953.514Jr1Ed086348@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 753a4acd09e4 - main - netlink: make struct genl_family and genl_group private 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 753a4acd09e45d84cd863355943dbb2ccbcda77b Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=753a4acd09e45d84cd863355943dbb2ccbcda77b commit 753a4acd09e45d84cd863355943dbb2ccbcda77b Author: Gleb Smirnoff AuthorDate: 2025-02-04 19:52:35 +0000 Commit: Gleb Smirnoff CommitDate: 2025-02-04 19:52:35 +0000 netlink: make struct genl_family and genl_group private --- sys/netlink/netlink_generic.c | 72 ++++++++++++++++++++++++------------------- sys/netlink/netlink_var.h | 15 --------- 2 files changed, 41 insertions(+), 46 deletions(-) diff --git a/sys/netlink/netlink_generic.c b/sys/netlink/netlink_generic.c index d4c84a34b850..30c73133134b 100644 --- a/sys/netlink/netlink_generic.c +++ b/sys/netlink/netlink_generic.c @@ -47,8 +47,47 @@ #include _DECLARE_DEBUG(LOG_INFO); -static int dump_family(struct nlmsghdr *hdr, struct genlmsghdr *ghdr, - const struct genl_family *gf, struct nl_writer *nw); +static int nlctrl_handle_getfamily(struct nlmsghdr *, struct nl_pstate *); + +static struct genl_cmd nlctrl_cmds[] = { + [CTRL_CMD_GETFAMILY] = { + .cmd_num = CTRL_CMD_GETFAMILY, + .cmd_name = "GETFAMILY", + .cmd_cb = nlctrl_handle_getfamily, + .cmd_flags = GENL_CMD_CAP_DO | GENL_CMD_CAP_DUMP | + GENL_CMD_CAP_HASPOL, + }, +}; + +static struct genl_family { + const char *family_name; + uint16_t family_hdrsize; + uint16_t family_version; + uint16_t family_attr_max; + uint16_t family_cmd_size; + uint16_t family_num_groups; + struct genl_cmd *family_cmds; +} families[MAX_FAMILIES] = { + [CTRL_FAMILY_ID] = { + .family_name = CTRL_FAMILY_NAME, + .family_hdrsize = 0, + .family_version = 2, + .family_attr_max = CTRL_ATTR_MAX, + .family_cmd_size = CTRL_CMD_GETFAMILY + 1, + .family_cmds = nlctrl_cmds, + .family_num_groups = 1, + }, +}; + +static struct genl_group { + struct genl_family *group_family; + const char *group_name; +} groups[MAX_GROUPS] = { + [CTRL_GROUP_ID] = { + .group_family = &families[CTRL_FAMILY_ID], + .group_name = CTRL_GROUP_NAME, + }, +}; /* * Handler called by netlink subsystem when matching netlink message is received @@ -299,35 +338,6 @@ SX_SYSINIT(genl_lock, &sx_lock, "genetlink lock"); #define GENL_ASSERT_LOCKED() sx_assert(&sx_lock, SA_LOCKED) #define GENL_ASSERT_XLOCKED() sx_assert(&sx_lock, SA_XLOCKED) -static struct genl_cmd nlctrl_cmds[] = { - [CTRL_CMD_GETFAMILY] = { - .cmd_num = CTRL_CMD_GETFAMILY, - .cmd_name = "GETFAMILY", - .cmd_cb = nlctrl_handle_getfamily, - .cmd_flags = GENL_CMD_CAP_DO | GENL_CMD_CAP_DUMP | - GENL_CMD_CAP_HASPOL, - }, -}; - -static struct genl_family families[MAX_FAMILIES] = { - [CTRL_FAMILY_ID] = { - .family_name = CTRL_FAMILY_NAME, - .family_hdrsize = 0, - .family_version = 2, - .family_attr_max = CTRL_ATTR_MAX, - .family_cmd_size = CTRL_CMD_GETFAMILY + 1, - .family_cmds = nlctrl_cmds, - .family_num_groups = 1, - }, -} -; -static struct genl_group groups[MAX_GROUPS] = { - [CTRL_GROUP_ID] = { - .group_family = &families[CTRL_FAMILY_ID], - .group_name = CTRL_GROUP_NAME, - }, -}; - static struct genl_family * find_family(const char *family_name) { diff --git a/sys/netlink/netlink_var.h b/sys/netlink/netlink_var.h index 87b9f5aaaecd..c341abf7ca55 100644 --- a/sys/netlink/netlink_var.h +++ b/sys/netlink/netlink_var.h @@ -144,21 +144,6 @@ struct nl_buf *nl_buf_alloc(size_t len, int mflag); void nl_buf_free(struct nl_buf *nb); /* netlink_generic.c */ -struct genl_family { - const char *family_name; - uint16_t family_hdrsize; - uint16_t family_version; - uint16_t family_attr_max; - uint16_t family_cmd_size; - uint16_t family_num_groups; - struct genl_cmd *family_cmds; -}; - -struct genl_group { - struct genl_family *group_family; - const char *group_name; -}; - struct genl_family *genl_get_family(uint16_t family_id); struct genl_group *genl_get_group(uint32_t group_id);