shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-25 10:04:04 +03:00
Code

sd-rtnl: fix typesystem for IFLA_AF_SPEC

Browse Source 
Got this one wrong, it is not a union, just a nested container.
This commit is contained in:
Tom Gundersen 2015-02-08 22:34:53 +01:00
parent a1166fe970
commit 73cb1c149d
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libsystemd/sd-rtnl/rtnl-types.c
View File

@ -278,15 +278,18 @@ static const struct NLType rtnl_af_spec_inet6_types[IFLA_INET6_MAX + 1] = {
[IFLA_INET6_ADDR_GEN_MODE] = { .type = NLA_U8 }, [IFLA_INET6_ADDR_GEN_MODE] = { .type = NLA_U8 },
}; };
static const NLTypeSystem rtnl_af_spec_type_systems[AF_MAX] = { static const NLTypeSystem rtnl_af_spec_inet6_type_system = {
[AF_INET6] = { .max = ELEMENTSOF(rtnl_af_spec_inet6_types) - 1, .max = ELEMENTSOF(rtnl_af_spec_inet6_types) - 1,
.types = rtnl_af_spec_inet6_types }, .types = rtnl_af_spec_inet6_types,
}; };
static const NLTypeSystemUnion rtnl_af_spec_type_system_union = { static const NLType rtnl_af_spec_types[AF_MAX + 1] = {
.num = AF_MAX, [AF_INET6] = { .type = NLA_NESTED, .type_system = &rtnl_af_spec_inet6_type_system },
.type_systems = rtnl_af_spec_type_systems, };
.match_type = NL_MATCH_PROTOCOL,
static const NLTypeSystem rtnl_af_spec_type_system = {
.max = ELEMENTSOF(rtnl_af_spec_types) - 1,
.types = rtnl_af_spec_types,
}; };
static const NLType rtnl_link_types[IFLA_MAX + 1 ] = { static const NLType rtnl_link_types[IFLA_MAX + 1 ] = {
@ -323,7 +326,7 @@ static const NLType rtnl_link_types[IFLA_MAX + 1 ] = {
[IFLA_VF_PORTS] = { .type = NLA_NESTED }, [IFLA_VF_PORTS] = { .type = NLA_NESTED },
[IFLA_PORT_SELF] = { .type = NLA_NESTED }, [IFLA_PORT_SELF] = { .type = NLA_NESTED },
*/ */
[IFLA_AF_SPEC] = { .type = NLA_NESTED, .type_system_union = &rtnl_af_spec_type_system_union }, [IFLA_AF_SPEC] = { .type = NLA_NESTED, .type_system = &rtnl_af_spec_type_system },
/* /*
[IFLA_VF_PORTS], [IFLA_VF_PORTS],
[IFLA_PORT_SELF], [IFLA_PORT_SELF],