From 0e7b6c4983af4ddd3a50c3ce756638af157c7130 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Mon, 7 Sep 2015 18:02:50 +0200 Subject: src: get rid of _ATTR_ infix in new nfntl_ definitions The constant names are already large, trim off the _ATTR_ infix in the attribute definitions. Signed-off-by: Pablo Neira Ayuso --- tests/nft-set-test.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'tests/nft-set-test.c') diff --git a/tests/nft-set-test.c b/tests/nft-set-test.c index 222b7f2..a9577d8 100644 --- a/tests/nft-set-test.c +++ b/tests/nft-set-test.c @@ -26,26 +26,26 @@ static void print_err(const char *msg) static void cmp_nftnl_set(struct nftnl_set *a, struct nftnl_set *b) { - if (strcmp(nftnl_set_attr_get_str(a, NFTNL_SET_ATTR_TABLE), - nftnl_set_attr_get_str(b, NFTNL_SET_ATTR_TABLE)) != 0) + if (strcmp(nftnl_set_attr_get_str(a, NFTNL_SET_TABLE), + nftnl_set_attr_get_str(b, NFTNL_SET_TABLE)) != 0) print_err("Set table mismatches"); - if (strcmp(nftnl_set_attr_get_str(a, NFTNL_SET_ATTR_NAME), - nftnl_set_attr_get_str(b, NFTNL_SET_ATTR_NAME)) != 0) + if (strcmp(nftnl_set_attr_get_str(a, NFTNL_SET_NAME), + nftnl_set_attr_get_str(b, NFTNL_SET_NAME)) != 0) print_err("Set name mismatches"); - if (nftnl_set_attr_get_u32(a, NFTNL_SET_ATTR_FLAGS) != - nftnl_set_attr_get_u32(b, NFTNL_SET_ATTR_FLAGS)) + if (nftnl_set_attr_get_u32(a, NFTNL_SET_FLAGS) != + nftnl_set_attr_get_u32(b, NFTNL_SET_FLAGS)) print_err("Set flags mismatches"); - if (nftnl_set_attr_get_u32(a, NFTNL_SET_ATTR_KEY_TYPE) != - nftnl_set_attr_get_u32(b, NFTNL_SET_ATTR_KEY_TYPE)) + if (nftnl_set_attr_get_u32(a, NFTNL_SET_KEY_TYPE) != + nftnl_set_attr_get_u32(b, NFTNL_SET_KEY_TYPE)) print_err("Set key-type mismatches"); - if (nftnl_set_attr_get_u32(a, NFTNL_SET_ATTR_KEY_LEN) != - nftnl_set_attr_get_u32(b, NFTNL_SET_ATTR_KEY_LEN)) + if (nftnl_set_attr_get_u32(a, NFTNL_SET_KEY_LEN) != + nftnl_set_attr_get_u32(b, NFTNL_SET_KEY_LEN)) print_err("Set key-len mismatches"); - if (nftnl_set_attr_get_u32(a, NFTNL_SET_ATTR_DATA_TYPE) != - nftnl_set_attr_get_u32(b, NFTNL_SET_ATTR_DATA_TYPE)) + if (nftnl_set_attr_get_u32(a, NFTNL_SET_DATA_TYPE) != + nftnl_set_attr_get_u32(b, NFTNL_SET_DATA_TYPE)) print_err("Set data-type mismatches"); - if (nftnl_set_attr_get_u32(a, NFTNL_SET_ATTR_DATA_LEN) != - nftnl_set_attr_get_u32(b, NFTNL_SET_ATTR_DATA_LEN)) + if (nftnl_set_attr_get_u32(a, NFTNL_SET_DATA_LEN) != + nftnl_set_attr_get_u32(b, NFTNL_SET_DATA_LEN)) print_err("Set data-len mismatches"); } @@ -60,14 +60,14 @@ int main(int argc, char *argv[]) if (a == NULL || b == NULL) print_err("OOM"); - 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); + nftnl_set_attr_set_str(a, NFTNL_SET_TABLE, "test-table"); + nftnl_set_attr_set_str(a, NFTNL_SET_NAME, "test-name"); + nftnl_set_attr_set_u32(a, NFTNL_SET_FLAGS, 0x12345678); + nftnl_set_attr_set_u32(a, NFTNL_SET_KEY_TYPE, 0x12345678); + nftnl_set_attr_set_u32(a, NFTNL_SET_KEY_LEN, 0x12345678); + nftnl_set_attr_set_u32(a, NFTNL_SET_DATA_TYPE, 0x12345678); + nftnl_set_attr_set_u32(a, NFTNL_SET_DATA_LEN, 0x12345678); + nftnl_set_attr_set_u32(a, NFTNL_SET_FAMILY, 0x12345678); /* cmd extracted from include/linux/netfilter/nf_tables.h */ nlh = nftnl_set_nlmsg_build_hdr(buf, NFT_MSG_NEWSET, AF_INET, 0, 1234); -- cgit v1.2.3