diff options
Diffstat (limited to 'src/expr/target.c')
| -rw-r--r-- | src/expr/target.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/expr/target.c b/src/expr/target.c index 57d03ea..cbbee60 100644 --- a/src/expr/target.c +++ b/src/expr/target.c @@ -35,7 +35,7 @@ struct nftnl_expr_target { }; static int -nftnl_rule_expr_target_set(struct nftnl_rule_expr *e, uint16_t type, +nftnl_expr_target_set(struct nftnl_expr *e, uint16_t type, const void *data, uint32_t data_len) { struct nftnl_expr_target *tg = nftnl_expr_data(e); @@ -62,7 +62,7 @@ nftnl_rule_expr_target_set(struct nftnl_rule_expr *e, uint16_t type, } static const void * -nftnl_rule_expr_target_get(const struct nftnl_rule_expr *e, uint16_t type, +nftnl_expr_target_get(const struct nftnl_expr *e, uint16_t type, uint32_t *data_len) { struct nftnl_expr_target *tg = nftnl_expr_data(e); @@ -81,7 +81,7 @@ nftnl_rule_expr_target_get(const struct nftnl_rule_expr *e, uint16_t type, return NULL; } -static int nftnl_rule_expr_target_cb(const struct nlattr *attr, void *data) +static int nftnl_expr_target_cb(const struct nlattr *attr, void *data) { const struct nlattr **tb = data; int type = mnl_attr_get_type(attr); @@ -109,7 +109,7 @@ static int nftnl_rule_expr_target_cb(const struct nlattr *attr, void *data) } static void -nftnl_rule_expr_target_build(struct nlmsghdr *nlh, struct nftnl_rule_expr *e) +nftnl_expr_target_build(struct nlmsghdr *nlh, struct nftnl_expr *e) { struct nftnl_expr_target *tg = nftnl_expr_data(e); @@ -121,12 +121,12 @@ nftnl_rule_expr_target_build(struct nlmsghdr *nlh, struct nftnl_rule_expr *e) mnl_attr_put(nlh, NFTA_TARGET_INFO, tg->data_len, tg->data); } -static int nftnl_rule_expr_target_parse(struct nftnl_rule_expr *e, struct nlattr *attr) +static int nftnl_expr_target_parse(struct nftnl_expr *e, struct nlattr *attr) { struct nftnl_expr_target *target = nftnl_expr_data(e); struct nlattr *tb[NFTA_TARGET_MAX+1] = {}; - if (mnl_attr_parse_nested(attr, nftnl_rule_expr_target_cb, tb) < 0) + if (mnl_attr_parse_nested(attr, nftnl_expr_target_cb, tb) < 0) return -1; if (tb[NFTA_TARGET_NAME]) { @@ -165,7 +165,7 @@ static int nftnl_rule_expr_target_parse(struct nftnl_rule_expr *e, struct nlattr } static int -nftnl_rule_expr_target_json_parse(struct nftnl_rule_expr *e, json_t *root, +nftnl_expr_target_json_parse(struct nftnl_expr *e, json_t *root, struct nftnl_parse_err *err) { #ifdef JSON_PARSING @@ -173,7 +173,7 @@ nftnl_rule_expr_target_json_parse(struct nftnl_rule_expr *e, json_t *root, name = nftnl_jansson_parse_str(root, "name", err); if (name != NULL) - nftnl_rule_expr_set_str(e, NFTNL_EXPR_TG_NAME, name); + nftnl_expr_set_str(e, NFTNL_EXPR_TG_NAME, name); return 0; #else @@ -183,7 +183,7 @@ nftnl_rule_expr_target_json_parse(struct nftnl_rule_expr *e, json_t *root, } static int -nftnl_rule_expr_target_xml_parse(struct nftnl_rule_expr *e, mxml_node_t *tree, +nftnl_expr_target_xml_parse(struct nftnl_expr *e, mxml_node_t *tree, struct nftnl_parse_err *err) { #ifdef XML_PARSING @@ -192,7 +192,7 @@ nftnl_rule_expr_target_xml_parse(struct nftnl_rule_expr *e, mxml_node_t *tree, name = nftnl_mxml_str_parse(tree, "name", MXML_DESCEND_FIRST, NFTNL_XML_MAND, err); if (name != NULL) - nftnl_rule_expr_set_str(e, NFTNL_EXPR_TG_NAME, name); + nftnl_expr_set_str(e, NFTNL_EXPR_TG_NAME, name); /* tg->info is ignored until other solution is reached */ @@ -204,7 +204,7 @@ nftnl_rule_expr_target_xml_parse(struct nftnl_rule_expr *e, mxml_node_t *tree, } static int nftnl_rule_exp_target_export(char *buf, size_t size, - struct nftnl_rule_expr *e, int type) + struct nftnl_expr *e, int type) { struct nftnl_expr_target *target = nftnl_expr_data(e); NFTNL_BUF_INIT(b, buf, size); @@ -216,8 +216,8 @@ static int nftnl_rule_exp_target_export(char *buf, size_t size, } static int -nftnl_rule_expr_target_snprintf(char *buf, size_t len, uint32_t type, - uint32_t flags, struct nftnl_rule_expr *e) +nftnl_expr_target_snprintf(char *buf, size_t len, uint32_t type, + uint32_t flags, struct nftnl_expr *e) { struct nftnl_expr_target *target = nftnl_expr_data(e); @@ -234,7 +234,7 @@ nftnl_rule_expr_target_snprintf(char *buf, size_t len, uint32_t type, return -1; } -static void nftnl_rule_expr_target_free(struct nftnl_rule_expr *e) +static void nftnl_expr_target_free(struct nftnl_expr *e) { struct nftnl_expr_target *target = nftnl_expr_data(e); @@ -245,12 +245,12 @@ struct expr_ops expr_ops_target = { .name = "target", .alloc_len = sizeof(struct nftnl_expr_target), .max_attr = NFTA_TARGET_MAX, - .free = nftnl_rule_expr_target_free, - .set = nftnl_rule_expr_target_set, - .get = nftnl_rule_expr_target_get, - .parse = nftnl_rule_expr_target_parse, - .build = nftnl_rule_expr_target_build, - .snprintf = nftnl_rule_expr_target_snprintf, - .xml_parse = nftnl_rule_expr_target_xml_parse, - .json_parse = nftnl_rule_expr_target_json_parse, + .free = nftnl_expr_target_free, + .set = nftnl_expr_target_set, + .get = nftnl_expr_target_get, + .parse = nftnl_expr_target_parse, + .build = nftnl_expr_target_build, + .snprintf = nftnl_expr_target_snprintf, + .xml_parse = nftnl_expr_target_xml_parse, + .json_parse = nftnl_expr_target_json_parse, }; |