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/immediate.c | 196 +++++++++++++++++++++++++-------------------------- 1 file changed, 98 insertions(+), 98 deletions(-) (limited to 'src/expr/immediate.c') diff --git a/src/expr/immediate.c b/src/expr/immediate.c index cf06190..4f3960a 100644 --- a/src/expr/immediate.c +++ b/src/expr/immediate.c @@ -20,29 +20,29 @@ #include #include -struct nft_expr_immediate { - union nft_data_reg data; +struct nftnl_expr_immediate { + union nftnl_data_reg data; enum nft_registers dreg; }; static int -nft_rule_expr_immediate_set(struct nft_rule_expr *e, uint16_t type, +nftnl_rule_expr_immediate_set(struct nftnl_rule_expr *e, uint16_t type, const void *data, uint32_t data_len) { - struct nft_expr_immediate *imm = nft_expr_data(e); + struct nftnl_expr_immediate *imm = nftnl_expr_data(e); switch(type) { - case NFT_EXPR_IMM_DREG: + case NFTNL_EXPR_IMM_DREG: imm->dreg = *((uint32_t *)data); break; - case NFT_EXPR_IMM_DATA: + case NFTNL_EXPR_IMM_DATA: memcpy(&imm->data.val, data, data_len); imm->data.len = data_len; break; - case NFT_EXPR_IMM_VERDICT: + case NFTNL_EXPR_IMM_VERDICT: imm->data.verdict = *((uint32_t *)data); break; - case NFT_EXPR_IMM_CHAIN: + case NFTNL_EXPR_IMM_CHAIN: if (imm->data.chain) xfree(imm->data.chain); @@ -55,29 +55,29 @@ nft_rule_expr_immediate_set(struct nft_rule_expr *e, uint16_t type, } static const void * -nft_rule_expr_immediate_get(const struct nft_rule_expr *e, uint16_t type, +nftnl_rule_expr_immediate_get(const struct nftnl_rule_expr *e, uint16_t type, uint32_t *data_len) { - struct nft_expr_immediate *imm = nft_expr_data(e); + struct nftnl_expr_immediate *imm = nftnl_expr_data(e); switch(type) { - case NFT_EXPR_IMM_DREG: + case NFTNL_EXPR_IMM_DREG: *data_len = sizeof(imm->dreg); return &imm->dreg; - case NFT_EXPR_IMM_DATA: + case NFTNL_EXPR_IMM_DATA: *data_len = imm->data.len; return &imm->data.val; - case NFT_EXPR_IMM_VERDICT: + case NFTNL_EXPR_IMM_VERDICT: *data_len = sizeof(imm->data.verdict); return &imm->data.verdict; - case NFT_EXPR_IMM_CHAIN: + case NFTNL_EXPR_IMM_CHAIN: *data_len = strlen(imm->data.chain)+1; return imm->data.chain; } return NULL; } -static int nft_rule_expr_immediate_cb(const struct nlattr *attr, void *data) +static int nftnl_rule_expr_immediate_cb(const struct nlattr *attr, void *data) { const struct nlattr **tb = data; int type = mnl_attr_get_type(attr); @@ -101,28 +101,28 @@ static int nft_rule_expr_immediate_cb(const struct nlattr *attr, void *data) } static void -nft_rule_expr_immediate_build(struct nlmsghdr *nlh, struct nft_rule_expr *e) +nftnl_rule_expr_immediate_build(struct nlmsghdr *nlh, struct nftnl_rule_expr *e) { - struct nft_expr_immediate *imm = nft_expr_data(e); + struct nftnl_expr_immediate *imm = nftnl_expr_data(e); - if (e->flags & (1 << NFT_EXPR_IMM_DREG)) + if (e->flags & (1 << NFTNL_EXPR_IMM_DREG)) mnl_attr_put_u32(nlh, NFTA_IMMEDIATE_DREG, htonl(imm->dreg)); /* Sane configurations allows you to set ONLY one of these two below */ - if (e->flags & (1 << NFT_EXPR_IMM_DATA)) { + if (e->flags & (1 << NFTNL_EXPR_IMM_DATA)) { struct nlattr *nest; nest = mnl_attr_nest_start(nlh, NFTA_IMMEDIATE_DATA); mnl_attr_put(nlh, NFTA_DATA_VALUE, imm->data.len, imm->data.val); mnl_attr_nest_end(nlh, nest); - } else if (e->flags & (1 << NFT_EXPR_IMM_VERDICT)) { + } else if (e->flags & (1 << NFTNL_EXPR_IMM_VERDICT)) { struct nlattr *nest1, *nest2; nest1 = mnl_attr_nest_start(nlh, NFTA_IMMEDIATE_DATA); nest2 = mnl_attr_nest_start(nlh, NFTA_DATA_VERDICT); mnl_attr_put_u32(nlh, NFTA_VERDICT_CODE, htonl(imm->data.verdict)); - if (e->flags & (1 << NFT_EXPR_IMM_CHAIN)) + if (e->flags & (1 << NFTNL_EXPR_IMM_CHAIN)) mnl_attr_put_strz(nlh, NFTA_VERDICT_CHAIN, imm->data.chain); mnl_attr_nest_end(nlh, nest1); @@ -131,39 +131,39 @@ nft_rule_expr_immediate_build(struct nlmsghdr *nlh, struct nft_rule_expr *e) } static int -nft_rule_expr_immediate_parse(struct nft_rule_expr *e, struct nlattr *attr) +nftnl_rule_expr_immediate_parse(struct nftnl_rule_expr *e, struct nlattr *attr) { - struct nft_expr_immediate *imm = nft_expr_data(e); + struct nftnl_expr_immediate *imm = nftnl_expr_data(e); struct nlattr *tb[NFTA_IMMEDIATE_MAX+1] = {}; int ret = 0; - if (mnl_attr_parse_nested(attr, nft_rule_expr_immediate_cb, tb) < 0) + if (mnl_attr_parse_nested(attr, nftnl_rule_expr_immediate_cb, tb) < 0) return -1; if (tb[NFTA_IMMEDIATE_DREG]) { imm->dreg = ntohl(mnl_attr_get_u32(tb[NFTA_IMMEDIATE_DREG])); - e->flags |= (1 << NFT_EXPR_IMM_DREG); + e->flags |= (1 << NFTNL_EXPR_IMM_DREG); } if (tb[NFTA_IMMEDIATE_DATA]) { int type; - ret = nft_parse_data(&imm->data, tb[NFTA_IMMEDIATE_DATA], &type); + ret = nftnl_parse_data(&imm->data, tb[NFTA_IMMEDIATE_DATA], &type); if (ret < 0) return ret; switch(type) { case DATA_VALUE: /* real immediate data to be loaded to destination */ - e->flags |= (1 << NFT_EXPR_IMM_DATA); + e->flags |= (1 << NFTNL_EXPR_IMM_DATA); break; case DATA_VERDICT: - /* NF_ACCEPT, NF_DROP, NF_QUEUE and NFT_RETURN case */ - e->flags |= (1 << NFT_EXPR_IMM_VERDICT); + /* NF_ACCEPT, NF_DROP, NF_QUEUE and NFTNL_RETURN case */ + e->flags |= (1 << NFTNL_EXPR_IMM_VERDICT); break; case DATA_CHAIN: - /* NFT_GOTO and NFT_JUMP case */ - e->flags |= (1 << NFT_EXPR_IMM_VERDICT) | - (1 << NFT_EXPR_IMM_CHAIN); + /* NFTNL_GOTO and NFTNL_JUMP case */ + e->flags |= (1 << NFTNL_EXPR_IMM_VERDICT) | + (1 << NFTNL_EXPR_IMM_CHAIN); break; } } @@ -172,29 +172,29 @@ nft_rule_expr_immediate_parse(struct nft_rule_expr *e, struct nlattr *attr) } static int -nft_rule_expr_immediate_json_parse(struct nft_rule_expr *e, json_t *root, - struct nft_parse_err *err) +nftnl_rule_expr_immediate_json_parse(struct nftnl_rule_expr *e, json_t *root, + struct nftnl_parse_err *err) { #ifdef JSON_PARSING - struct nft_expr_immediate *imm = nft_expr_data(e); + struct nftnl_expr_immediate *imm = nftnl_expr_data(e); int datareg_type; uint32_t reg; - if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, ®, err) == 0) - nft_rule_expr_set_u32(e, NFT_EXPR_IMM_DREG, reg); + if (nftnl_jansson_parse_reg(root, "dreg", NFTNL_TYPE_U32, ®, err) == 0) + nftnl_rule_expr_set_u32(e, NFTNL_EXPR_IMM_DREG, reg); - datareg_type = nft_jansson_data_reg_parse(root, "data", + datareg_type = nftnl_jansson_data_reg_parse(root, "data", &imm->data, err); if (datareg_type >= 0) { switch (datareg_type) { case DATA_VALUE: - e->flags |= (1 << NFT_EXPR_IMM_DATA); + e->flags |= (1 << NFTNL_EXPR_IMM_DATA); break; case DATA_VERDICT: - e->flags |= (1 << NFT_EXPR_IMM_VERDICT); + e->flags |= (1 << NFTNL_EXPR_IMM_VERDICT); break; case DATA_CHAIN: - e->flags |= (1 << NFT_EXPR_IMM_CHAIN); + e->flags |= (1 << NFTNL_EXPR_IMM_CHAIN); break; default: return -1; @@ -208,30 +208,30 @@ nft_rule_expr_immediate_json_parse(struct nft_rule_expr *e, json_t *root, } static int -nft_rule_expr_immediate_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree, - struct nft_parse_err *err) +nftnl_rule_expr_immediate_xml_parse(struct nftnl_rule_expr *e, mxml_node_t *tree, + struct nftnl_parse_err *err) { #ifdef XML_PARSING - struct nft_expr_immediate *imm = nft_expr_data(e); + struct nftnl_expr_immediate *imm = nftnl_expr_data(e); int datareg_type; uint32_t reg; - if (nft_mxml_reg_parse(tree, "dreg", ®, MXML_DESCEND_FIRST, - NFT_XML_MAND, err) == 0) - nft_rule_expr_set_u32(e, NFT_EXPR_IMM_DREG, reg); + if (nftnl_mxml_reg_parse(tree, "dreg", ®, MXML_DESCEND_FIRST, + NFTNL_XML_MAND, err) == 0) + nftnl_rule_expr_set_u32(e, NFTNL_EXPR_IMM_DREG, reg); - datareg_type = nft_mxml_data_reg_parse(tree, "data", - &imm->data, NFT_XML_MAND, err); + datareg_type = nftnl_mxml_data_reg_parse(tree, "data", + &imm->data, NFTNL_XML_MAND, err); if (datareg_type >= 0) { switch (datareg_type) { case DATA_VALUE: - e->flags |= (1 << NFT_EXPR_IMM_DATA); + e->flags |= (1 << NFTNL_EXPR_IMM_DATA); break; case DATA_VERDICT: - e->flags |= (1 << NFT_EXPR_IMM_VERDICT); + e->flags |= (1 << NFTNL_EXPR_IMM_VERDICT); break; case DATA_CHAIN: - e->flags |= (1 << NFT_EXPR_IMM_CHAIN); + e->flags |= (1 << NFTNL_EXPR_IMM_CHAIN); break; default: return -1; @@ -246,47 +246,47 @@ nft_rule_expr_immediate_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree, } static int -nft_rule_expr_immediate_export(char *buf, size_t size, struct nft_rule_expr *e, +nftnl_rule_expr_immediate_export(char *buf, size_t size, struct nftnl_rule_expr *e, int type) { - struct nft_expr_immediate *imm = nft_expr_data(e); - NFT_BUF_INIT(b, buf, size); - - if (e->flags & (1 << NFT_EXPR_IMM_DREG)) - nft_buf_u32(&b, type, imm->dreg, DREG); - if (e->flags & (1 << NFT_EXPR_IMM_DATA)) - nft_buf_reg(&b, type, &imm->data, DATA_VALUE, DATA); - if (e->flags & (1 << NFT_EXPR_IMM_VERDICT)) - nft_buf_reg(&b, type, &imm->data, DATA_VERDICT, DATA); - if (e->flags & (1 << NFT_EXPR_IMM_CHAIN)) - nft_buf_reg(&b, type, &imm->data, DATA_CHAIN, DATA); - - return nft_buf_done(&b); + struct nftnl_expr_immediate *imm = nftnl_expr_data(e); + NFTNL_BUF_INIT(b, buf, size); + + if (e->flags & (1 << NFTNL_EXPR_IMM_DREG)) + nftnl_buf_u32(&b, type, imm->dreg, DREG); + if (e->flags & (1 << NFTNL_EXPR_IMM_DATA)) + nftnl_buf_reg(&b, type, &imm->data, DATA_VALUE, DATA); + if (e->flags & (1 << NFTNL_EXPR_IMM_VERDICT)) + nftnl_buf_reg(&b, type, &imm->data, DATA_VERDICT, DATA); + if (e->flags & (1 << NFTNL_EXPR_IMM_CHAIN)) + nftnl_buf_reg(&b, type, &imm->data, DATA_CHAIN, DATA); + + return nftnl_buf_done(&b); } static int -nft_rule_expr_immediate_snprintf_default(char *buf, size_t len, - struct nft_rule_expr *e, uint32_t flags) +nftnl_rule_expr_immediate_snprintf_default(char *buf, size_t len, + struct nftnl_rule_expr *e, uint32_t flags) { int size = len, offset = 0, ret; - struct nft_expr_immediate *imm = nft_expr_data(e); + struct nftnl_expr_immediate *imm = nftnl_expr_data(e); ret = snprintf(buf, len, "reg %u ", imm->dreg); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - if (e->flags & (1 << NFT_EXPR_IMM_DATA)) { - ret = nft_data_reg_snprintf(buf+offset, len, &imm->data, - NFT_OUTPUT_DEFAULT, flags, DATA_VALUE); + if (e->flags & (1 << NFTNL_EXPR_IMM_DATA)) { + ret = nftnl_data_reg_snprintf(buf+offset, len, &imm->data, + NFTNL_OUTPUT_DEFAULT, flags, DATA_VALUE); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - } else if (e->flags & (1 << NFT_EXPR_IMM_VERDICT)) { - ret = nft_data_reg_snprintf(buf+offset, len, &imm->data, - NFT_OUTPUT_DEFAULT, flags, DATA_VERDICT); + } else if (e->flags & (1 << NFTNL_EXPR_IMM_VERDICT)) { + ret = nftnl_data_reg_snprintf(buf+offset, len, &imm->data, + NFTNL_OUTPUT_DEFAULT, flags, DATA_VERDICT); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - } else if (e->flags & (1 << NFT_EXPR_IMM_CHAIN)) { - ret = nft_data_reg_snprintf(buf+offset, len, &imm->data, - NFT_OUTPUT_DEFAULT, flags, DATA_CHAIN); + } else if (e->flags & (1 << NFTNL_EXPR_IMM_CHAIN)) { + ret = nftnl_data_reg_snprintf(buf+offset, len, &imm->data, + NFTNL_OUTPUT_DEFAULT, flags, DATA_CHAIN); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } @@ -294,39 +294,39 @@ nft_rule_expr_immediate_snprintf_default(char *buf, size_t len, } static int -nft_rule_expr_immediate_snprintf(char *buf, size_t len, uint32_t type, - uint32_t flags, struct nft_rule_expr *e) +nftnl_rule_expr_immediate_snprintf(char *buf, size_t len, uint32_t type, + uint32_t flags, struct nftnl_rule_expr *e) { switch(type) { - case NFT_OUTPUT_DEFAULT: - return nft_rule_expr_immediate_snprintf_default(buf, len, e, flags); - case NFT_OUTPUT_XML: - case NFT_OUTPUT_JSON: - return nft_rule_expr_immediate_export(buf, len, e, type); + case NFTNL_OUTPUT_DEFAULT: + return nftnl_rule_expr_immediate_snprintf_default(buf, len, e, flags); + case NFTNL_OUTPUT_XML: + case NFTNL_OUTPUT_JSON: + return nftnl_rule_expr_immediate_export(buf, len, e, type); default: break; } return -1; } -static void nft_rule_expr_immediate_free(struct nft_rule_expr *e) +static void nftnl_rule_expr_immediate_free(struct nftnl_rule_expr *e) { - struct nft_expr_immediate *imm = nft_expr_data(e); + struct nftnl_expr_immediate *imm = nftnl_expr_data(e); - if (e->flags & (1 << NFT_EXPR_IMM_VERDICT)) - nft_free_verdict(&imm->data); + if (e->flags & (1 << NFTNL_EXPR_IMM_VERDICT)) + nftnl_free_verdict(&imm->data); } struct expr_ops expr_ops_immediate = { .name = "immediate", - .alloc_len = sizeof(struct nft_expr_immediate), + .alloc_len = sizeof(struct nftnl_expr_immediate), .max_attr = NFTA_IMMEDIATE_MAX, - .free = nft_rule_expr_immediate_free, - .set = nft_rule_expr_immediate_set, - .get = nft_rule_expr_immediate_get, - .parse = nft_rule_expr_immediate_parse, - .build = nft_rule_expr_immediate_build, - .snprintf = nft_rule_expr_immediate_snprintf, - .xml_parse = nft_rule_expr_immediate_xml_parse, - .json_parse = nft_rule_expr_immediate_json_parse, + .free = nftnl_rule_expr_immediate_free, + .set = nftnl_rule_expr_immediate_set, + .get = nftnl_rule_expr_immediate_get, + .parse = nftnl_rule_expr_immediate_parse, + .build = nftnl_rule_expr_immediate_build, + .snprintf = nftnl_rule_expr_immediate_snprintf, + .xml_parse = nftnl_rule_expr_immediate_xml_parse, + .json_parse = nftnl_rule_expr_immediate_json_parse, }; -- cgit v1.2.3