diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-09-07 17:56:47 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-09-07 20:00:57 +0200 |
commit | 206d98a54305a1178c7d9c5e234699813f8c6f5a (patch) | |
tree | cf4a1335eb6724cfbdb3a8caa5346a78758d9506 /src/expr/bitwise.c | |
parent | 96807c4c05e1e76b8bbf00d874a28a279e7d2840 (diff) |
src: rename nftnl_rule_expr to nftnl_expr
Use a shorter name for this, morever this can be used from sets so the _rule_
is misleading.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/expr/bitwise.c')
-rw-r--r-- | src/expr/bitwise.c | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c index 331fd20..a18aad5 100644 --- a/src/expr/bitwise.c +++ b/src/expr/bitwise.c @@ -30,7 +30,7 @@ struct nftnl_expr_bitwise { }; static int -nftnl_rule_expr_bitwise_set(struct nftnl_rule_expr *e, uint16_t type, +nftnl_expr_bitwise_set(struct nftnl_expr *e, uint16_t type, const void *data, uint32_t data_len) { struct nftnl_expr_bitwise *bitwise = nftnl_expr_data(e); @@ -60,7 +60,7 @@ nftnl_rule_expr_bitwise_set(struct nftnl_rule_expr *e, uint16_t type, } static const void * -nftnl_rule_expr_bitwise_get(const struct nftnl_rule_expr *e, uint16_t type, +nftnl_expr_bitwise_get(const struct nftnl_expr *e, uint16_t type, uint32_t *data_len) { struct nftnl_expr_bitwise *bitwise = nftnl_expr_data(e); @@ -85,7 +85,7 @@ nftnl_rule_expr_bitwise_get(const struct nftnl_rule_expr *e, uint16_t type, return NULL; } -static int nftnl_rule_expr_bitwise_cb(const struct nlattr *attr, void *data) +static int nftnl_expr_bitwise_cb(const struct nlattr *attr, void *data) { const struct nlattr **tb = data; int type = mnl_attr_get_type(attr); @@ -112,7 +112,7 @@ static int nftnl_rule_expr_bitwise_cb(const struct nlattr *attr, void *data) } static void -nftnl_rule_expr_bitwise_build(struct nlmsghdr *nlh, struct nftnl_rule_expr *e) +nftnl_expr_bitwise_build(struct nlmsghdr *nlh, struct nftnl_expr *e) { struct nftnl_expr_bitwise *bitwise = nftnl_expr_data(e); @@ -141,13 +141,13 @@ nftnl_rule_expr_bitwise_build(struct nlmsghdr *nlh, struct nftnl_rule_expr *e) } static int -nftnl_rule_expr_bitwise_parse(struct nftnl_rule_expr *e, struct nlattr *attr) +nftnl_expr_bitwise_parse(struct nftnl_expr *e, struct nlattr *attr) { struct nftnl_expr_bitwise *bitwise = nftnl_expr_data(e); struct nlattr *tb[NFTA_BITWISE_MAX+1] = {}; int ret = 0; - if (mnl_attr_parse_nested(attr, nftnl_rule_expr_bitwise_cb, tb) < 0) + if (mnl_attr_parse_nested(attr, nftnl_expr_bitwise_cb, tb) < 0) return -1; if (tb[NFTA_BITWISE_SREG]) { @@ -175,7 +175,7 @@ nftnl_rule_expr_bitwise_parse(struct nftnl_rule_expr *e, struct nlattr *attr) } static int -nftnl_rule_expr_bitwise_json_parse(struct nftnl_rule_expr *e, json_t *root, +nftnl_expr_bitwise_json_parse(struct nftnl_expr *e, json_t *root, struct nftnl_parse_err *err) { #ifdef JSON_PARSING @@ -183,13 +183,13 @@ nftnl_rule_expr_bitwise_json_parse(struct nftnl_rule_expr *e, json_t *root, uint32_t reg, len; if (nftnl_jansson_parse_reg(root, "sreg", NFTNL_TYPE_U32, ®, err) == 0) - nftnl_rule_expr_set_u32(e, NFTNL_EXPR_BITWISE_SREG, reg); + nftnl_expr_set_u32(e, NFTNL_EXPR_BITWISE_SREG, reg); if (nftnl_jansson_parse_reg(root, "dreg", NFTNL_TYPE_U32, ®, err) == 0) - nftnl_rule_expr_set_u32(e, NFTNL_EXPR_BITWISE_DREG, reg); + nftnl_expr_set_u32(e, NFTNL_EXPR_BITWISE_DREG, reg); if (nftnl_jansson_parse_val(root, "len", NFTNL_TYPE_U32, &len, err) == 0) - nftnl_rule_expr_set_u32(e, NFTNL_EXPR_BITWISE_LEN, len); + nftnl_expr_set_u32(e, NFTNL_EXPR_BITWISE_LEN, len); if (nftnl_jansson_data_reg_parse(root, "mask", &bitwise->mask, err) == DATA_VALUE) @@ -210,7 +210,7 @@ nftnl_rule_expr_bitwise_json_parse(struct nftnl_rule_expr *e, json_t *root, } static int -nftnl_rule_expr_bitwise_xml_parse(struct nftnl_rule_expr *e, mxml_node_t *tree, +nftnl_expr_bitwise_xml_parse(struct nftnl_expr *e, mxml_node_t *tree, struct nftnl_parse_err *err) { #ifdef XML_PARSING @@ -219,15 +219,15 @@ nftnl_rule_expr_bitwise_xml_parse(struct nftnl_rule_expr *e, mxml_node_t *tree, if (nftnl_mxml_reg_parse(tree, "sreg", &sreg, MXML_DESCEND_FIRST, NFTNL_XML_MAND, err) == 0) - nftnl_rule_expr_set_u32(e, NFTNL_EXPR_BITWISE_SREG, sreg); + nftnl_expr_set_u32(e, NFTNL_EXPR_BITWISE_SREG, sreg); if (nftnl_mxml_reg_parse(tree, "dreg", &dreg, MXML_DESCEND_FIRST, NFTNL_XML_MAND, err) == 0) - nftnl_rule_expr_set_u32(e, NFTNL_EXPR_BITWISE_DREG, dreg); + nftnl_expr_set_u32(e, NFTNL_EXPR_BITWISE_DREG, dreg); if (nftnl_mxml_num_parse(tree, "len", MXML_DESCEND_FIRST, BASE_DEC, &len, NFTNL_TYPE_U32, NFTNL_XML_MAND, err) == 0) - nftnl_rule_expr_set_u32(e, NFTNL_EXPR_BITWISE_LEN, len); + nftnl_expr_set_u32(e, NFTNL_EXPR_BITWISE_LEN, len); if (nftnl_mxml_data_reg_parse(tree, "mask", &bitwise->mask, NFTNL_XML_MAND, err) == DATA_VALUE) @@ -250,8 +250,8 @@ nftnl_rule_expr_bitwise_xml_parse(struct nftnl_rule_expr *e, mxml_node_t *tree, #endif } -static int nftnl_rule_expr_bitwise_export(char *buf, size_t size, - struct nftnl_rule_expr *e, int type) +static int nftnl_expr_bitwise_export(char *buf, size_t size, + struct nftnl_expr *e, int type) { struct nftnl_expr_bitwise *bitwise = nftnl_expr_data(e); NFTNL_BUF_INIT(b, buf, size); @@ -270,8 +270,8 @@ static int nftnl_rule_expr_bitwise_export(char *buf, size_t size, return nftnl_buf_done(&b); } -static int nftnl_rule_expr_bitwise_snprintf_default(char *buf, size_t size, - struct nftnl_rule_expr *e) +static int nftnl_expr_bitwise_snprintf_default(char *buf, size_t size, + struct nftnl_expr *e) { struct nftnl_expr_bitwise *bitwise = nftnl_expr_data(e); int len = size, offset = 0, ret; @@ -295,15 +295,15 @@ static int nftnl_rule_expr_bitwise_snprintf_default(char *buf, size_t size, } static int -nftnl_rule_expr_bitwise_snprintf(char *buf, size_t size, uint32_t type, - uint32_t flags, struct nftnl_rule_expr *e) +nftnl_expr_bitwise_snprintf(char *buf, size_t size, uint32_t type, + uint32_t flags, struct nftnl_expr *e) { switch (type) { case NFTNL_OUTPUT_DEFAULT: - return nftnl_rule_expr_bitwise_snprintf_default(buf, size, e); + return nftnl_expr_bitwise_snprintf_default(buf, size, e); case NFTNL_OUTPUT_XML: case NFTNL_OUTPUT_JSON: - return nftnl_rule_expr_bitwise_export(buf, size, e, type); + return nftnl_expr_bitwise_export(buf, size, e, type); default: break; } @@ -314,11 +314,11 @@ struct expr_ops expr_ops_bitwise = { .name = "bitwise", .alloc_len = sizeof(struct nftnl_expr_bitwise), .max_attr = NFTA_BITWISE_MAX, - .set = nftnl_rule_expr_bitwise_set, - .get = nftnl_rule_expr_bitwise_get, - .parse = nftnl_rule_expr_bitwise_parse, - .build = nftnl_rule_expr_bitwise_build, - .snprintf = nftnl_rule_expr_bitwise_snprintf, - .xml_parse = nftnl_rule_expr_bitwise_xml_parse, - .json_parse = nftnl_rule_expr_bitwise_json_parse, + .set = nftnl_expr_bitwise_set, + .get = nftnl_expr_bitwise_get, + .parse = nftnl_expr_bitwise_parse, + .build = nftnl_expr_bitwise_build, + .snprintf = nftnl_expr_bitwise_snprintf, + .xml_parse = nftnl_expr_bitwise_xml_parse, + .json_parse = nftnl_expr_bitwise_json_parse, }; |