From 760768890e60617acfd144dce875a4a3be14513c Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 1 Sep 2015 20:19:56 +0200 Subject: src: rename existing functions to use the nftnl_ prefix So we can use the nft_* prefix anytime soon for our upcoming higher level library. After this patch, the nft_* symbols become an alias of the nftnl_* symbols. Signed-off-by: Pablo Neira Ayuso --- src/expr/dynset.c | 218 +++++++++++++++++++++++++++--------------------------- 1 file changed, 109 insertions(+), 109 deletions(-) (limited to 'src/expr/dynset.c') diff --git a/src/expr/dynset.c b/src/expr/dynset.c index e3fecf5..ffb3882 100644 --- a/src/expr/dynset.c +++ b/src/expr/dynset.c @@ -26,43 +26,43 @@ #define IFNAMSIZ 16 #endif -struct nft_expr_dynset { +struct nftnl_expr_dynset { enum nft_registers sreg_key; enum nft_registers sreg_data; enum nft_dynset_ops op; uint64_t timeout; - struct nft_rule_expr *expr; + struct nftnl_rule_expr *expr; char set_name[IFNAMSIZ]; uint32_t set_id; }; static int -nft_rule_expr_dynset_set(struct nft_rule_expr *e, uint16_t type, +nftnl_rule_expr_dynset_set(struct nftnl_rule_expr *e, uint16_t type, const void *data, uint32_t data_len) { - struct nft_expr_dynset *dynset = nft_expr_data(e); + struct nftnl_expr_dynset *dynset = nftnl_expr_data(e); switch (type) { - case NFT_EXPR_DYNSET_SREG_KEY: + case NFTNL_EXPR_DYNSET_SREG_KEY: dynset->sreg_key = *((uint32_t *)data); break; - case NFT_EXPR_DYNSET_SREG_DATA: + case NFTNL_EXPR_DYNSET_SREG_DATA: dynset->sreg_data = *((uint32_t *)data); break; - case NFT_EXPR_DYNSET_OP: + case NFTNL_EXPR_DYNSET_OP: dynset->op = *((uint32_t *)data); break; - case NFT_EXPR_DYNSET_TIMEOUT: + case NFTNL_EXPR_DYNSET_TIMEOUT: dynset->timeout = *((uint64_t *)data); break; - case NFT_EXPR_DYNSET_SET_NAME: + case NFTNL_EXPR_DYNSET_SET_NAME: snprintf(dynset->set_name, sizeof(dynset->set_name), "%s", (const char *)data); break; - case NFT_EXPR_DYNSET_SET_ID: + case NFTNL_EXPR_DYNSET_SET_ID: dynset->set_id = *((uint32_t *)data); break; - case NFT_EXPR_DYNSET_EXPR: + case NFTNL_EXPR_DYNSET_EXPR: dynset->expr = (void *)data; break; default: @@ -72,35 +72,35 @@ nft_rule_expr_dynset_set(struct nft_rule_expr *e, uint16_t type, } static const void * -nft_rule_expr_dynset_get(const struct nft_rule_expr *e, uint16_t type, +nftnl_rule_expr_dynset_get(const struct nftnl_rule_expr *e, uint16_t type, uint32_t *data_len) { - struct nft_expr_dynset *dynset = nft_expr_data(e); + struct nftnl_expr_dynset *dynset = nftnl_expr_data(e); switch (type) { - case NFT_EXPR_DYNSET_SREG_KEY: + case NFTNL_EXPR_DYNSET_SREG_KEY: *data_len = sizeof(dynset->sreg_key); return &dynset->sreg_key; - case NFT_EXPR_DYNSET_SREG_DATA: + case NFTNL_EXPR_DYNSET_SREG_DATA: *data_len = sizeof(dynset->sreg_data); return &dynset->sreg_data; - case NFT_EXPR_DYNSET_OP: + case NFTNL_EXPR_DYNSET_OP: *data_len = sizeof(dynset->op); return &dynset->op; - case NFT_EXPR_DYNSET_TIMEOUT: + case NFTNL_EXPR_DYNSET_TIMEOUT: *data_len = sizeof(dynset->timeout); return &dynset->timeout; - case NFT_EXPR_DYNSET_SET_NAME: + case NFTNL_EXPR_DYNSET_SET_NAME: return dynset->set_name; - case NFT_EXPR_DYNSET_SET_ID: + case NFTNL_EXPR_DYNSET_SET_ID: return &dynset->set_id; - case NFT_EXPR_DYNSET_EXPR: + case NFTNL_EXPR_DYNSET_EXPR: return dynset->expr; } return NULL; } -static int nft_rule_expr_dynset_cb(const struct nlattr *attr, void *data) +static int nftnl_rule_expr_dynset_cb(const struct nlattr *attr, void *data) { const struct nlattr **tb = data; int type = mnl_attr_get_type(attr); @@ -135,67 +135,67 @@ static int nft_rule_expr_dynset_cb(const struct nlattr *attr, void *data) } static void -nft_rule_expr_dynset_build(struct nlmsghdr *nlh, struct nft_rule_expr *e) +nftnl_rule_expr_dynset_build(struct nlmsghdr *nlh, struct nftnl_rule_expr *e) { - struct nft_expr_dynset *dynset = nft_expr_data(e); + struct nftnl_expr_dynset *dynset = nftnl_expr_data(e); struct nlattr *nest; - if (e->flags & (1 << NFT_EXPR_DYNSET_SREG_KEY)) + if (e->flags & (1 << NFTNL_EXPR_DYNSET_SREG_KEY)) mnl_attr_put_u32(nlh, NFTA_DYNSET_SREG_KEY, htonl(dynset->sreg_key)); - if (e->flags & (1 << NFT_EXPR_DYNSET_SREG_DATA)) + if (e->flags & (1 << NFTNL_EXPR_DYNSET_SREG_DATA)) mnl_attr_put_u32(nlh, NFTA_DYNSET_SREG_DATA, htonl(dynset->sreg_data)); - if (e->flags & (1 << NFT_EXPR_DYNSET_OP)) + if (e->flags & (1 << NFTNL_EXPR_DYNSET_OP)) mnl_attr_put_u32(nlh, NFTA_DYNSET_OP, htonl(dynset->op)); - if (e->flags & (1 << NFT_EXPR_DYNSET_TIMEOUT)) + if (e->flags & (1 << NFTNL_EXPR_DYNSET_TIMEOUT)) mnl_attr_put_u64(nlh, NFTA_DYNSET_TIMEOUT, htobe64(dynset->timeout)); - if (e->flags & (1 << NFT_EXPR_DYNSET_SET_NAME)) + if (e->flags & (1 << NFTNL_EXPR_DYNSET_SET_NAME)) mnl_attr_put_strz(nlh, NFTA_DYNSET_SET_NAME, dynset->set_name); - if (e->flags & (1 << NFT_EXPR_DYNSET_SET_ID)) + if (e->flags & (1 << NFTNL_EXPR_DYNSET_SET_ID)) mnl_attr_put_u32(nlh, NFTA_DYNSET_SET_ID, htonl(dynset->set_id)); - if (e->flags & (1 << NFT_EXPR_DYNSET_EXPR)) { + if (e->flags & (1 << NFTNL_EXPR_DYNSET_EXPR)) { nest = mnl_attr_nest_start(nlh, NFTA_DYNSET_EXPR); - nft_rule_expr_build_payload(nlh, dynset->expr); + nftnl_rule_expr_build_payload(nlh, dynset->expr); mnl_attr_nest_end(nlh, nest); } } static int -nft_rule_expr_dynset_parse(struct nft_rule_expr *e, struct nlattr *attr) +nftnl_rule_expr_dynset_parse(struct nftnl_rule_expr *e, struct nlattr *attr) { - struct nft_expr_dynset *dynset = nft_expr_data(e); + struct nftnl_expr_dynset *dynset = nftnl_expr_data(e); struct nlattr *tb[NFTA_SET_MAX+1] = {}; int ret = 0; - if (mnl_attr_parse_nested(attr, nft_rule_expr_dynset_cb, tb) < 0) + if (mnl_attr_parse_nested(attr, nftnl_rule_expr_dynset_cb, tb) < 0) return -1; if (tb[NFTA_DYNSET_SREG_KEY]) { dynset->sreg_key = ntohl(mnl_attr_get_u32(tb[NFTA_DYNSET_SREG_KEY])); - e->flags |= (1 << NFT_EXPR_DYNSET_SREG_KEY); + e->flags |= (1 << NFTNL_EXPR_DYNSET_SREG_KEY); } if (tb[NFTA_DYNSET_SREG_DATA]) { dynset->sreg_data = ntohl(mnl_attr_get_u32(tb[NFTA_DYNSET_SREG_DATA])); - e->flags |= (1 << NFT_EXPR_DYNSET_SREG_DATA); + e->flags |= (1 << NFTNL_EXPR_DYNSET_SREG_DATA); } if (tb[NFTA_DYNSET_OP]) { dynset->op = ntohl(mnl_attr_get_u32(tb[NFTA_DYNSET_OP])); - e->flags |= (1 << NFT_EXPR_DYNSET_OP); + e->flags |= (1 << NFTNL_EXPR_DYNSET_OP); } if (tb[NFTA_DYNSET_TIMEOUT]) { dynset->timeout = be64toh(mnl_attr_get_u64(tb[NFTA_DYNSET_TIMEOUT])); - e->flags |= (1 << NFT_EXPR_DYNSET_TIMEOUT); + e->flags |= (1 << NFTNL_EXPR_DYNSET_TIMEOUT); } if (tb[NFTA_DYNSET_SET_NAME]) { strcpy(dynset->set_name, mnl_attr_get_str(tb[NFTA_DYNSET_SET_NAME])); - e->flags |= (1 << NFT_EXPR_DYNSET_SET_NAME); + e->flags |= (1 << NFTNL_EXPR_DYNSET_SET_NAME); } if (tb[NFTA_DYNSET_SET_ID]) { dynset->set_id = ntohl(mnl_attr_get_u32(tb[NFTA_DYNSET_SET_ID])); - e->flags |= (1 << NFT_EXPR_DYNSET_SET_ID); + e->flags |= (1 << NFTNL_EXPR_DYNSET_SET_ID); } if (tb[NFTA_DYNSET_EXPR]) { - e->flags |= (1 << NFT_EXPR_DYNSET_EXPR); - dynset->expr = nft_rule_expr_parse(tb[NFTA_DYNSET_EXPR]); + e->flags |= (1 << NFTNL_EXPR_DYNSET_EXPR); + dynset->expr = nftnl_rule_expr_parse(tb[NFTA_DYNSET_EXPR]); if (dynset->expr == NULL) return -1; } @@ -204,33 +204,33 @@ nft_rule_expr_dynset_parse(struct nft_rule_expr *e, struct nlattr *attr) } static int -nft_rule_expr_dynset_json_parse(struct nft_rule_expr *e, json_t *root, - struct nft_parse_err *err) +nftnl_rule_expr_dynset_json_parse(struct nftnl_rule_expr *e, json_t *root, + struct nftnl_parse_err *err) { #ifdef JSON_PARSING const char *set_name; uint32_t uval32; uint64_t uval64; - set_name = nft_jansson_parse_str(root, "set", err); + set_name = nftnl_jansson_parse_str(root, "set", err); if (set_name != NULL) - nft_rule_expr_set_str(e, NFT_EXPR_DYNSET_SET_NAME, set_name); + nftnl_rule_expr_set_str(e, NFTNL_EXPR_DYNSET_SET_NAME, set_name); - if (nft_jansson_parse_reg(root, "sreg_key", - NFT_TYPE_U32, &uval32, err) == 0) - nft_rule_expr_set_u32(e, NFT_EXPR_DYNSET_SREG_KEY, uval32); + if (nftnl_jansson_parse_reg(root, "sreg_key", + NFTNL_TYPE_U32, &uval32, err) == 0) + nftnl_rule_expr_set_u32(e, NFTNL_EXPR_DYNSET_SREG_KEY, uval32); - if (nft_jansson_parse_reg(root, "sreg_data", - NFT_TYPE_U32, &uval32, err) == 0) - nft_rule_expr_set_u32(e, NFT_EXPR_DYNSET_SREG_DATA, uval32); + if (nftnl_jansson_parse_reg(root, "sreg_data", + NFTNL_TYPE_U32, &uval32, err) == 0) + nftnl_rule_expr_set_u32(e, NFTNL_EXPR_DYNSET_SREG_DATA, uval32); - if (nft_jansson_parse_val(root, "op", NFT_TYPE_U32, &uval32, + if (nftnl_jansson_parse_val(root, "op", NFTNL_TYPE_U32, &uval32, err) == 0) - nft_rule_expr_set_u32(e, NFT_EXPR_DYNSET_OP, uval32); + nftnl_rule_expr_set_u32(e, NFTNL_EXPR_DYNSET_OP, uval32); - if (nft_jansson_parse_val(root, "timeout", NFT_TYPE_U64, &uval64, + if (nftnl_jansson_parse_val(root, "timeout", NFTNL_TYPE_U64, &uval64, err) == 0) - nft_rule_expr_set_u64(e, NFT_EXPR_DYNSET_TIMEOUT, uval64); + nftnl_rule_expr_set_u64(e, NFTNL_EXPR_DYNSET_TIMEOUT, uval64); return 0; #else @@ -240,34 +240,34 @@ nft_rule_expr_dynset_json_parse(struct nft_rule_expr *e, json_t *root, } static int -nft_rule_expr_dynset_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree, - struct nft_parse_err *err) +nftnl_rule_expr_dynset_xml_parse(struct nftnl_rule_expr *e, mxml_node_t *tree, + struct nftnl_parse_err *err) { #ifdef XML_PARSING const char *set_name; uint32_t uval32; uint64_t uval64; - set_name = nft_mxml_str_parse(tree, "set", MXML_DESCEND_FIRST, - NFT_XML_MAND, err); + set_name = nftnl_mxml_str_parse(tree, "set", MXML_DESCEND_FIRST, + NFTNL_XML_MAND, err); if (set_name != NULL) - nft_rule_expr_set_str(e, NFT_EXPR_DYNSET_SET_NAME, set_name); + nftnl_rule_expr_set_str(e, NFTNL_EXPR_DYNSET_SET_NAME, set_name); - if (nft_mxml_reg_parse(tree, "sreg_key", &uval32, MXML_DESCEND, - NFT_XML_MAND, err) == 0) - nft_rule_expr_set_u32(e, NFT_EXPR_DYNSET_SREG_KEY, uval32); + if (nftnl_mxml_reg_parse(tree, "sreg_key", &uval32, MXML_DESCEND, + NFTNL_XML_MAND, err) == 0) + nftnl_rule_expr_set_u32(e, NFTNL_EXPR_DYNSET_SREG_KEY, uval32); - if (nft_mxml_reg_parse(tree, "sreg_data", &uval32, MXML_DESCEND, - NFT_XML_MAND, err) == 0) - nft_rule_expr_set_u32(e, NFT_EXPR_DYNSET_SREG_DATA, uval32); + if (nftnl_mxml_reg_parse(tree, "sreg_data", &uval32, MXML_DESCEND, + NFTNL_XML_MAND, err) == 0) + nftnl_rule_expr_set_u32(e, NFTNL_EXPR_DYNSET_SREG_DATA, uval32); - if (nft_mxml_num_parse(tree, "op", MXML_DESCEND_FIRST, BASE_DEC, - &uval32, NFT_TYPE_U32, NFT_XML_MAND, err) == 0) - nft_rule_expr_set_u32(e, NFT_EXPR_DYNSET_OP, uval32); + if (nftnl_mxml_num_parse(tree, "op", MXML_DESCEND_FIRST, BASE_DEC, + &uval32, NFTNL_TYPE_U32, NFTNL_XML_MAND, err) == 0) + nftnl_rule_expr_set_u32(e, NFTNL_EXPR_DYNSET_OP, uval32); - if (nft_mxml_num_parse(tree, "timeout", MXML_DESCEND_FIRST, BASE_DEC, - &uval64, NFT_TYPE_U64, NFT_XML_MAND, err) == 0) - nft_rule_expr_set_u64(e, NFT_EXPR_DYNSET_TIMEOUT, uval64); + if (nftnl_mxml_num_parse(tree, "timeout", MXML_DESCEND_FIRST, BASE_DEC, + &uval64, NFTNL_TYPE_U64, NFTNL_XML_MAND, err) == 0) + nftnl_rule_expr_set_u64(e, NFTNL_EXPR_DYNSET_TIMEOUT, uval64); return 0; #else @@ -277,20 +277,20 @@ nft_rule_expr_dynset_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree, } static int -nft_rule_expr_dynset_export(char *buf, size_t size, - struct nft_rule_expr *e, int type) +nftnl_rule_expr_dynset_export(char *buf, size_t size, + struct nftnl_rule_expr *e, int type) { - struct nft_expr_dynset *dynset = nft_expr_data(e); - NFT_BUF_INIT(b, buf, size); + struct nftnl_expr_dynset *dynset = nftnl_expr_data(e); + NFTNL_BUF_INIT(b, buf, size); - if (e->flags & (1 << NFT_EXPR_DYNSET_SET_NAME)) - nft_buf_str(&b, type, dynset->set_name, SET_NAME); - if (e->flags & (1 << NFT_EXPR_DYNSET_SREG_KEY)) - nft_buf_u32(&b, type, dynset->sreg_key, SREG_KEY); - if (e->flags & (1 << NFT_EXPR_DYNSET_SREG_DATA)) - nft_buf_u32(&b, type, dynset->sreg_data, SREG_DATA); + if (e->flags & (1 << NFTNL_EXPR_DYNSET_SET_NAME)) + nftnl_buf_str(&b, type, dynset->set_name, SET_NAME); + if (e->flags & (1 << NFTNL_EXPR_DYNSET_SREG_KEY)) + nftnl_buf_u32(&b, type, dynset->sreg_key, SREG_KEY); + if (e->flags & (1 << NFTNL_EXPR_DYNSET_SREG_DATA)) + nftnl_buf_u32(&b, type, dynset->sreg_data, SREG_DATA); - return nft_buf_done(&b); + return nftnl_buf_done(&b); } static char *op2str_array[] = { @@ -306,35 +306,35 @@ static const char *op2str(enum nft_dynset_ops op) } static int -nft_rule_expr_dynset_snprintf_default(char *buf, size_t size, - struct nft_rule_expr *e) +nftnl_rule_expr_dynset_snprintf_default(char *buf, size_t size, + struct nftnl_rule_expr *e) { - struct nft_expr_dynset *dynset = nft_expr_data(e); - struct nft_rule_expr *expr; + struct nftnl_expr_dynset *dynset = nftnl_expr_data(e); + struct nftnl_rule_expr *expr; int len = size, offset = 0, ret; ret = snprintf(buf, len, "%s reg_key %u set %s ", op2str(dynset->op), dynset->sreg_key, dynset->set_name); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - if (e->flags & (1 << NFT_EXPR_DYNSET_SREG_DATA)) { + if (e->flags & (1 << NFTNL_EXPR_DYNSET_SREG_DATA)) { ret = snprintf(buf+offset, len, "sreg_data %u ", dynset->sreg_data); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } - if (e->flags & (1 << NFT_EXPR_DYNSET_TIMEOUT)) { + if (e->flags & (1 << NFTNL_EXPR_DYNSET_TIMEOUT)) { ret = snprintf(buf+offset, len, "timeout %"PRIu64"ms ", dynset->timeout); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } - if (e->flags & (1 << NFT_EXPR_DYNSET_EXPR)) { + if (e->flags & (1 << NFTNL_EXPR_DYNSET_EXPR)) { expr = dynset->expr; ret = snprintf(buf+offset, len, "expr [ %s ", expr->ops->name); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - ret = nft_rule_expr_snprintf(buf+offset, len, expr, - NFT_OUTPUT_DEFAULT, - NFT_OF_EVENT_ANY); + ret = nftnl_rule_expr_snprintf(buf+offset, len, expr, + NFTNL_OUTPUT_DEFAULT, + NFTNL_OF_EVENT_ANY); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); ret = snprintf(buf+offset, len, "] "); @@ -345,16 +345,16 @@ nft_rule_expr_dynset_snprintf_default(char *buf, size_t size, } static int -nft_rule_expr_dynset_snprintf(char *buf, size_t size, uint32_t type, - uint32_t flags, struct nft_rule_expr *e) +nftnl_rule_expr_dynset_snprintf(char *buf, size_t size, uint32_t type, + uint32_t flags, struct nftnl_rule_expr *e) { switch (type) { - case NFT_OUTPUT_DEFAULT: - return nft_rule_expr_dynset_snprintf_default(buf, size, e); - case NFT_OUTPUT_XML: - case NFT_OUTPUT_JSON: - return nft_rule_expr_dynset_export(buf, size, e, type); + case NFTNL_OUTPUT_DEFAULT: + return nftnl_rule_expr_dynset_snprintf_default(buf, size, e); + case NFTNL_OUTPUT_XML: + case NFTNL_OUTPUT_JSON: + return nftnl_rule_expr_dynset_export(buf, size, e, type); default: break; } @@ -363,13 +363,13 @@ nft_rule_expr_dynset_snprintf(char *buf, size_t size, uint32_t type, struct expr_ops expr_ops_dynset = { .name = "dynset", - .alloc_len = sizeof(struct nft_expr_dynset), + .alloc_len = sizeof(struct nftnl_expr_dynset), .max_attr = NFTA_DYNSET_MAX, - .set = nft_rule_expr_dynset_set, - .get = nft_rule_expr_dynset_get, - .parse = nft_rule_expr_dynset_parse, - .build = nft_rule_expr_dynset_build, - .snprintf = nft_rule_expr_dynset_snprintf, - .xml_parse = nft_rule_expr_dynset_xml_parse, - .json_parse = nft_rule_expr_dynset_json_parse, + .set = nftnl_rule_expr_dynset_set, + .get = nftnl_rule_expr_dynset_get, + .parse = nftnl_rule_expr_dynset_parse, + .build = nftnl_rule_expr_dynset_build, + .snprintf = nftnl_rule_expr_dynset_snprintf, + .xml_parse = nftnl_rule_expr_dynset_xml_parse, + .json_parse = nftnl_rule_expr_dynset_json_parse, }; -- cgit v1.2.3