SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18629 from yuwata/sd-netlink-nexthop-types

Browse Source 
sd-netlink: add nexthop related types
This commit is contained in:
Yu Watanabe
2021-02-17 04:06:15 +09:00
committed by GitHub
parent ccb4072e21 4684ec5e3d
commit 955b11ffd3
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-netlink/netlink-types.c
+10 -1
View File
@@ -733,14 +733,15 @@ static const NLType rtnl_route_types[] = {
[RTA_VIA] = { /* See struct rtvia */ },
[RTA_NEWDST] = { .type = NETLINK_TYPE_U32 },
[RTA_PREF] = { .type = NETLINK_TYPE_U8 },
[RTA_EXPIRES] = { .type = NETLINK_TYPE_U32 },
[RTA_ENCAP_TYPE] = { .type = NETLINK_TYPE_U16 },
[RTA_ENCAP] = { .type = NETLINK_TYPE_NESTED }, /* Multiple type systems i.e. LWTUNNEL_ENCAP_MPLS/LWTUNNEL_ENCAP_IP/LWTUNNEL_ENCAP_ILA etc... */
[RTA_EXPIRES] = { .type = NETLINK_TYPE_U32 },
[RTA_UID] = { .type = NETLINK_TYPE_U32 },
[RTA_TTL_PROPAGATE] = { .type = NETLINK_TYPE_U8 },
[RTA_IP_PROTO] = { .type = NETLINK_TYPE_U8 },
[RTA_SPORT] = { .type = NETLINK_TYPE_U16 },
[RTA_DPORT] = { .type = NETLINK_TYPE_U16 },
[RTA_NH_ID] = { .type = NETLINK_TYPE_U32 },
};
static const NLTypeSystem rtnl_route_type_system = {
@@ -804,8 +805,16 @@ static const NLTypeSystem rtnl_routing_policy_rule_type_system = {
static const NLType rtnl_nexthop_types[] = {
[NHA_ID] = { .type = NETLINK_TYPE_U32 },
[NHA_GROUP] = { /* array of struct nexthop_grp */ },
[NHA_GROUP_TYPE] = { .type = NETLINK_TYPE_U16 },
[NHA_BLACKHOLE] = { .type = NETLINK_TYPE_FLAG },
[NHA_OIF] = { .type = NETLINK_TYPE_U32 },
[NHA_GATEWAY] = { .type = NETLINK_TYPE_IN_ADDR },
[NHA_ENCAP_TYPE] = { .type = NETLINK_TYPE_U16 },
[NHA_ENCAP] = { .type = NETLINK_TYPE_NESTED },
[NHA_GROUPS] = { .type = NETLINK_TYPE_FLAG },
[NHA_MASTER] = { .type = NETLINK_TYPE_U32 },
[NHA_FDB] = { .type = NETLINK_TYPE_FLAG },
};
static const NLTypeSystem rtnl_nexthop_type_system = {