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 --- tests/nft-rule-test.c | 62 +++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'tests/nft-rule-test.c') diff --git a/tests/nft-rule-test.c b/tests/nft-rule-test.c index 80338d0..9365444 100644 --- a/tests/nft-rule-test.c +++ b/tests/nft-rule-test.c @@ -24,60 +24,60 @@ static void print_err(const char *msg) printf("\033[31mERROR:\e[0m %s\n", msg); } -static void cmp_nft_rule(struct nft_rule *a, struct nft_rule *b) +static void cmp_nftnl_rule(struct nftnl_rule *a, struct nftnl_rule *b) { - if (nft_rule_attr_get_u32(a, NFT_RULE_ATTR_FAMILY) != - nft_rule_attr_get_u32(b, NFT_RULE_ATTR_FAMILY)) + if (nftnl_rule_attr_get_u32(a, NFTNL_RULE_ATTR_FAMILY) != + nftnl_rule_attr_get_u32(b, NFTNL_RULE_ATTR_FAMILY)) print_err("Rule family mismatches"); - if (strcmp(nft_rule_attr_get_str(a, NFT_RULE_ATTR_TABLE), - nft_rule_attr_get_str(b, NFT_RULE_ATTR_TABLE)) != 0) + if (strcmp(nftnl_rule_attr_get_str(a, NFTNL_RULE_ATTR_TABLE), + nftnl_rule_attr_get_str(b, NFTNL_RULE_ATTR_TABLE)) != 0) print_err("Rule table mismatches"); - if (strcmp(nft_rule_attr_get_str(a, NFT_RULE_ATTR_CHAIN), - nft_rule_attr_get_str(b, NFT_RULE_ATTR_CHAIN)) != 0) + if (strcmp(nftnl_rule_attr_get_str(a, NFTNL_RULE_ATTR_CHAIN), + nftnl_rule_attr_get_str(b, NFTNL_RULE_ATTR_CHAIN)) != 0) print_err("Rule table mismatches"); - if (nft_rule_attr_get_u64(a, NFT_RULE_ATTR_HANDLE) != - nft_rule_attr_get_u64(b, NFT_RULE_ATTR_HANDLE)) + if (nftnl_rule_attr_get_u64(a, NFTNL_RULE_ATTR_HANDLE) != + nftnl_rule_attr_get_u64(b, NFTNL_RULE_ATTR_HANDLE)) print_err("Rule handle mismatches"); - if (nft_rule_attr_get_u32(a, NFT_RULE_ATTR_COMPAT_PROTO) != - nft_rule_attr_get_u32(b, NFT_RULE_ATTR_COMPAT_PROTO)) + if (nftnl_rule_attr_get_u32(a, NFTNL_RULE_ATTR_COMPAT_PROTO) != + nftnl_rule_attr_get_u32(b, NFTNL_RULE_ATTR_COMPAT_PROTO)) print_err("Rule compat_proto mismatches"); - if (nft_rule_attr_get_u32(a, NFT_RULE_ATTR_COMPAT_FLAGS) != - nft_rule_attr_get_u32(b, NFT_RULE_ATTR_COMPAT_FLAGS)) + if (nftnl_rule_attr_get_u32(a, NFTNL_RULE_ATTR_COMPAT_FLAGS) != + nftnl_rule_attr_get_u32(b, NFTNL_RULE_ATTR_COMPAT_FLAGS)) print_err("Rule compat_flags mismatches"); - if (nft_rule_attr_get_u64(a, NFT_RULE_ATTR_POSITION) != - nft_rule_attr_get_u64(b, NFT_RULE_ATTR_POSITION)) + if (nftnl_rule_attr_get_u64(a, NFTNL_RULE_ATTR_POSITION) != + nftnl_rule_attr_get_u64(b, NFTNL_RULE_ATTR_POSITION)) print_err("Rule compat_position mismatches"); } int main(int argc, char *argv[]) { - struct nft_rule *a, *b; + struct nftnl_rule *a, *b; char buf[4096]; struct nlmsghdr *nlh; - a = nft_rule_alloc(); - b = nft_rule_alloc(); + a = nftnl_rule_alloc(); + b = nftnl_rule_alloc(); if (a == NULL || b == NULL) print_err("OOM"); - nft_rule_attr_set_u32(a, NFT_RULE_ATTR_FAMILY, AF_INET); - nft_rule_attr_set_str(a, NFT_RULE_ATTR_TABLE, "table"); - nft_rule_attr_set_str(a, NFT_RULE_ATTR_CHAIN, "chain"); - nft_rule_attr_set_u64(a, NFT_RULE_ATTR_HANDLE, 0x1234567812345678); - nft_rule_attr_set_u32(a, NFT_RULE_ATTR_COMPAT_PROTO, 0x12345678); - nft_rule_attr_set_u32(a, NFT_RULE_ATTR_COMPAT_FLAGS, 0x12345678); - nft_rule_attr_set_u64(a, NFT_RULE_ATTR_POSITION, 0x1234567812345678); + nftnl_rule_attr_set_u32(a, NFTNL_RULE_ATTR_FAMILY, AF_INET); + nftnl_rule_attr_set_str(a, NFTNL_RULE_ATTR_TABLE, "table"); + nftnl_rule_attr_set_str(a, NFTNL_RULE_ATTR_CHAIN, "chain"); + nftnl_rule_attr_set_u64(a, NFTNL_RULE_ATTR_HANDLE, 0x1234567812345678); + nftnl_rule_attr_set_u32(a, NFTNL_RULE_ATTR_COMPAT_PROTO, 0x12345678); + nftnl_rule_attr_set_u32(a, NFTNL_RULE_ATTR_COMPAT_FLAGS, 0x12345678); + nftnl_rule_attr_set_u64(a, NFTNL_RULE_ATTR_POSITION, 0x1234567812345678); - nlh = nft_rule_nlmsg_build_hdr(buf, NFT_MSG_NEWRULE, AF_INET, 0, 1234); - nft_rule_nlmsg_build_payload(nlh, a); + nlh = nftnl_rule_nlmsg_build_hdr(buf, NFT_MSG_NEWRULE, AF_INET, 0, 1234); + nftnl_rule_nlmsg_build_payload(nlh, a); - if (nft_rule_nlmsg_parse(nlh, b) < 0) + if (nftnl_rule_nlmsg_parse(nlh, b) < 0) print_err("parsing problems"); - cmp_nft_rule(a,b); + cmp_nftnl_rule(a,b); - nft_rule_free(a); - nft_rule_free(b); + nftnl_rule_free(a); + nftnl_rule_free(b); if (!test_ok) exit(EXIT_FAILURE); -- cgit v1.2.3