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/lookup.c | 148 +++++++++++++++++++++++++++--------------------------- 1 file changed, 74 insertions(+), 74 deletions(-) (limited to 'src/expr/lookup.c') diff --git a/src/expr/lookup.c b/src/expr/lookup.c index b2f0aa4..98ac1ad 100644 --- a/src/expr/lookup.c +++ b/src/expr/lookup.c @@ -25,7 +25,7 @@ #define IFNAMSIZ 16 #endif -struct nft_expr_lookup { +struct nftnl_expr_lookup { enum nft_registers sreg; enum nft_registers dreg; char set_name[IFNAMSIZ]; @@ -33,23 +33,23 @@ struct nft_expr_lookup { }; static int -nft_rule_expr_lookup_set(struct nft_rule_expr *e, uint16_t type, +nftnl_rule_expr_lookup_set(struct nftnl_rule_expr *e, uint16_t type, const void *data, uint32_t data_len) { - struct nft_expr_lookup *lookup = nft_expr_data(e); + struct nftnl_expr_lookup *lookup = nftnl_expr_data(e); switch(type) { - case NFT_EXPR_LOOKUP_SREG: + case NFTNL_EXPR_LOOKUP_SREG: lookup->sreg = *((uint32_t *)data); break; - case NFT_EXPR_LOOKUP_DREG: + case NFTNL_EXPR_LOOKUP_DREG: lookup->dreg = *((uint32_t *)data); break; - case NFT_EXPR_LOOKUP_SET: + case NFTNL_EXPR_LOOKUP_SET: snprintf(lookup->set_name, sizeof(lookup->set_name), "%s", (const char *)data); break; - case NFT_EXPR_LOOKUP_SET_ID: + case NFTNL_EXPR_LOOKUP_SET_ID: lookup->set_id = *((uint32_t *)data); break; default: @@ -59,27 +59,27 @@ nft_rule_expr_lookup_set(struct nft_rule_expr *e, uint16_t type, } static const void * -nft_rule_expr_lookup_get(const struct nft_rule_expr *e, uint16_t type, +nftnl_rule_expr_lookup_get(const struct nftnl_rule_expr *e, uint16_t type, uint32_t *data_len) { - struct nft_expr_lookup *lookup = nft_expr_data(e); + struct nftnl_expr_lookup *lookup = nftnl_expr_data(e); switch(type) { - case NFT_EXPR_LOOKUP_SREG: + case NFTNL_EXPR_LOOKUP_SREG: *data_len = sizeof(lookup->sreg); return &lookup->sreg; - case NFT_EXPR_LOOKUP_DREG: + case NFTNL_EXPR_LOOKUP_DREG: *data_len = sizeof(lookup->dreg); return &lookup->dreg; - case NFT_EXPR_LOOKUP_SET: + case NFTNL_EXPR_LOOKUP_SET: return lookup->set_name; - case NFT_EXPR_LOOKUP_SET_ID: + case NFTNL_EXPR_LOOKUP_SET_ID: return &lookup->set_id; } return NULL; } -static int nft_rule_expr_lookup_cb(const struct nlattr *attr, void *data) +static int nftnl_rule_expr_lookup_cb(const struct nlattr *attr, void *data) { const struct nlattr **tb = data; int type = mnl_attr_get_type(attr); @@ -105,70 +105,70 @@ static int nft_rule_expr_lookup_cb(const struct nlattr *attr, void *data) } static void -nft_rule_expr_lookup_build(struct nlmsghdr *nlh, struct nft_rule_expr *e) +nftnl_rule_expr_lookup_build(struct nlmsghdr *nlh, struct nftnl_rule_expr *e) { - struct nft_expr_lookup *lookup = nft_expr_data(e); + struct nftnl_expr_lookup *lookup = nftnl_expr_data(e); - if (e->flags & (1 << NFT_EXPR_LOOKUP_SREG)) + if (e->flags & (1 << NFTNL_EXPR_LOOKUP_SREG)) mnl_attr_put_u32(nlh, NFTA_LOOKUP_SREG, htonl(lookup->sreg)); - if (e->flags & (1 << NFT_EXPR_LOOKUP_DREG)) + if (e->flags & (1 << NFTNL_EXPR_LOOKUP_DREG)) mnl_attr_put_u32(nlh, NFTA_LOOKUP_DREG, htonl(lookup->dreg)); - if (e->flags & (1 << NFT_EXPR_LOOKUP_SET)) + if (e->flags & (1 << NFTNL_EXPR_LOOKUP_SET)) mnl_attr_put_strz(nlh, NFTA_LOOKUP_SET, lookup->set_name); - if (e->flags & (1 << NFT_EXPR_LOOKUP_SET_ID)) { + if (e->flags & (1 << NFTNL_EXPR_LOOKUP_SET_ID)) { mnl_attr_put_u32(nlh, NFTA_LOOKUP_SET_ID, htonl(lookup->set_id)); } } static int -nft_rule_expr_lookup_parse(struct nft_rule_expr *e, struct nlattr *attr) +nftnl_rule_expr_lookup_parse(struct nftnl_rule_expr *e, struct nlattr *attr) { - struct nft_expr_lookup *lookup = nft_expr_data(e); + struct nftnl_expr_lookup *lookup = nftnl_expr_data(e); struct nlattr *tb[NFTA_LOOKUP_MAX+1] = {}; int ret = 0; - if (mnl_attr_parse_nested(attr, nft_rule_expr_lookup_cb, tb) < 0) + if (mnl_attr_parse_nested(attr, nftnl_rule_expr_lookup_cb, tb) < 0) return -1; if (tb[NFTA_LOOKUP_SREG]) { lookup->sreg = ntohl(mnl_attr_get_u32(tb[NFTA_LOOKUP_SREG])); - e->flags |= (1 << NFT_EXPR_LOOKUP_SREG); + e->flags |= (1 << NFTNL_EXPR_LOOKUP_SREG); } if (tb[NFTA_LOOKUP_DREG]) { lookup->dreg = ntohl(mnl_attr_get_u32(tb[NFTA_LOOKUP_DREG])); - e->flags |= (1 << NFT_EXPR_LOOKUP_DREG); + e->flags |= (1 << NFTNL_EXPR_LOOKUP_DREG); } if (tb[NFTA_LOOKUP_SET]) { strcpy(lookup->set_name, mnl_attr_get_str(tb[NFTA_LOOKUP_SET])); - e->flags |= (1 << NFT_EXPR_LOOKUP_SET); + e->flags |= (1 << NFTNL_EXPR_LOOKUP_SET); } if (tb[NFTA_LOOKUP_SET_ID]) { lookup->set_id = ntohl(mnl_attr_get_u32(tb[NFTA_LOOKUP_SET_ID])); - e->flags |= (1 << NFT_EXPR_LOOKUP_SET_ID); + e->flags |= (1 << NFTNL_EXPR_LOOKUP_SET_ID); } return ret; } static int -nft_rule_expr_lookup_json_parse(struct nft_rule_expr *e, json_t *root, - struct nft_parse_err *err) +nftnl_rule_expr_lookup_json_parse(struct nftnl_rule_expr *e, json_t *root, + struct nftnl_parse_err *err) { #ifdef JSON_PARSING const char *set_name; uint32_t sreg, dreg; - 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_LOOKUP_SET, set_name); + nftnl_rule_expr_set_str(e, NFTNL_EXPR_LOOKUP_SET, set_name); - if (nft_jansson_parse_reg(root, "sreg", NFT_TYPE_U32, &sreg, err) == 0) - nft_rule_expr_set_u32(e, NFT_EXPR_LOOKUP_SREG, sreg); + if (nftnl_jansson_parse_reg(root, "sreg", NFTNL_TYPE_U32, &sreg, err) == 0) + nftnl_rule_expr_set_u32(e, NFTNL_EXPR_LOOKUP_SREG, sreg); - if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &dreg, err) == 0) - nft_rule_expr_set_u32(e, NFT_EXPR_LOOKUP_DREG, dreg); + if (nftnl_jansson_parse_reg(root, "dreg", NFTNL_TYPE_U32, &dreg, err) == 0) + nftnl_rule_expr_set_u32(e, NFTNL_EXPR_LOOKUP_DREG, dreg); return 0; #else @@ -178,25 +178,25 @@ nft_rule_expr_lookup_json_parse(struct nft_rule_expr *e, json_t *root, } static int -nft_rule_expr_lookup_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree, - struct nft_parse_err *err) +nftnl_rule_expr_lookup_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 sreg, dreg; - 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_LOOKUP_SET, set_name); + nftnl_rule_expr_set_str(e, NFTNL_EXPR_LOOKUP_SET, set_name); - if (nft_mxml_reg_parse(tree, "sreg", &sreg, MXML_DESCEND, NFT_XML_MAND, + if (nftnl_mxml_reg_parse(tree, "sreg", &sreg, MXML_DESCEND, NFTNL_XML_MAND, err) == 0) - nft_rule_expr_set_u32(e, NFT_EXPR_LOOKUP_SREG, sreg); + nftnl_rule_expr_set_u32(e, NFTNL_EXPR_LOOKUP_SREG, sreg); - if (nft_mxml_reg_parse(tree, "dreg", &dreg, MXML_DESCEND, NFT_XML_OPT, + if (nftnl_mxml_reg_parse(tree, "dreg", &dreg, MXML_DESCEND, NFTNL_XML_OPT, err) == 0) - nft_rule_expr_set_u32(e, NFT_EXPR_LOOKUP_DREG, dreg); + nftnl_rule_expr_set_u32(e, NFTNL_EXPR_LOOKUP_DREG, dreg); return 0; #else @@ -206,34 +206,34 @@ nft_rule_expr_lookup_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree, } static int -nft_rule_expr_lookup_export(char *buf, size_t size, - struct nft_rule_expr *e, int type) +nftnl_rule_expr_lookup_export(char *buf, size_t size, + struct nftnl_rule_expr *e, int type) { - struct nft_expr_lookup *l = nft_expr_data(e); - NFT_BUF_INIT(b, buf, size); + struct nftnl_expr_lookup *l = nftnl_expr_data(e); + NFTNL_BUF_INIT(b, buf, size); - if (e->flags & (1 << NFT_EXPR_LOOKUP_SET)) - nft_buf_str(&b, type, l->set_name, SET); - if (e->flags & (1 << NFT_EXPR_LOOKUP_SREG)) - nft_buf_u32(&b, type, l->sreg, SREG); - if (e->flags & (1 << NFT_EXPR_LOOKUP_DREG)) - nft_buf_u32(&b, type, l->dreg, DREG); + if (e->flags & (1 << NFTNL_EXPR_LOOKUP_SET)) + nftnl_buf_str(&b, type, l->set_name, SET); + if (e->flags & (1 << NFTNL_EXPR_LOOKUP_SREG)) + nftnl_buf_u32(&b, type, l->sreg, SREG); + if (e->flags & (1 << NFTNL_EXPR_LOOKUP_DREG)) + nftnl_buf_u32(&b, type, l->dreg, DREG); - return nft_buf_done(&b); + return nftnl_buf_done(&b); } static int -nft_rule_expr_lookup_snprintf_default(char *buf, size_t size, - struct nft_rule_expr *e) +nftnl_rule_expr_lookup_snprintf_default(char *buf, size_t size, + struct nftnl_rule_expr *e) { int len = size, offset = 0, ret; - struct nft_expr_lookup *l = nft_expr_data(e); + struct nftnl_expr_lookup *l = nftnl_expr_data(e); ret = snprintf(buf, len, "reg %u set %s ", l->sreg, l->set_name); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - if (e->flags & (1 << NFT_EXPR_LOOKUP_DREG)) { + if (e->flags & (1 << NFTNL_EXPR_LOOKUP_DREG)) { ret = snprintf(buf+offset, len, "dreg %u ", l->dreg); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } @@ -242,16 +242,16 @@ nft_rule_expr_lookup_snprintf_default(char *buf, size_t size, } static int -nft_rule_expr_lookup_snprintf(char *buf, size_t size, uint32_t type, - uint32_t flags, struct nft_rule_expr *e) +nftnl_rule_expr_lookup_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_lookup_snprintf_default(buf, size, e); - case NFT_OUTPUT_XML: - case NFT_OUTPUT_JSON: - return nft_rule_expr_lookup_export(buf, size, e, type); + case NFTNL_OUTPUT_DEFAULT: + return nftnl_rule_expr_lookup_snprintf_default(buf, size, e); + case NFTNL_OUTPUT_XML: + case NFTNL_OUTPUT_JSON: + return nftnl_rule_expr_lookup_export(buf, size, e, type); default: break; } @@ -260,13 +260,13 @@ nft_rule_expr_lookup_snprintf(char *buf, size_t size, uint32_t type, struct expr_ops expr_ops_lookup = { .name = "lookup", - .alloc_len = sizeof(struct nft_expr_lookup), + .alloc_len = sizeof(struct nftnl_expr_lookup), .max_attr = NFTA_LOOKUP_MAX, - .set = nft_rule_expr_lookup_set, - .get = nft_rule_expr_lookup_get, - .parse = nft_rule_expr_lookup_parse, - .build = nft_rule_expr_lookup_build, - .snprintf = nft_rule_expr_lookup_snprintf, - .xml_parse = nft_rule_expr_lookup_xml_parse, - .json_parse = nft_rule_expr_lookup_json_parse, + .set = nftnl_rule_expr_lookup_set, + .get = nftnl_rule_expr_lookup_get, + .parse = nftnl_rule_expr_lookup_parse, + .build = nftnl_rule_expr_lookup_build, + .snprintf = nftnl_rule_expr_lookup_snprintf, + .xml_parse = nftnl_rule_expr_lookup_xml_parse, + .json_parse = nftnl_rule_expr_lookup_json_parse, }; -- cgit v1.2.3