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-set-test.c | 62 ++++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'tests/nft-set-test.c') diff --git a/tests/nft-set-test.c b/tests/nft-set-test.c index 141dfd3..222b7f2 100644 --- a/tests/nft-set-test.c +++ b/tests/nft-set-test.c @@ -24,61 +24,61 @@ static void print_err(const char *msg) printf("\033[31mERROR:\e[0m %s\n", msg); } -static void cmp_nft_set(struct nft_set *a, struct nft_set *b) +static void cmp_nftnl_set(struct nftnl_set *a, struct nftnl_set *b) { - if (strcmp(nft_set_attr_get_str(a, NFT_SET_ATTR_TABLE), - nft_set_attr_get_str(b, NFT_SET_ATTR_TABLE)) != 0) + if (strcmp(nftnl_set_attr_get_str(a, NFTNL_SET_ATTR_TABLE), + nftnl_set_attr_get_str(b, NFTNL_SET_ATTR_TABLE)) != 0) print_err("Set table mismatches"); - if (strcmp(nft_set_attr_get_str(a, NFT_SET_ATTR_NAME), - nft_set_attr_get_str(b, NFT_SET_ATTR_NAME)) != 0) + if (strcmp(nftnl_set_attr_get_str(a, NFTNL_SET_ATTR_NAME), + nftnl_set_attr_get_str(b, NFTNL_SET_ATTR_NAME)) != 0) print_err("Set name mismatches"); - if (nft_set_attr_get_u32(a, NFT_SET_ATTR_FLAGS) != - nft_set_attr_get_u32(b, NFT_SET_ATTR_FLAGS)) + if (nftnl_set_attr_get_u32(a, NFTNL_SET_ATTR_FLAGS) != + nftnl_set_attr_get_u32(b, NFTNL_SET_ATTR_FLAGS)) print_err("Set flags mismatches"); - if (nft_set_attr_get_u32(a, NFT_SET_ATTR_KEY_TYPE) != - nft_set_attr_get_u32(b, NFT_SET_ATTR_KEY_TYPE)) + if (nftnl_set_attr_get_u32(a, NFTNL_SET_ATTR_KEY_TYPE) != + nftnl_set_attr_get_u32(b, NFTNL_SET_ATTR_KEY_TYPE)) print_err("Set key-type mismatches"); - if (nft_set_attr_get_u32(a, NFT_SET_ATTR_KEY_LEN) != - nft_set_attr_get_u32(b, NFT_SET_ATTR_KEY_LEN)) + if (nftnl_set_attr_get_u32(a, NFTNL_SET_ATTR_KEY_LEN) != + nftnl_set_attr_get_u32(b, NFTNL_SET_ATTR_KEY_LEN)) print_err("Set key-len mismatches"); - if (nft_set_attr_get_u32(a, NFT_SET_ATTR_DATA_TYPE) != - nft_set_attr_get_u32(b, NFT_SET_ATTR_DATA_TYPE)) + if (nftnl_set_attr_get_u32(a, NFTNL_SET_ATTR_DATA_TYPE) != + nftnl_set_attr_get_u32(b, NFTNL_SET_ATTR_DATA_TYPE)) print_err("Set data-type mismatches"); - if (nft_set_attr_get_u32(a, NFT_SET_ATTR_DATA_LEN) != - nft_set_attr_get_u32(b, NFT_SET_ATTR_DATA_LEN)) + if (nftnl_set_attr_get_u32(a, NFTNL_SET_ATTR_DATA_LEN) != + nftnl_set_attr_get_u32(b, NFTNL_SET_ATTR_DATA_LEN)) print_err("Set data-len mismatches"); } int main(int argc, char *argv[]) { - struct nft_set *a, *b = NULL; + struct nftnl_set *a, *b = NULL; char buf[4096]; struct nlmsghdr *nlh; - a = nft_set_alloc(); - b = nft_set_alloc(); + a = nftnl_set_alloc(); + b = nftnl_set_alloc(); if (a == NULL || b == NULL) print_err("OOM"); - nft_set_attr_set_str(a, NFT_SET_ATTR_TABLE, "test-table"); - nft_set_attr_set_str(a, NFT_SET_ATTR_NAME, "test-name"); - nft_set_attr_set_u32(a, NFT_SET_ATTR_FLAGS, 0x12345678); - nft_set_attr_set_u32(a, NFT_SET_ATTR_KEY_TYPE, 0x12345678); - nft_set_attr_set_u32(a, NFT_SET_ATTR_KEY_LEN, 0x12345678); - nft_set_attr_set_u32(a, NFT_SET_ATTR_DATA_TYPE, 0x12345678); - nft_set_attr_set_u32(a, NFT_SET_ATTR_DATA_LEN, 0x12345678); - nft_set_attr_set_u32(a, NFT_SET_ATTR_FAMILY, 0x12345678); + nftnl_set_attr_set_str(a, NFTNL_SET_ATTR_TABLE, "test-table"); + nftnl_set_attr_set_str(a, NFTNL_SET_ATTR_NAME, "test-name"); + nftnl_set_attr_set_u32(a, NFTNL_SET_ATTR_FLAGS, 0x12345678); + nftnl_set_attr_set_u32(a, NFTNL_SET_ATTR_KEY_TYPE, 0x12345678); + nftnl_set_attr_set_u32(a, NFTNL_SET_ATTR_KEY_LEN, 0x12345678); + nftnl_set_attr_set_u32(a, NFTNL_SET_ATTR_DATA_TYPE, 0x12345678); + nftnl_set_attr_set_u32(a, NFTNL_SET_ATTR_DATA_LEN, 0x12345678); + nftnl_set_attr_set_u32(a, NFTNL_SET_ATTR_FAMILY, 0x12345678); /* cmd extracted from include/linux/netfilter/nf_tables.h */ - nlh = nft_set_nlmsg_build_hdr(buf, NFT_MSG_NEWSET, AF_INET, 0, 1234); - nft_set_nlmsg_build_payload(nlh, a); + nlh = nftnl_set_nlmsg_build_hdr(buf, NFT_MSG_NEWSET, AF_INET, 0, 1234); + nftnl_set_nlmsg_build_payload(nlh, a); - if (nft_set_nlmsg_parse(nlh, b) < 0) + if (nftnl_set_nlmsg_parse(nlh, b) < 0) print_err("parsing problems"); - cmp_nft_set(a,b); + cmp_nftnl_set(a,b); - nft_set_free(a); nft_set_free(b); + nftnl_set_free(a); nftnl_set_free(b); if (!test_ok) exit(EXIT_FAILURE); -- cgit v1.2.3