From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 24 Aug 2021 06:51:33 +0000 (+0900)
Subject: sd-netlink: add several missing attributes
X-Git-Tag: v250-rc1~763^2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a9c8f3fcc9654b1e211bf4d4b0d895381649a41;p=thirdparty%2Fsystemd.git

sd-netlink: add several missing attributes
---

diff --git a/src/libsystemd/sd-netlink/netlink-types-genl.c b/src/libsystemd/sd-netlink/netlink-types-genl.c
index 4af1c71c2f6..c39db47b196 100644
--- a/src/libsystemd/sd-netlink/netlink-types-genl.c
+++ b/src/libsystemd/sd-netlink/netlink-types-genl.c
@@ -25,10 +25,29 @@ static const NLTypeSystem genl_ctrl_mcast_group_type_system = {
         .types = genl_ctrl_mcast_group_types,
 };
 
+static const NLType genl_ctrl_ops_types[] = {
+        [CTRL_ATTR_OP_ID]           = { .type = NETLINK_TYPE_U32 },
+        [CTRL_ATTR_OP_FLAGS]        = { .type = NETLINK_TYPE_U32 },
+};
+
+static const NLTypeSystem genl_ctrl_ops_type_system = {
+        .count = ELEMENTSOF(genl_ctrl_ops_types),
+        .types = genl_ctrl_ops_types,
+};
+
 static const NLType genl_ctrl_types[] = {
         [CTRL_ATTR_FAMILY_ID]    = { .type = NETLINK_TYPE_U16 },
         [CTRL_ATTR_FAMILY_NAME]  = { .type = NETLINK_TYPE_STRING },
+        [CTRL_ATTR_VERSION]      = { .type = NETLINK_TYPE_U32 },
+        [CTRL_ATTR_HDRSIZE]      = { .type = NETLINK_TYPE_U32 },
+        [CTRL_ATTR_MAXATTR]      = { .type = NETLINK_TYPE_U32 },
+        [CTRL_ATTR_OPS]          = { .type = NETLINK_TYPE_NESTED, .type_system = &genl_ctrl_ops_type_system },
         [CTRL_ATTR_MCAST_GROUPS] = { .type = NETLINK_TYPE_NESTED, .type_system = &genl_ctrl_mcast_group_type_system },
+        /*
+        [CTRL_ATTR_POLICY]       = { .type = NETLINK_TYPE_NESTED, },
+        [CTRL_ATTR_OP_POLICY]    = { .type = NETLINK_TYPE_NESTED, }
+        */
+        [CTRL_ATTR_OP]           = { .type = NETLINK_TYPE_U32 },
 };
 
 static const NLTypeSystem genl_ctrl_type_system = {