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 <pablo@netfilter.org>

1 files changed, 60 insertions, 60 deletions

diff --git a/src/expr/reject.c b/src/expr/reject.c
index a9c13d5..e0bfc71 100644
--- a/src/expr/reject.c
+++ b/src/expr/reject.c
@@ -21,21 +21,21 @@
 #include <libnftnl/expr.h>
 #include <libnftnl/rule.h>
 
-struct nft_expr_reject {
+struct nftnl_expr_reject {
 	uint32_t		type;
 	uint8_t			icmp_code;
 };
 
-static int nft_rule_expr_reject_set(struct nft_rule_expr *e, uint16_t type,
+static int nftnl_rule_expr_reject_set(struct nftnl_rule_expr *e, uint16_t type,
 				    const void *data, uint32_t data_len)
 {
-	struct nft_expr_reject *reject = nft_expr_data(e);
+	struct nftnl_expr_reject *reject = nftnl_expr_data(e);
 
 	switch(type) {
-	case NFT_EXPR_REJECT_TYPE:
+	case NFTNL_EXPR_REJECT_TYPE:
 		reject->type = *((uint32_t *)data);
 		break;
-	case NFT_EXPR_REJECT_CODE:
+	case NFTNL_EXPR_REJECT_CODE:
 		reject->icmp_code = *((uint8_t *)data);
 		break;
 	default:
@@ -45,23 +45,23 @@ static int nft_rule_expr_reject_set(struct nft_rule_expr *e, uint16_t type,
 }
 
 static const void *
-nft_rule_expr_reject_get(const struct nft_rule_expr *e, uint16_t type,
+nftnl_rule_expr_reject_get(const struct nftnl_rule_expr *e, uint16_t type,
 			 uint32_t *data_len)
 {
-	struct nft_expr_reject *reject = nft_expr_data(e);
+	struct nftnl_expr_reject *reject = nftnl_expr_data(e);
 
 	switch(type) {
-	case NFT_EXPR_REJECT_TYPE:
+	case NFTNL_EXPR_REJECT_TYPE:
 		*data_len = sizeof(reject->type);
 		return &reject->type;
-	case NFT_EXPR_REJECT_CODE:
+	case NFTNL_EXPR_REJECT_CODE:
 		*data_len = sizeof(reject->icmp_code);
 		return &reject->icmp_code;
 	}
 	return NULL;
 }
 
-static int nft_rule_expr_reject_cb(const struct nlattr *attr, void *data)
+static int nftnl_rule_expr_reject_cb(const struct nlattr *attr, void *data)
 {
 	const struct nlattr **tb = data;
 	int type = mnl_attr_get_type(attr);
@@ -85,50 +85,50 @@ static int nft_rule_expr_reject_cb(const struct nlattr *attr, void *data)
 }
 
 static void
-nft_rule_expr_reject_build(struct nlmsghdr *nlh, struct nft_rule_expr *e)
+nftnl_rule_expr_reject_build(struct nlmsghdr *nlh, struct nftnl_rule_expr *e)
 {
-	struct nft_expr_reject *reject = nft_expr_data(e);
+	struct nftnl_expr_reject *reject = nftnl_expr_data(e);
 
-	if (e->flags & (1 << NFT_EXPR_REJECT_TYPE))
+	if (e->flags & (1 << NFTNL_EXPR_REJECT_TYPE))
 		mnl_attr_put_u32(nlh, NFTA_REJECT_TYPE, htonl(reject->type));
-	if (e->flags & (1 << NFT_EXPR_REJECT_CODE))
+	if (e->flags & (1 << NFTNL_EXPR_REJECT_CODE))
 		mnl_attr_put_u8(nlh, NFTA_REJECT_ICMP_CODE, reject->icmp_code);
 }
 
 static int
-nft_rule_expr_reject_parse(struct nft_rule_expr *e, struct nlattr *attr)
+nftnl_rule_expr_reject_parse(struct nftnl_rule_expr *e, struct nlattr *attr)
 {
-	struct nft_expr_reject *reject = nft_expr_data(e);
+	struct nftnl_expr_reject *reject = nftnl_expr_data(e);
 	struct nlattr *tb[NFTA_REJECT_MAX+1] = {};
 
-	if (mnl_attr_parse_nested(attr, nft_rule_expr_reject_cb, tb) < 0)
+	if (mnl_attr_parse_nested(attr, nftnl_rule_expr_reject_cb, tb) < 0)
 		return -1;
 
 	if (tb[NFTA_REJECT_TYPE]) {
 		reject->type = ntohl(mnl_attr_get_u32(tb[NFTA_REJECT_TYPE]));
-		e->flags |= (1 << NFT_EXPR_REJECT_TYPE);
+		e->flags |= (1 << NFTNL_EXPR_REJECT_TYPE);
 	}
 	if (tb[NFTA_REJECT_ICMP_CODE]) {
 		reject->icmp_code = mnl_attr_get_u8(tb[NFTA_REJECT_ICMP_CODE]);
-		e->flags |= (1 << NFT_EXPR_REJECT_CODE);
+		e->flags |= (1 << NFTNL_EXPR_REJECT_CODE);
 	}
 
 	return 0;
 }
 
 static int
-nft_rule_expr_reject_json_parse(struct nft_rule_expr *e, json_t *root,
-				struct nft_parse_err *err)
+nftnl_rule_expr_reject_json_parse(struct nftnl_rule_expr *e, json_t *root,
+				struct nftnl_parse_err *err)
 {
 #ifdef JSON_PARSING
 	uint32_t type;
 	uint8_t code;
 
-	if (nft_jansson_parse_val(root, "type", NFT_TYPE_U32, &type, err) == 0)
-		nft_rule_expr_set_u32(e, NFT_EXPR_REJECT_TYPE, type);
+	if (nftnl_jansson_parse_val(root, "type", NFTNL_TYPE_U32, &type, err) == 0)
+		nftnl_rule_expr_set_u32(e, NFTNL_EXPR_REJECT_TYPE, type);
 
-	if (nft_jansson_parse_val(root, "code", NFT_TYPE_U8, &code, err) == 0)
-		nft_rule_expr_set_u8(e, NFT_EXPR_REJECT_CODE, code);
+	if (nftnl_jansson_parse_val(root, "code", NFTNL_TYPE_U8, &code, err) == 0)
+		nftnl_rule_expr_set_u8(e, NFTNL_EXPR_REJECT_CODE, code);
 
 	return 0;
 #else
@@ -138,20 +138,20 @@ nft_rule_expr_reject_json_parse(struct nft_rule_expr *e, json_t *root,
 }
 
 static int
-nft_rule_expr_reject_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree,
-			       struct nft_parse_err *err)
+nftnl_rule_expr_reject_xml_parse(struct nftnl_rule_expr *e, mxml_node_t *tree,
+			       struct nftnl_parse_err *err)
 {
 #ifdef XML_PARSING
 	uint32_t type;
 	uint8_t code;
 
-	if (nft_mxml_num_parse(tree, "type", MXML_DESCEND_FIRST, BASE_DEC,
-			       &type, NFT_TYPE_U32, NFT_XML_MAND, err) == 0)
-		nft_rule_expr_set_u32(e, NFT_EXPR_REJECT_TYPE, type);
+	if (nftnl_mxml_num_parse(tree, "type", MXML_DESCEND_FIRST, BASE_DEC,
+			       &type, NFTNL_TYPE_U32, NFTNL_XML_MAND, err) == 0)
+		nftnl_rule_expr_set_u32(e, NFTNL_EXPR_REJECT_TYPE, type);
 
-	if (nft_mxml_num_parse(tree, "code", MXML_DESCEND_FIRST, BASE_DEC,
-			       &code, NFT_TYPE_U8, NFT_XML_MAND, err) == 0)
-		nft_rule_expr_set_u8(e, NFT_EXPR_REJECT_CODE, code);
+	if (nftnl_mxml_num_parse(tree, "code", MXML_DESCEND_FIRST, BASE_DEC,
+			       &code, NFTNL_TYPE_U8, NFTNL_XML_MAND, err) == 0)
+		nftnl_rule_expr_set_u8(e, NFTNL_EXPR_REJECT_CODE, code);
 
 	return 0;
 #else
@@ -160,39 +160,39 @@ nft_rule_expr_reject_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree,
 #endif
 }
 
-static int nft_rule_expr_reject_snprintf_default(char *buf, size_t len,
-						 struct nft_rule_expr *e)
+static int nftnl_rule_expr_reject_snprintf_default(char *buf, size_t len,
+						 struct nftnl_rule_expr *e)
 {
-	struct nft_expr_reject *reject = nft_expr_data(e);
+	struct nftnl_expr_reject *reject = nftnl_expr_data(e);
 
 	return snprintf(buf, len, "type %u code %u ",
 			reject->type, reject->icmp_code);
 }
 
-static int nft_rule_expr_reject_export(char *buf, size_t size,
-				       struct nft_rule_expr *e, int type)
+static int nftnl_rule_expr_reject_export(char *buf, size_t size,
+				       struct nftnl_rule_expr *e, int type)
 {
-	struct nft_expr_reject *reject = nft_expr_data(e);
-	NFT_BUF_INIT(b, buf, size);
+	struct nftnl_expr_reject *reject = nftnl_expr_data(e);
+	NFTNL_BUF_INIT(b, buf, size);
 
-	if (e->flags & (1 << NFT_EXPR_REJECT_TYPE))
-		nft_buf_u32(&b, type, reject->type, TYPE);
-	if (e->flags & (1 << NFT_EXPR_REJECT_CODE))
-		nft_buf_u32(&b, type, reject->icmp_code, CODE);
+	if (e->flags & (1 << NFTNL_EXPR_REJECT_TYPE))
+		nftnl_buf_u32(&b, type, reject->type, TYPE);
+	if (e->flags & (1 << NFTNL_EXPR_REJECT_CODE))
+		nftnl_buf_u32(&b, type, reject->icmp_code, CODE);
 
-	return nft_buf_done(&b);
+	return nftnl_buf_done(&b);
 }
 
 static int
-nft_rule_expr_reject_snprintf(char *buf, size_t len, uint32_t type,
-			      uint32_t flags, struct nft_rule_expr *e)
+nftnl_rule_expr_reject_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_reject_snprintf_default(buf, len, e);
-	case NFT_OUTPUT_XML:
-	case NFT_OUTPUT_JSON:
-		return nft_rule_expr_reject_export(buf, len, e, type);
+	case NFTNL_OUTPUT_DEFAULT:
+		return nftnl_rule_expr_reject_snprintf_default(buf, len, e);
+	case NFTNL_OUTPUT_XML:
+	case NFTNL_OUTPUT_JSON:
+		return nftnl_rule_expr_reject_export(buf, len, e, type);
 	default:
 		break;
 	}
@@ -201,13 +201,13 @@ nft_rule_expr_reject_snprintf(char *buf, size_t len, uint32_t type,
 
 struct expr_ops expr_ops_reject = {
 	.name		= "reject",
-	.alloc_len	= sizeof(struct nft_expr_reject),
+	.alloc_len	= sizeof(struct nftnl_expr_reject),
 	.max_attr	= NFTA_REJECT_MAX,
-	.set		= nft_rule_expr_reject_set,
-	.get		= nft_rule_expr_reject_get,
-	.parse		= nft_rule_expr_reject_parse,
-	.build		= nft_rule_expr_reject_build,
-	.snprintf	= nft_rule_expr_reject_snprintf,
-	.xml_parse	= nft_rule_expr_reject_xml_parse,
-	.json_parse	= nft_rule_expr_reject_json_parse,
+	.set		= nftnl_rule_expr_reject_set,
+	.get		= nftnl_rule_expr_reject_get,
+	.parse		= nftnl_rule_expr_reject_parse,
+	.build		= nftnl_rule_expr_reject_build,
+	.snprintf	= nftnl_rule_expr_reject_snprintf,
+	.xml_parse	= nftnl_rule_expr_reject_xml_parse,
+	.json_parse	= nftnl_rule_expr_reject_json_parse,
 };