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, 75 insertions, 75 deletions

diff --git a/src/expr/meta.c b/src/expr/meta.c
index cee09dd..98f7588 100644
--- a/src/expr/meta.c
+++ b/src/expr/meta.c
@@ -25,26 +25,26 @@
 #define NFT_META_MAX (NFT_META_CGROUP + 1)
 #endif
 
-struct nft_expr_meta {
+struct nftnl_expr_meta {
 	enum nft_meta_keys	key;
 	enum nft_registers	dreg;
 	enum nft_registers	sreg;
 };
 
 static int
-nft_rule_expr_meta_set(struct nft_rule_expr *e, uint16_t type,
+nftnl_rule_expr_meta_set(struct nftnl_rule_expr *e, uint16_t type,
 		       const void *data, uint32_t data_len)
 {
-	struct nft_expr_meta *meta = nft_expr_data(e);
+	struct nftnl_expr_meta *meta = nftnl_expr_data(e);
 
 	switch(type) {
-	case NFT_EXPR_META_KEY:
+	case NFTNL_EXPR_META_KEY:
 		meta->key = *((uint32_t *)data);
 		break;
-	case NFT_EXPR_META_DREG:
+	case NFTNL_EXPR_META_DREG:
 		meta->dreg = *((uint32_t *)data);
 		break;
-	case NFT_EXPR_META_SREG:
+	case NFTNL_EXPR_META_SREG:
 		meta->sreg = *((uint32_t *)data);
 		break;
 	default:
@@ -54,26 +54,26 @@ nft_rule_expr_meta_set(struct nft_rule_expr *e, uint16_t type,
 }
 
 static const void *
-nft_rule_expr_meta_get(const struct nft_rule_expr *e, uint16_t type,
+nftnl_rule_expr_meta_get(const struct nftnl_rule_expr *e, uint16_t type,
 		       uint32_t *data_len)
 {
-	struct nft_expr_meta *meta = nft_expr_data(e);
+	struct nftnl_expr_meta *meta = nftnl_expr_data(e);
 
 	switch(type) {
-	case NFT_EXPR_META_KEY:
+	case NFTNL_EXPR_META_KEY:
 		*data_len = sizeof(meta->key);
 		return &meta->key;
-	case NFT_EXPR_META_DREG:
+	case NFTNL_EXPR_META_DREG:
 		*data_len = sizeof(meta->dreg);
 		return &meta->dreg;
-	case NFT_EXPR_META_SREG:
+	case NFTNL_EXPR_META_SREG:
 		*data_len = sizeof(meta->sreg);
 		return &meta->sreg;
 	}
 	return NULL;
 }
 
-static int nft_rule_expr_meta_cb(const struct nlattr *attr, void *data)
+static int nftnl_rule_expr_meta_cb(const struct nlattr *attr, void *data)
 {
 	const struct nlattr **tb = data;
 	int type = mnl_attr_get_type(attr);
@@ -95,38 +95,38 @@ static int nft_rule_expr_meta_cb(const struct nlattr *attr, void *data)
 }
 
 static void
-nft_rule_expr_meta_build(struct nlmsghdr *nlh, struct nft_rule_expr *e)
+nftnl_rule_expr_meta_build(struct nlmsghdr *nlh, struct nftnl_rule_expr *e)
 {
-	struct nft_expr_meta *meta = nft_expr_data(e);
+	struct nftnl_expr_meta *meta = nftnl_expr_data(e);
 
-	if (e->flags & (1 << NFT_EXPR_META_KEY))
+	if (e->flags & (1 << NFTNL_EXPR_META_KEY))
 		mnl_attr_put_u32(nlh, NFTA_META_KEY, htonl(meta->key));
-	if (e->flags & (1 << NFT_EXPR_META_DREG))
+	if (e->flags & (1 << NFTNL_EXPR_META_DREG))
 		mnl_attr_put_u32(nlh, NFTA_META_DREG, htonl(meta->dreg));
-	if (e->flags & (1 << NFT_EXPR_META_SREG))
+	if (e->flags & (1 << NFTNL_EXPR_META_SREG))
 		mnl_attr_put_u32(nlh, NFTA_META_SREG, htonl(meta->sreg));
 }
 
 static int
-nft_rule_expr_meta_parse(struct nft_rule_expr *e, struct nlattr *attr)
+nftnl_rule_expr_meta_parse(struct nftnl_rule_expr *e, struct nlattr *attr)
 {
-	struct nft_expr_meta *meta = nft_expr_data(e);
+	struct nftnl_expr_meta *meta = nftnl_expr_data(e);
 	struct nlattr *tb[NFTA_META_MAX+1] = {};
 
-	if (mnl_attr_parse_nested(attr, nft_rule_expr_meta_cb, tb) < 0)
+	if (mnl_attr_parse_nested(attr, nftnl_rule_expr_meta_cb, tb) < 0)
 		return -1;
 
 	if (tb[NFTA_META_KEY]) {
 		meta->key = ntohl(mnl_attr_get_u32(tb[NFTA_META_KEY]));
-		e->flags |= (1 << NFT_EXPR_META_KEY);
+		e->flags |= (1 << NFTNL_EXPR_META_KEY);
 	}
 	if (tb[NFTA_META_DREG]) {
 		meta->dreg = ntohl(mnl_attr_get_u32(tb[NFTA_META_DREG]));
-		e->flags |= (1 << NFT_EXPR_META_DREG);
+		e->flags |= (1 << NFTNL_EXPR_META_DREG);
 	}
 	if (tb[NFTA_META_SREG]) {
 		meta->sreg = ntohl(mnl_attr_get_u32(tb[NFTA_META_SREG]));
-		e->flags |= (1 << NFT_EXPR_META_SREG);
+		e->flags |= (1 << NFTNL_EXPR_META_SREG);
 	}
 
 	return 0;
@@ -180,31 +180,31 @@ static inline int str2meta_key(const char *str)
 	return -1;
 }
 
-static int nft_rule_expr_meta_json_parse(struct nft_rule_expr *e, json_t *root,
-					 struct nft_parse_err *err)
+static int nftnl_rule_expr_meta_json_parse(struct nftnl_rule_expr *e, json_t *root,
+					 struct nftnl_parse_err *err)
 {
 #ifdef JSON_PARSING
 	const char *key_str;
 	uint32_t reg;
 	int key;
 
-	key_str = nft_jansson_parse_str(root, "key", err);
+	key_str = nftnl_jansson_parse_str(root, "key", err);
 	if (key_str != NULL) {
 		key = str2meta_key(key_str);
 		if (key >= 0)
-			nft_rule_expr_set_u32(e, NFT_EXPR_META_KEY, key);
+			nftnl_rule_expr_set_u32(e, NFTNL_EXPR_META_KEY, key);
 	}
 
-	if (nft_jansson_node_exist(root, "dreg")) {
-		if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &reg,
+	if (nftnl_jansson_node_exist(root, "dreg")) {
+		if (nftnl_jansson_parse_reg(root, "dreg", NFTNL_TYPE_U32, &reg,
 					  err) == 0)
-			nft_rule_expr_set_u32(e, NFT_EXPR_META_DREG, reg);
+			nftnl_rule_expr_set_u32(e, NFTNL_EXPR_META_DREG, reg);
 	}
 
-	if (nft_jansson_node_exist(root, "sreg")) {
-		if (nft_jansson_parse_reg(root, "sreg", NFT_TYPE_U32, &reg,
+	if (nftnl_jansson_node_exist(root, "sreg")) {
+		if (nftnl_jansson_parse_reg(root, "sreg", NFTNL_TYPE_U32, &reg,
 					  err) == 0)
-			nft_rule_expr_set_u32(e, NFT_EXPR_META_SREG, reg);
+			nftnl_rule_expr_set_u32(e, NFTNL_EXPR_META_SREG, reg);
 	}
 
 	return 0;
@@ -215,29 +215,29 @@ static int nft_rule_expr_meta_json_parse(struct nft_rule_expr *e, json_t *root,
 }
 
 
-static int nft_rule_expr_meta_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree,
-					struct nft_parse_err *err)
+static int nftnl_rule_expr_meta_xml_parse(struct nftnl_rule_expr *e, mxml_node_t *tree,
+					struct nftnl_parse_err *err)
 {
 #ifdef XML_PARSING
 	const char *key_str;
 	int key;
 	uint32_t dreg, sreg;
 
-	key_str = nft_mxml_str_parse(tree, "key", MXML_DESCEND_FIRST,
-				     NFT_XML_MAND, err);
+	key_str = nftnl_mxml_str_parse(tree, "key", MXML_DESCEND_FIRST,
+				     NFTNL_XML_MAND, err);
 	if (key_str != NULL) {
 		key = str2meta_key(key_str);
 		if (key >= 0)
-			nft_rule_expr_set_u32(e, NFT_EXPR_META_KEY, key);
+			nftnl_rule_expr_set_u32(e, NFTNL_EXPR_META_KEY, key);
 	}
 
-	if (nft_mxml_reg_parse(tree, "dreg", &dreg, MXML_DESCEND_FIRST,
-			       NFT_XML_OPT, err) == 0)
-		nft_rule_expr_set_u32(e, NFT_EXPR_META_DREG, dreg);
+	if (nftnl_mxml_reg_parse(tree, "dreg", &dreg, MXML_DESCEND_FIRST,
+			       NFTNL_XML_OPT, err) == 0)
+		nftnl_rule_expr_set_u32(e, NFTNL_EXPR_META_DREG, dreg);
 
-	if (nft_mxml_reg_parse(tree, "sreg", &sreg, MXML_DESCEND_FIRST,
-			       NFT_XML_OPT, err) == 0)
-		nft_rule_expr_set_u32(e, NFT_EXPR_META_SREG, sreg);
+	if (nftnl_mxml_reg_parse(tree, "sreg", &sreg, MXML_DESCEND_FIRST,
+			       NFTNL_XML_OPT, err) == 0)
+		nftnl_rule_expr_set_u32(e, NFTNL_EXPR_META_SREG, sreg);
 
 	return 0;
 #else
@@ -247,48 +247,48 @@ static int nft_rule_expr_meta_xml_parse(struct nft_rule_expr *e, mxml_node_t *tr
 }
 
 static int
-nft_rule_expr_meta_snprintf_default(char *buf, size_t len,
-				    struct nft_rule_expr *e)
+nftnl_rule_expr_meta_snprintf_default(char *buf, size_t len,
+				    struct nftnl_rule_expr *e)
 {
-	struct nft_expr_meta *meta = nft_expr_data(e);
+	struct nftnl_expr_meta *meta = nftnl_expr_data(e);
 
-	if (e->flags & (1 << NFT_EXPR_META_SREG)) {
+	if (e->flags & (1 << NFTNL_EXPR_META_SREG)) {
 		return snprintf(buf, len, "set %s with reg %u ",
 				meta_key2str(meta->key), meta->sreg);
 	}
-	if (e->flags & (1 << NFT_EXPR_META_DREG)) {
+	if (e->flags & (1 << NFTNL_EXPR_META_DREG)) {
 		return snprintf(buf, len, "load %s => reg %u ",
 				meta_key2str(meta->key), meta->dreg);
 	}
 	return 0;
 }
 
-static int nft_rule_expr_meta_export(char *buf, size_t size,
-				     struct nft_rule_expr *e, int type)
+static int nftnl_rule_expr_meta_export(char *buf, size_t size,
+				     struct nftnl_rule_expr *e, int type)
 {
-	struct nft_expr_meta *meta = nft_expr_data(e);
-	NFT_BUF_INIT(b, buf, size);
+	struct nftnl_expr_meta *meta = nftnl_expr_data(e);
+	NFTNL_BUF_INIT(b, buf, size);
 
-	if (e->flags & (1 << NFT_EXPR_META_DREG))
-		nft_buf_u32(&b, type, meta->dreg, DREG);
-	if (e->flags & (1 << NFT_EXPR_META_KEY))
-		nft_buf_str(&b, type, meta_key2str(meta->key), KEY);
-	if (e->flags & (1 << NFT_EXPR_META_SREG))
-		nft_buf_u32(&b, type, meta->sreg, SREG);
+	if (e->flags & (1 << NFTNL_EXPR_META_DREG))
+		nftnl_buf_u32(&b, type, meta->dreg, DREG);
+	if (e->flags & (1 << NFTNL_EXPR_META_KEY))
+		nftnl_buf_str(&b, type, meta_key2str(meta->key), KEY);
+	if (e->flags & (1 << NFTNL_EXPR_META_SREG))
+		nftnl_buf_u32(&b, type, meta->sreg, SREG);
 
-	return nft_buf_done(&b);
+	return nftnl_buf_done(&b);
 }
 
 static int
-nft_rule_expr_meta_snprintf(char *buf, size_t len, uint32_t type,
-			    uint32_t flags, struct nft_rule_expr *e)
+nftnl_rule_expr_meta_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_meta_snprintf_default(buf, len, e);
-	case NFT_OUTPUT_XML:
-	case NFT_OUTPUT_JSON:
-		return nft_rule_expr_meta_export(buf, len, e, type);
+	case NFTNL_OUTPUT_DEFAULT:
+		return nftnl_rule_expr_meta_snprintf_default(buf, len, e);
+	case NFTNL_OUTPUT_XML:
+	case NFTNL_OUTPUT_JSON:
+		return nftnl_rule_expr_meta_export(buf, len, e, type);
 	default:
 		break;
 	}
@@ -297,13 +297,13 @@ nft_rule_expr_meta_snprintf(char *buf, size_t len, uint32_t type,
 
 struct expr_ops expr_ops_meta = {
 	.name		= "meta",
-	.alloc_len	= sizeof(struct nft_expr_meta),
+	.alloc_len	= sizeof(struct nftnl_expr_meta),
 	.max_attr	= NFTA_META_MAX,
-	.set		= nft_rule_expr_meta_set,
-	.get		= nft_rule_expr_meta_get,
-	.parse		= nft_rule_expr_meta_parse,
-	.build		= nft_rule_expr_meta_build,
-	.snprintf	= nft_rule_expr_meta_snprintf,
-	.xml_parse 	= nft_rule_expr_meta_xml_parse,
-	.json_parse 	= nft_rule_expr_meta_json_parse,
+	.set		= nftnl_rule_expr_meta_set,
+	.get		= nftnl_rule_expr_meta_get,
+	.parse		= nftnl_rule_expr_meta_parse,
+	.build		= nftnl_rule_expr_meta_build,
+	.snprintf	= nftnl_rule_expr_meta_snprintf,
+	.xml_parse 	= nftnl_rule_expr_meta_xml_parse,
+	.json_parse 	= nftnl_rule_expr_meta_json_parse,
 };