diff options
Diffstat (limited to 'src/expr/counter.c')
| -rw-r--r-- | src/expr/counter.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/src/expr/counter.c b/src/expr/counter.c index b5a9644..4b5fb3f 100644 --- a/src/expr/counter.c +++ b/src/expr/counter.c @@ -28,7 +28,7 @@ struct nftnl_expr_counter { }; static int -nftnl_rule_expr_counter_set(struct nftnl_rule_expr *e, uint16_t type, +nftnl_expr_counter_set(struct nftnl_expr *e, uint16_t type, const void *data, uint32_t data_len) { struct nftnl_expr_counter *ctr = nftnl_expr_data(e); @@ -47,7 +47,7 @@ nftnl_rule_expr_counter_set(struct nftnl_rule_expr *e, uint16_t type, } static const void * -nftnl_rule_expr_counter_get(const struct nftnl_rule_expr *e, uint16_t type, +nftnl_expr_counter_get(const struct nftnl_expr *e, uint16_t type, uint32_t *data_len) { struct nftnl_expr_counter *ctr = nftnl_expr_data(e); @@ -63,7 +63,7 @@ nftnl_rule_expr_counter_get(const struct nftnl_rule_expr *e, uint16_t type, return NULL; } -static int nftnl_rule_expr_counter_cb(const struct nlattr *attr, void *data) +static int nftnl_expr_counter_cb(const struct nlattr *attr, void *data) { const struct nlattr **tb = data; int type = mnl_attr_get_type(attr); @@ -84,7 +84,7 @@ static int nftnl_rule_expr_counter_cb(const struct nlattr *attr, void *data) } static void -nftnl_rule_expr_counter_build(struct nlmsghdr *nlh, struct nftnl_rule_expr *e) +nftnl_expr_counter_build(struct nlmsghdr *nlh, struct nftnl_expr *e) { struct nftnl_expr_counter *ctr = nftnl_expr_data(e); @@ -95,12 +95,12 @@ nftnl_rule_expr_counter_build(struct nlmsghdr *nlh, struct nftnl_rule_expr *e) } static int -nftnl_rule_expr_counter_parse(struct nftnl_rule_expr *e, struct nlattr *attr) +nftnl_expr_counter_parse(struct nftnl_expr *e, struct nlattr *attr) { struct nftnl_expr_counter *ctr = nftnl_expr_data(e); struct nlattr *tb[NFTA_COUNTER_MAX+1] = {}; - if (mnl_attr_parse_nested(attr, nftnl_rule_expr_counter_cb, tb) < 0) + if (mnl_attr_parse_nested(attr, nftnl_expr_counter_cb, tb) < 0) return -1; if (tb[NFTA_COUNTER_BYTES]) { @@ -116,7 +116,7 @@ nftnl_rule_expr_counter_parse(struct nftnl_rule_expr *e, struct nlattr *attr) } static int -nftnl_rule_expr_counter_json_parse(struct nftnl_rule_expr *e, json_t *root, +nftnl_expr_counter_json_parse(struct nftnl_expr *e, json_t *root, struct nftnl_parse_err *err) { #ifdef JSON_PARSING @@ -124,11 +124,11 @@ nftnl_rule_expr_counter_json_parse(struct nftnl_rule_expr *e, json_t *root, if (nftnl_jansson_parse_val(root, "pkts", NFTNL_TYPE_U64, &uval64, err) == 0) - nftnl_rule_expr_set_u64(e, NFTNL_EXPR_CTR_PACKETS, uval64); + nftnl_expr_set_u64(e, NFTNL_EXPR_CTR_PACKETS, uval64); if (nftnl_jansson_parse_val(root, "bytes", NFTNL_TYPE_U64, &uval64, err) == 0) - nftnl_rule_expr_set_u64(e, NFTNL_EXPR_CTR_BYTES, uval64); + nftnl_expr_set_u64(e, NFTNL_EXPR_CTR_BYTES, uval64); return 0; #else @@ -138,7 +138,7 @@ nftnl_rule_expr_counter_json_parse(struct nftnl_rule_expr *e, json_t *root, } static int -nftnl_rule_expr_counter_xml_parse(struct nftnl_rule_expr *e, mxml_node_t *tree, +nftnl_expr_counter_xml_parse(struct nftnl_expr *e, mxml_node_t *tree, struct nftnl_parse_err *err) { #ifdef XML_PARSING @@ -146,11 +146,11 @@ nftnl_rule_expr_counter_xml_parse(struct nftnl_rule_expr *e, mxml_node_t *tree, if (nftnl_mxml_num_parse(tree, "pkts", MXML_DESCEND_FIRST, BASE_DEC, &pkts, NFTNL_TYPE_U64, NFTNL_XML_MAND, err) == 0) - nftnl_rule_expr_set_u64(e, NFTNL_EXPR_CTR_PACKETS, pkts); + nftnl_expr_set_u64(e, NFTNL_EXPR_CTR_PACKETS, pkts); if (nftnl_mxml_num_parse(tree, "bytes", MXML_DESCEND_FIRST, BASE_DEC, &bytes, NFTNL_TYPE_U64, NFTNL_XML_MAND, err) == 0) - nftnl_rule_expr_set_u64(e, NFTNL_EXPR_CTR_BYTES, bytes); + nftnl_expr_set_u64(e, NFTNL_EXPR_CTR_BYTES, bytes); return 0; #else @@ -159,8 +159,8 @@ nftnl_rule_expr_counter_xml_parse(struct nftnl_rule_expr *e, mxml_node_t *tree, #endif } -static int nftnl_rule_expr_counter_export(char *buf, size_t size, - struct nftnl_rule_expr *e, int type) +static int nftnl_expr_counter_export(char *buf, size_t size, + struct nftnl_expr *e, int type) { struct nftnl_expr_counter *ctr = nftnl_expr_data(e); NFTNL_BUF_INIT(b, buf, size); @@ -173,8 +173,8 @@ static int nftnl_rule_expr_counter_export(char *buf, size_t size, return nftnl_buf_done(&b); } -static int nftnl_rule_expr_counter_snprintf_default(char *buf, size_t len, - struct nftnl_rule_expr *e) +static int nftnl_expr_counter_snprintf_default(char *buf, size_t len, + struct nftnl_expr *e) { struct nftnl_expr_counter *ctr = nftnl_expr_data(e); @@ -182,16 +182,16 @@ static int nftnl_rule_expr_counter_snprintf_default(char *buf, size_t len, ctr->pkts, ctr->bytes); } -static int nftnl_rule_expr_counter_snprintf(char *buf, size_t len, uint32_t type, +static int nftnl_expr_counter_snprintf(char *buf, size_t len, uint32_t type, uint32_t flags, - struct nftnl_rule_expr *e) + struct nftnl_expr *e) { switch (type) { case NFTNL_OUTPUT_DEFAULT: - return nftnl_rule_expr_counter_snprintf_default(buf, len, e); + return nftnl_expr_counter_snprintf_default(buf, len, e); case NFTNL_OUTPUT_XML: case NFTNL_OUTPUT_JSON: - return nftnl_rule_expr_counter_export(buf, len, e, type); + return nftnl_expr_counter_export(buf, len, e, type); default: break; } @@ -202,11 +202,11 @@ struct expr_ops expr_ops_counter = { .name = "counter", .alloc_len = sizeof(struct nftnl_expr_counter), .max_attr = NFTA_COUNTER_MAX, - .set = nftnl_rule_expr_counter_set, - .get = nftnl_rule_expr_counter_get, - .parse = nftnl_rule_expr_counter_parse, - .build = nftnl_rule_expr_counter_build, - .snprintf = nftnl_rule_expr_counter_snprintf, - .xml_parse = nftnl_rule_expr_counter_xml_parse, - .json_parse = nftnl_rule_expr_counter_json_parse, + .set = nftnl_expr_counter_set, + .get = nftnl_expr_counter_get, + .parse = nftnl_expr_counter_parse, + .build = nftnl_expr_counter_build, + .snprintf = nftnl_expr_counter_snprintf, + .xml_parse = nftnl_expr_counter_xml_parse, + .json_parse = nftnl_expr_counter_json_parse, }; |