From 206d98a54305a1178c7d9c5e234699813f8c6f5a Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Mon, 7 Sep 2015 17:56:47 +0200 Subject: 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 --- src/expr/byteorder.c | 66 ++++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'src/expr/byteorder.c') diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c index c37e56d..f16bbf7 100644 --- a/src/expr/byteorder.c +++ b/src/expr/byteorder.c @@ -30,7 +30,7 @@ struct nftnl_expr_byteorder { }; static int -nftnl_rule_expr_byteorder_set(struct nftnl_rule_expr *e, uint16_t type, +nftnl_expr_byteorder_set(struct nftnl_expr *e, uint16_t type, const void *data, uint32_t data_len) { struct nftnl_expr_byteorder *byteorder = nftnl_expr_data(e); @@ -58,7 +58,7 @@ nftnl_rule_expr_byteorder_set(struct nftnl_rule_expr *e, uint16_t type, } static const void * -nftnl_rule_expr_byteorder_get(const struct nftnl_rule_expr *e, uint16_t type, +nftnl_expr_byteorder_get(const struct nftnl_expr *e, uint16_t type, uint32_t *data_len) { struct nftnl_expr_byteorder *byteorder = nftnl_expr_data(e); @@ -83,7 +83,7 @@ nftnl_rule_expr_byteorder_get(const struct nftnl_rule_expr *e, uint16_t type, return NULL; } -static int nftnl_rule_expr_byteorder_cb(const struct nlattr *attr, void *data) +static int nftnl_expr_byteorder_cb(const struct nlattr *attr, void *data) { const struct nlattr **tb = data; int type = mnl_attr_get_type(attr); @@ -107,7 +107,7 @@ static int nftnl_rule_expr_byteorder_cb(const struct nlattr *attr, void *data) } static void -nftnl_rule_expr_byteorder_build(struct nlmsghdr *nlh, struct nftnl_rule_expr *e) +nftnl_expr_byteorder_build(struct nlmsghdr *nlh, struct nftnl_expr *e) { struct nftnl_expr_byteorder *byteorder = nftnl_expr_data(e); @@ -134,13 +134,13 @@ nftnl_rule_expr_byteorder_build(struct nlmsghdr *nlh, struct nftnl_rule_expr *e) } static int -nftnl_rule_expr_byteorder_parse(struct nftnl_rule_expr *e, struct nlattr *attr) +nftnl_expr_byteorder_parse(struct nftnl_expr *e, struct nlattr *attr) { struct nftnl_expr_byteorder *byteorder = nftnl_expr_data(e); struct nlattr *tb[NFTA_BYTEORDER_MAX+1] = {}; int ret = 0; - if (mnl_attr_parse_nested(attr, nftnl_rule_expr_byteorder_cb, tb) < 0) + if (mnl_attr_parse_nested(attr, nftnl_expr_byteorder_cb, tb) < 0) return -1; if (tb[NFTA_BYTEORDER_SREG]) { @@ -198,7 +198,7 @@ static inline int nftnl_str2ntoh(const char *op) } static int -nftnl_rule_expr_byteorder_json_parse(struct nftnl_rule_expr *e, json_t *root, +nftnl_expr_byteorder_json_parse(struct nftnl_expr *e, json_t *root, struct nftnl_parse_err *err) { #ifdef JSON_PARSING @@ -207,10 +207,10 @@ nftnl_rule_expr_byteorder_json_parse(struct nftnl_rule_expr *e, json_t *root, int ntoh; if (nftnl_jansson_parse_reg(root, "sreg", NFTNL_TYPE_U32, &sreg, err) == 0) - nftnl_rule_expr_set_u32(e, NFTNL_EXPR_BYTEORDER_SREG, sreg); + nftnl_expr_set_u32(e, NFTNL_EXPR_BYTEORDER_SREG, sreg); if (nftnl_jansson_parse_reg(root, "dreg", NFTNL_TYPE_U32, &dreg, err) == 0) - nftnl_rule_expr_set_u32(e, NFTNL_EXPR_BYTEORDER_DREG, dreg); + nftnl_expr_set_u32(e, NFTNL_EXPR_BYTEORDER_DREG, dreg); op = nftnl_jansson_parse_str(root, "op", err); if (op != NULL) { @@ -218,14 +218,14 @@ nftnl_rule_expr_byteorder_json_parse(struct nftnl_rule_expr *e, json_t *root, if (ntoh < 0) return -1; - nftnl_rule_expr_set_u32(e, NFTNL_EXPR_BYTEORDER_OP, ntoh); + nftnl_expr_set_u32(e, NFTNL_EXPR_BYTEORDER_OP, ntoh); } if (nftnl_jansson_parse_val(root, "len", NFTNL_TYPE_U32, &len, err) == 0) - nftnl_rule_expr_set_u32(e, NFTNL_EXPR_BYTEORDER_LEN, len); + nftnl_expr_set_u32(e, NFTNL_EXPR_BYTEORDER_LEN, len); if (nftnl_jansson_parse_val(root, "size", NFTNL_TYPE_U32, &size, err) == 0) - nftnl_rule_expr_set_u32(e, NFTNL_EXPR_BYTEORDER_SIZE, size); + nftnl_expr_set_u32(e, NFTNL_EXPR_BYTEORDER_SIZE, size); return 0; #else @@ -235,7 +235,7 @@ nftnl_rule_expr_byteorder_json_parse(struct nftnl_rule_expr *e, json_t *root, } static int -nftnl_rule_expr_byteorder_xml_parse(struct nftnl_rule_expr *e, mxml_node_t *tree, +nftnl_expr_byteorder_xml_parse(struct nftnl_expr *e, mxml_node_t *tree, struct nftnl_parse_err *err) { #ifdef XML_PARSING @@ -245,11 +245,11 @@ nftnl_rule_expr_byteorder_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_BYTEORDER_SREG, sreg); + nftnl_expr_set_u32(e, NFTNL_EXPR_BYTEORDER_SREG, sreg); if (nftnl_mxml_reg_parse(tree, "dreg", &dreg, MXML_DESCEND, NFTNL_XML_MAND, err) == 0) - nftnl_rule_expr_set_u32(e, NFTNL_EXPR_BYTEORDER_DREG, dreg); + nftnl_expr_set_u32(e, NFTNL_EXPR_BYTEORDER_DREG, dreg); op = nftnl_mxml_str_parse(tree, "op", MXML_DESCEND_FIRST, NFTNL_XML_MAND, err); @@ -258,16 +258,16 @@ nftnl_rule_expr_byteorder_xml_parse(struct nftnl_rule_expr *e, mxml_node_t *tree if (ntoh < 0) return -1; - nftnl_rule_expr_set_u32(e, NFTNL_EXPR_BYTEORDER_OP, ntoh); + nftnl_expr_set_u32(e, NFTNL_EXPR_BYTEORDER_OP, ntoh); } 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_BYTEORDER_LEN, len); + nftnl_expr_set_u32(e, NFTNL_EXPR_BYTEORDER_LEN, len); if (nftnl_mxml_num_parse(tree, "size", MXML_DESCEND_FIRST, BASE_DEC, &size, NFTNL_TYPE_U32, NFTNL_XML_MAND, err) == 0) - nftnl_rule_expr_set_u32(e, NFTNL_EXPR_BYTEORDER_SIZE, size); + nftnl_expr_set_u32(e, NFTNL_EXPR_BYTEORDER_SIZE, size); return 0; #else @@ -276,8 +276,8 @@ nftnl_rule_expr_byteorder_xml_parse(struct nftnl_rule_expr *e, mxml_node_t *tree #endif } -static int nftnl_rule_expr_byteorder_export(char *buf, size_t size, - struct nftnl_rule_expr *e, int type) +static int nftnl_expr_byteorder_export(char *buf, size_t size, + struct nftnl_expr *e, int type) { struct nftnl_expr_byteorder *byteorder = nftnl_expr_data(e); NFTNL_BUF_INIT(b, buf, size); @@ -296,8 +296,8 @@ static int nftnl_rule_expr_byteorder_export(char *buf, size_t size, return nftnl_buf_done(&b); } -static int nftnl_rule_expr_byteorder_snprintf_default(char *buf, size_t size, - struct nftnl_rule_expr *e) +static int nftnl_expr_byteorder_snprintf_default(char *buf, size_t size, + struct nftnl_expr *e) { struct nftnl_expr_byteorder *byteorder = nftnl_expr_data(e); int len = size, offset = 0, ret; @@ -311,15 +311,15 @@ static int nftnl_rule_expr_byteorder_snprintf_default(char *buf, size_t size, } static int -nftnl_rule_expr_byteorder_snprintf(char *buf, size_t size, uint32_t type, - uint32_t flags, struct nftnl_rule_expr *e) +nftnl_expr_byteorder_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_byteorder_snprintf_default(buf, size, e); + return nftnl_expr_byteorder_snprintf_default(buf, size, e); case NFTNL_OUTPUT_XML: case NFTNL_OUTPUT_JSON: - return nftnl_rule_expr_byteorder_export(buf, size, e, type); + return nftnl_expr_byteorder_export(buf, size, e, type); default: break; } @@ -330,11 +330,11 @@ struct expr_ops expr_ops_byteorder = { .name = "byteorder", .alloc_len = sizeof(struct nftnl_expr_byteorder), .max_attr = NFTA_BYTEORDER_MAX, - .set = nftnl_rule_expr_byteorder_set, - .get = nftnl_rule_expr_byteorder_get, - .parse = nftnl_rule_expr_byteorder_parse, - .build = nftnl_rule_expr_byteorder_build, - .snprintf = nftnl_rule_expr_byteorder_snprintf, - .xml_parse = nftnl_rule_expr_byteorder_xml_parse, - .json_parse = nftnl_rule_expr_byteorder_json_parse, + .set = nftnl_expr_byteorder_set, + .get = nftnl_expr_byteorder_get, + .parse = nftnl_expr_byteorder_parse, + .build = nftnl_expr_byteorder_build, + .snprintf = nftnl_expr_byteorder_snprintf, + .xml_parse = nftnl_expr_byteorder_xml_parse, + .json_parse = nftnl_expr_byteorder_json_parse, }; -- cgit v1.2.3