if (r < 0)
return r;
- r = sd_netlink_message_append_string(m, type_system_union->match, key);
+ r = sd_netlink_message_append_string(m, type_system_union_get_match_attribute(type_system_union), key);
if (r < 0)
return r;
if (r < 0)
return r;
- switch (type_system_union->match_type) {
- case NL_MATCH_SIBLING:
- {
+ switch (type_system_union_get_match_type(type_system_union)) {
+ case NL_MATCH_SIBLING: {
const char *key;
- r = sd_netlink_message_read_string(m, type_system_union->match, &key);
+ r = sd_netlink_message_read_string(
+ m,
+ type_system_union_get_match_attribute(type_system_union),
+ &key);
if (r < 0)
return r;
break;
}
- case NL_MATCH_PROTOCOL:
- {
+ case NL_MATCH_PROTOCOL: {
int family;
r = sd_rtnl_message_get_family(m, &family);
const NLType *types;
};
+struct NLTypeSystemUnion {
+ int num;
+ NLMatchType match_type;
+ uint16_t match_attribute;
+ int (*lookup)(const char *);
+ const NLTypeSystem *type_systems;
+};
+
static const NLTypeSystem rtnl_link_type_system;
static const NLType empty_types[1] = {
.lookup = nl_union_link_info_data_from_string,
.type_systems = rtnl_link_info_data_type_systems,
.match_type = NL_MATCH_SIBLING,
- .match = IFLA_INFO_KIND,
+ .match_attribute = IFLA_INFO_KIND,
};
static const NLType rtnl_link_info_types[] = {
.lookup = nl_union_tca_option_data_from_string,
.type_systems = rtnl_tca_option_data_type_systems,
.match_type = NL_MATCH_SIBLING,
- .match = TCA_KIND,
+ .match_attribute = TCA_KIND,
};
static const NLType rtnl_tca_types[] = {
.lookup = nl_union_nft_expr_data_from_string,
.type_systems = nfnl_expr_data_type_systems,
.match_type = NL_MATCH_SIBLING,
- .match = NFTA_EXPR_NAME,
+ .match_attribute = NFTA_EXPR_NAME,
};
static const NLType nfnl_nft_rule_expr_types[] = {
return 0;
}
+NLMatchType type_system_union_get_match_type(const NLTypeSystemUnion *type_system_union) {
+ assert(type_system_union);
+ return type_system_union->match_type;
+}
+
+uint16_t type_system_union_get_match_attribute(const NLTypeSystemUnion *type_system_union) {
+ assert(type_system_union);
+ assert(type_system_union->match_type == NL_MATCH_SIBLING);
+ return type_system_union->match_attribute;
+}
+
int type_system_union_get_type_system_by_string(const NLTypeSystemUnion *type_system_union, const NLTypeSystem **ret, const char *key) {
int type;
typedef struct NLTypeSystem NLTypeSystem;
typedef struct NLType NLType;
-struct NLTypeSystemUnion {
- int num;
- NLMatchType match_type;
- uint16_t match;
- int (*lookup)(const char *);
- const NLTypeSystem *type_systems;
-};
-
extern const NLTypeSystem genl_family_type_system_root;
uint16_t type_get_type(const NLType *type);
int type_system_get_type(const NLTypeSystem *type_system, const NLType **ret, uint16_t type);
int type_system_get_type_system(const NLTypeSystem *type_system, const NLTypeSystem **ret, uint16_t type);
int type_system_get_type_system_union(const NLTypeSystem *type_system, const NLTypeSystemUnion **ret, uint16_t type);
+NLMatchType type_system_union_get_match_type(const NLTypeSystemUnion *type_system_union);
+uint16_t type_system_union_get_match_attribute(const NLTypeSystemUnion *type_system_union);
int type_system_union_get_type_system_by_string(const NLTypeSystemUnion *type_system_union, const NLTypeSystem **ret, const char *key);
int type_system_union_get_type_system_by_protocol(const NLTypeSystemUnion *type_system_union, const NLTypeSystem **ret, uint16_t protocol);