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-chain-test.c | 92 +++++++++++++++++++++++++------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) (limited to 'tests/nft-chain-test.c') diff --git a/tests/nft-chain-test.c b/tests/nft-chain-test.c index ff8afed..e8f449e 100644 --- a/tests/nft-chain-test.c +++ b/tests/nft-chain-test.c @@ -23,83 +23,83 @@ static void print_err(const char *msg) printf("\033[31mERROR:\e[0m %s\n", msg); } -static void cmp_nft_chain(struct nft_chain *a, struct nft_chain *b) +static void cmp_nftnl_chain(struct nftnl_chain *a, struct nftnl_chain *b) { - if (strcmp(nft_chain_attr_get_str(a, NFT_CHAIN_ATTR_NAME), - nft_chain_attr_get_str(b, NFT_CHAIN_ATTR_NAME)) != 0) + if (strcmp(nftnl_chain_attr_get_str(a, NFTNL_CHAIN_ATTR_NAME), + nftnl_chain_attr_get_str(b, NFTNL_CHAIN_ATTR_NAME)) != 0) print_err("Chain name mismatches"); - if (strcmp(nft_chain_attr_get_str(a, NFT_CHAIN_ATTR_TABLE), - nft_chain_attr_get_str(b, NFT_CHAIN_ATTR_TABLE)) != 0) + if (strcmp(nftnl_chain_attr_get_str(a, NFTNL_CHAIN_ATTR_TABLE), + nftnl_chain_attr_get_str(b, NFTNL_CHAIN_ATTR_TABLE)) != 0) print_err("Chain table mismatches"); - if (nft_chain_attr_get_u32(a, NFT_CHAIN_ATTR_FAMILY) != - nft_chain_attr_get_u32(b, NFT_CHAIN_ATTR_FAMILY)) + if (nftnl_chain_attr_get_u32(a, NFTNL_CHAIN_ATTR_FAMILY) != + nftnl_chain_attr_get_u32(b, NFTNL_CHAIN_ATTR_FAMILY)) print_err("Chain family mismatches"); - if (nft_chain_attr_get_u32(a, NFT_CHAIN_ATTR_POLICY) != - nft_chain_attr_get_u32(b, NFT_CHAIN_ATTR_POLICY)) + if (nftnl_chain_attr_get_u32(a, NFTNL_CHAIN_ATTR_POLICY) != + nftnl_chain_attr_get_u32(b, NFTNL_CHAIN_ATTR_POLICY)) print_err("Chain policy mismatches"); - if (nft_chain_attr_get_u32(a, NFT_CHAIN_ATTR_HOOKNUM) != - nft_chain_attr_get_u32(b, NFT_CHAIN_ATTR_HOOKNUM)) + if (nftnl_chain_attr_get_u32(a, NFTNL_CHAIN_ATTR_HOOKNUM) != + nftnl_chain_attr_get_u32(b, NFTNL_CHAIN_ATTR_HOOKNUM)) print_err("Chain hooknum mismatches"); - if (nft_chain_attr_get_s32(a, NFT_CHAIN_ATTR_PRIO) != - nft_chain_attr_get_s32(b, NFT_CHAIN_ATTR_PRIO)) + if (nftnl_chain_attr_get_s32(a, NFTNL_CHAIN_ATTR_PRIO) != + nftnl_chain_attr_get_s32(b, NFTNL_CHAIN_ATTR_PRIO)) print_err("Chain Prio mismatches"); - if (nft_chain_attr_get_u32(a, NFT_CHAIN_ATTR_USE) != - nft_chain_attr_get_u32(b, NFT_CHAIN_ATTR_USE)) + if (nftnl_chain_attr_get_u32(a, NFTNL_CHAIN_ATTR_USE) != + nftnl_chain_attr_get_u32(b, NFTNL_CHAIN_ATTR_USE)) print_err("Chain use mismatches"); - if (nft_chain_attr_get_u64(a, NFT_CHAIN_ATTR_PACKETS) != - nft_chain_attr_get_u64(b, NFT_CHAIN_ATTR_PACKETS)) + if (nftnl_chain_attr_get_u64(a, NFTNL_CHAIN_ATTR_PACKETS) != + nftnl_chain_attr_get_u64(b, NFTNL_CHAIN_ATTR_PACKETS)) print_err("Chain packets mismatches"); - if (nft_chain_attr_get_u64(a, NFT_CHAIN_ATTR_BYTES) != - nft_chain_attr_get_u64(b, NFT_CHAIN_ATTR_BYTES)) + if (nftnl_chain_attr_get_u64(a, NFTNL_CHAIN_ATTR_BYTES) != + nftnl_chain_attr_get_u64(b, NFTNL_CHAIN_ATTR_BYTES)) print_err("Chain bytes mismatches"); - if (nft_chain_attr_get_u64(a, NFT_CHAIN_ATTR_HANDLE) != - nft_chain_attr_get_u64(b, NFT_CHAIN_ATTR_HANDLE)) + if (nftnl_chain_attr_get_u64(a, NFTNL_CHAIN_ATTR_HANDLE) != + nftnl_chain_attr_get_u64(b, NFTNL_CHAIN_ATTR_HANDLE)) print_err("Chain handle mismatches"); - if (strcmp(nft_chain_attr_get_str(a, NFT_CHAIN_ATTR_TYPE), - nft_chain_attr_get_str(b, NFT_CHAIN_ATTR_TYPE)) != 0) + if (strcmp(nftnl_chain_attr_get_str(a, NFTNL_CHAIN_ATTR_TYPE), + nftnl_chain_attr_get_str(b, NFTNL_CHAIN_ATTR_TYPE)) != 0) print_err("Chain type mismatches"); - if (strcmp(nft_chain_attr_get_str(a, NFT_CHAIN_ATTR_DEV), - nft_chain_attr_get_str(b, NFT_CHAIN_ATTR_DEV)) != 0) + if (strcmp(nftnl_chain_attr_get_str(a, NFTNL_CHAIN_ATTR_DEV), + nftnl_chain_attr_get_str(b, NFTNL_CHAIN_ATTR_DEV)) != 0) print_err("Chain device mismatches"); } int main(int argc, char *argv[]) { - struct nft_chain *a, *b; + struct nftnl_chain *a, *b; char buf[4096]; struct nlmsghdr *nlh; - a = nft_chain_alloc(); - b = nft_chain_alloc(); + a = nftnl_chain_alloc(); + b = nftnl_chain_alloc(); if (a == NULL || b == NULL) print_err("OOM"); - nft_chain_attr_set_str(a, NFT_CHAIN_ATTR_NAME, "test"); - nft_chain_attr_set_u32(a, NFT_CHAIN_ATTR_FAMILY, AF_INET); - nft_chain_attr_set_str(a, NFT_CHAIN_ATTR_TABLE, "Table"); - nft_chain_attr_set_u32(a, NFT_CHAIN_ATTR_POLICY,0x12345678); - nft_chain_attr_set_u32(a, NFT_CHAIN_ATTR_HOOKNUM, 0x12345678); - nft_chain_attr_set_s32(a, NFT_CHAIN_ATTR_PRIO, 0x12345678); - nft_chain_attr_set_u32(a, NFT_CHAIN_ATTR_USE, 0x12345678 ); - nft_chain_attr_set_u64(a, NFT_CHAIN_ATTR_PACKETS, 0x1234567812345678); - nft_chain_attr_set_u64(a, NFT_CHAIN_ATTR_BYTES, 0x1234567812345678); - nft_chain_attr_set_u64(a, NFT_CHAIN_ATTR_HANDLE, 0x1234567812345678); - nft_chain_attr_set_str(a, NFT_CHAIN_ATTR_TYPE, "Prueba"); - nft_chain_attr_set_str(a, NFT_CHAIN_ATTR_DEV, "eth0"); + nftnl_chain_attr_set_str(a, NFTNL_CHAIN_ATTR_NAME, "test"); + nftnl_chain_attr_set_u32(a, NFTNL_CHAIN_ATTR_FAMILY, AF_INET); + nftnl_chain_attr_set_str(a, NFTNL_CHAIN_ATTR_TABLE, "Table"); + nftnl_chain_attr_set_u32(a, NFTNL_CHAIN_ATTR_POLICY,0x12345678); + nftnl_chain_attr_set_u32(a, NFTNL_CHAIN_ATTR_HOOKNUM, 0x12345678); + nftnl_chain_attr_set_s32(a, NFTNL_CHAIN_ATTR_PRIO, 0x12345678); + nftnl_chain_attr_set_u32(a, NFTNL_CHAIN_ATTR_USE, 0x12345678 ); + nftnl_chain_attr_set_u64(a, NFTNL_CHAIN_ATTR_PACKETS, 0x1234567812345678); + nftnl_chain_attr_set_u64(a, NFTNL_CHAIN_ATTR_BYTES, 0x1234567812345678); + nftnl_chain_attr_set_u64(a, NFTNL_CHAIN_ATTR_HANDLE, 0x1234567812345678); + nftnl_chain_attr_set_str(a, NFTNL_CHAIN_ATTR_TYPE, "Prueba"); + nftnl_chain_attr_set_str(a, NFTNL_CHAIN_ATTR_DEV, "eth0"); /* cmd extracted from include/linux/netfilter/nf_tables.h */ - nlh = nft_chain_nlmsg_build_hdr(buf, NFT_MSG_NEWCHAIN, AF_INET, + nlh = nftnl_chain_nlmsg_build_hdr(buf, NFT_MSG_NEWCHAIN, AF_INET, 0, 1234); - nft_chain_nlmsg_build_payload(nlh, a); + nftnl_chain_nlmsg_build_payload(nlh, a); - if (nft_chain_nlmsg_parse(nlh, b) < 0) + if (nftnl_chain_nlmsg_parse(nlh, b) < 0) print_err("parsing problems"); - cmp_nft_chain(a, b); + cmp_nftnl_chain(a, b); - nft_chain_free(a); - nft_chain_free(b); + nftnl_chain_free(a); + nftnl_chain_free(b); if (!test_ok) exit(EXIT_FAILURE); -- cgit v1.2.3