diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/nft-chain-test.c | 72 | ||||
| -rw-r--r-- | tests/nft-rule-test.c | 42 | ||||
| -rw-r--r-- | tests/nft-set-test.c | 44 | ||||
| -rw-r--r-- | tests/nft-table-test.c | 18 |
4 files changed, 88 insertions, 88 deletions
diff --git a/tests/nft-chain-test.c b/tests/nft-chain-test.c index 8ae98df..3f5c5a5 100644 --- a/tests/nft-chain-test.c +++ b/tests/nft-chain-test.c @@ -26,41 +26,41 @@ static void print_err(const char *msg) static void cmp_nftnl_chain(struct nftnl_chain *a, struct nftnl_chain *b) { - if (strcmp(nftnl_chain_attr_get_str(a, NFTNL_CHAIN_NAME), - nftnl_chain_attr_get_str(b, NFTNL_CHAIN_NAME)) != 0) + if (strcmp(nftnl_chain_get_str(a, NFTNL_CHAIN_NAME), + nftnl_chain_get_str(b, NFTNL_CHAIN_NAME)) != 0) print_err("Chain name mismatches"); - if (strcmp(nftnl_chain_attr_get_str(a, NFTNL_CHAIN_TABLE), - nftnl_chain_attr_get_str(b, NFTNL_CHAIN_TABLE)) != 0) + if (strcmp(nftnl_chain_get_str(a, NFTNL_CHAIN_TABLE), + nftnl_chain_get_str(b, NFTNL_CHAIN_TABLE)) != 0) print_err("Chain table mismatches"); - if (nftnl_chain_attr_get_u32(a, NFTNL_CHAIN_FAMILY) != - nftnl_chain_attr_get_u32(b, NFTNL_CHAIN_FAMILY)) + if (nftnl_chain_get_u32(a, NFTNL_CHAIN_FAMILY) != + nftnl_chain_get_u32(b, NFTNL_CHAIN_FAMILY)) print_err("Chain family mismatches"); - if (nftnl_chain_attr_get_u32(a, NFTNL_CHAIN_POLICY) != - nftnl_chain_attr_get_u32(b, NFTNL_CHAIN_POLICY)) + if (nftnl_chain_get_u32(a, NFTNL_CHAIN_POLICY) != + nftnl_chain_get_u32(b, NFTNL_CHAIN_POLICY)) print_err("Chain policy mismatches"); - if (nftnl_chain_attr_get_u32(a, NFTNL_CHAIN_HOOKNUM) != - nftnl_chain_attr_get_u32(b, NFTNL_CHAIN_HOOKNUM)) + if (nftnl_chain_get_u32(a, NFTNL_CHAIN_HOOKNUM) != + nftnl_chain_get_u32(b, NFTNL_CHAIN_HOOKNUM)) print_err("Chain hooknum mismatches"); - if (nftnl_chain_attr_get_s32(a, NFTNL_CHAIN_PRIO) != - nftnl_chain_attr_get_s32(b, NFTNL_CHAIN_PRIO)) + if (nftnl_chain_get_s32(a, NFTNL_CHAIN_PRIO) != + nftnl_chain_get_s32(b, NFTNL_CHAIN_PRIO)) print_err("Chain Prio mismatches"); - if (nftnl_chain_attr_get_u32(a, NFTNL_CHAIN_USE) != - nftnl_chain_attr_get_u32(b, NFTNL_CHAIN_USE)) + if (nftnl_chain_get_u32(a, NFTNL_CHAIN_USE) != + nftnl_chain_get_u32(b, NFTNL_CHAIN_USE)) print_err("Chain use mismatches"); - if (nftnl_chain_attr_get_u64(a, NFTNL_CHAIN_PACKETS) != - nftnl_chain_attr_get_u64(b, NFTNL_CHAIN_PACKETS)) + if (nftnl_chain_get_u64(a, NFTNL_CHAIN_PACKETS) != + nftnl_chain_get_u64(b, NFTNL_CHAIN_PACKETS)) print_err("Chain packets mismatches"); - if (nftnl_chain_attr_get_u64(a, NFTNL_CHAIN_BYTES) != - nftnl_chain_attr_get_u64(b, NFTNL_CHAIN_BYTES)) + if (nftnl_chain_get_u64(a, NFTNL_CHAIN_BYTES) != + nftnl_chain_get_u64(b, NFTNL_CHAIN_BYTES)) print_err("Chain bytes mismatches"); - if (nftnl_chain_attr_get_u64(a, NFTNL_CHAIN_HANDLE) != - nftnl_chain_attr_get_u64(b, NFTNL_CHAIN_HANDLE)) + if (nftnl_chain_get_u64(a, NFTNL_CHAIN_HANDLE) != + nftnl_chain_get_u64(b, NFTNL_CHAIN_HANDLE)) print_err("Chain handle mismatches"); - if (strcmp(nftnl_chain_attr_get_str(a, NFTNL_CHAIN_TYPE), - nftnl_chain_attr_get_str(b, NFTNL_CHAIN_TYPE)) != 0) + if (strcmp(nftnl_chain_get_str(a, NFTNL_CHAIN_TYPE), + nftnl_chain_get_str(b, NFTNL_CHAIN_TYPE)) != 0) print_err("Chain type mismatches"); - if (strcmp(nftnl_chain_attr_get_str(a, NFTNL_CHAIN_DEV), - nftnl_chain_attr_get_str(b, NFTNL_CHAIN_DEV)) != 0) + if (strcmp(nftnl_chain_get_str(a, NFTNL_CHAIN_DEV), + nftnl_chain_get_str(b, NFTNL_CHAIN_DEV)) != 0) print_err("Chain device mismatches"); } @@ -75,18 +75,18 @@ int main(int argc, char *argv[]) if (a == NULL || b == NULL) print_err("OOM"); - nftnl_chain_attr_set_str(a, NFTNL_CHAIN_NAME, "test"); - nftnl_chain_attr_set_u32(a, NFTNL_CHAIN_FAMILY, AF_INET); - nftnl_chain_attr_set_str(a, NFTNL_CHAIN_TABLE, "Table"); - nftnl_chain_attr_set_u32(a, NFTNL_CHAIN_POLICY,0x12345678); - nftnl_chain_attr_set_u32(a, NFTNL_CHAIN_HOOKNUM, 0x12345678); - nftnl_chain_attr_set_s32(a, NFTNL_CHAIN_PRIO, 0x12345678); - nftnl_chain_attr_set_u32(a, NFTNL_CHAIN_USE, 0x12345678 ); - nftnl_chain_attr_set_u64(a, NFTNL_CHAIN_PACKETS, 0x1234567812345678); - nftnl_chain_attr_set_u64(a, NFTNL_CHAIN_BYTES, 0x1234567812345678); - nftnl_chain_attr_set_u64(a, NFTNL_CHAIN_HANDLE, 0x1234567812345678); - nftnl_chain_attr_set_str(a, NFTNL_CHAIN_TYPE, "Prueba"); - nftnl_chain_attr_set_str(a, NFTNL_CHAIN_DEV, "eth0"); + nftnl_chain_set_str(a, NFTNL_CHAIN_NAME, "test"); + nftnl_chain_set_u32(a, NFTNL_CHAIN_FAMILY, AF_INET); + nftnl_chain_set_str(a, NFTNL_CHAIN_TABLE, "Table"); + nftnl_chain_set_u32(a, NFTNL_CHAIN_POLICY,0x12345678); + nftnl_chain_set_u32(a, NFTNL_CHAIN_HOOKNUM, 0x12345678); + nftnl_chain_set_s32(a, NFTNL_CHAIN_PRIO, 0x12345678); + nftnl_chain_set_u32(a, NFTNL_CHAIN_USE, 0x12345678 ); + nftnl_chain_set_u64(a, NFTNL_CHAIN_PACKETS, 0x1234567812345678); + nftnl_chain_set_u64(a, NFTNL_CHAIN_BYTES, 0x1234567812345678); + nftnl_chain_set_u64(a, NFTNL_CHAIN_HANDLE, 0x1234567812345678); + nftnl_chain_set_str(a, NFTNL_CHAIN_TYPE, "Prueba"); + nftnl_chain_set_str(a, NFTNL_CHAIN_DEV, "eth0"); /* cmd extracted from include/linux/netfilter/nf_tables.h */ nlh = nftnl_chain_nlmsg_build_hdr(buf, NFT_MSG_NEWCHAIN, AF_INET, diff --git a/tests/nft-rule-test.c b/tests/nft-rule-test.c index ce2fbd7..dff9634 100644 --- a/tests/nft-rule-test.c +++ b/tests/nft-rule-test.c @@ -26,26 +26,26 @@ static void print_err(const char *msg) static void cmp_nftnl_rule(struct nftnl_rule *a, struct nftnl_rule *b) { - if (nftnl_rule_attr_get_u32(a, NFTNL_RULE_FAMILY) != - nftnl_rule_attr_get_u32(b, NFTNL_RULE_FAMILY)) + if (nftnl_rule_get_u32(a, NFTNL_RULE_FAMILY) != + nftnl_rule_get_u32(b, NFTNL_RULE_FAMILY)) print_err("Rule family mismatches"); - if (strcmp(nftnl_rule_attr_get_str(a, NFTNL_RULE_TABLE), - nftnl_rule_attr_get_str(b, NFTNL_RULE_TABLE)) != 0) + if (strcmp(nftnl_rule_get_str(a, NFTNL_RULE_TABLE), + nftnl_rule_get_str(b, NFTNL_RULE_TABLE)) != 0) print_err("Rule table mismatches"); - if (strcmp(nftnl_rule_attr_get_str(a, NFTNL_RULE_CHAIN), - nftnl_rule_attr_get_str(b, NFTNL_RULE_CHAIN)) != 0) + if (strcmp(nftnl_rule_get_str(a, NFTNL_RULE_CHAIN), + nftnl_rule_get_str(b, NFTNL_RULE_CHAIN)) != 0) print_err("Rule table mismatches"); - if (nftnl_rule_attr_get_u64(a, NFTNL_RULE_HANDLE) != - nftnl_rule_attr_get_u64(b, NFTNL_RULE_HANDLE)) + if (nftnl_rule_get_u64(a, NFTNL_RULE_HANDLE) != + nftnl_rule_get_u64(b, NFTNL_RULE_HANDLE)) print_err("Rule handle mismatches"); - if (nftnl_rule_attr_get_u32(a, NFTNL_RULE_COMPAT_PROTO) != - nftnl_rule_attr_get_u32(b, NFTNL_RULE_COMPAT_PROTO)) + if (nftnl_rule_get_u32(a, NFTNL_RULE_COMPAT_PROTO) != + nftnl_rule_get_u32(b, NFTNL_RULE_COMPAT_PROTO)) print_err("Rule compat_proto mismatches"); - if (nftnl_rule_attr_get_u32(a, NFTNL_RULE_COMPAT_FLAGS) != - nftnl_rule_attr_get_u32(b, NFTNL_RULE_COMPAT_FLAGS)) + if (nftnl_rule_get_u32(a, NFTNL_RULE_COMPAT_FLAGS) != + nftnl_rule_get_u32(b, NFTNL_RULE_COMPAT_FLAGS)) print_err("Rule compat_flags mismatches"); - if (nftnl_rule_attr_get_u64(a, NFTNL_RULE_POSITION) != - nftnl_rule_attr_get_u64(b, NFTNL_RULE_POSITION)) + if (nftnl_rule_get_u64(a, NFTNL_RULE_POSITION) != + nftnl_rule_get_u64(b, NFTNL_RULE_POSITION)) print_err("Rule compat_position mismatches"); } @@ -60,13 +60,13 @@ int main(int argc, char *argv[]) if (a == NULL || b == NULL) print_err("OOM"); - nftnl_rule_attr_set_u32(a, NFTNL_RULE_FAMILY, AF_INET); - nftnl_rule_attr_set_str(a, NFTNL_RULE_TABLE, "table"); - nftnl_rule_attr_set_str(a, NFTNL_RULE_CHAIN, "chain"); - nftnl_rule_attr_set_u64(a, NFTNL_RULE_HANDLE, 0x1234567812345678); - nftnl_rule_attr_set_u32(a, NFTNL_RULE_COMPAT_PROTO, 0x12345678); - nftnl_rule_attr_set_u32(a, NFTNL_RULE_COMPAT_FLAGS, 0x12345678); - nftnl_rule_attr_set_u64(a, NFTNL_RULE_POSITION, 0x1234567812345678); + nftnl_rule_set_u32(a, NFTNL_RULE_FAMILY, AF_INET); + nftnl_rule_set_str(a, NFTNL_RULE_TABLE, "table"); + nftnl_rule_set_str(a, NFTNL_RULE_CHAIN, "chain"); + nftnl_rule_set_u64(a, NFTNL_RULE_HANDLE, 0x1234567812345678); + nftnl_rule_set_u32(a, NFTNL_RULE_COMPAT_PROTO, 0x12345678); + nftnl_rule_set_u32(a, NFTNL_RULE_COMPAT_FLAGS, 0x12345678); + nftnl_rule_set_u64(a, NFTNL_RULE_POSITION, 0x1234567812345678); nlh = nftnl_rule_nlmsg_build_hdr(buf, NFT_MSG_NEWRULE, AF_INET, 0, 1234); nftnl_rule_nlmsg_build_payload(nlh, a); diff --git a/tests/nft-set-test.c b/tests/nft-set-test.c index a9577d8..f6fbfb5 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_TABLE), - nftnl_set_attr_get_str(b, NFTNL_SET_TABLE)) != 0) + if (strcmp(nftnl_set_get_str(a, NFTNL_SET_TABLE), + nftnl_set_get_str(b, NFTNL_SET_TABLE)) != 0) print_err("Set table mismatches"); - if (strcmp(nftnl_set_attr_get_str(a, NFTNL_SET_NAME), - nftnl_set_attr_get_str(b, NFTNL_SET_NAME)) != 0) + if (strcmp(nftnl_set_get_str(a, NFTNL_SET_NAME), + nftnl_set_get_str(b, NFTNL_SET_NAME)) != 0) print_err("Set name mismatches"); - if (nftnl_set_attr_get_u32(a, NFTNL_SET_FLAGS) != - nftnl_set_attr_get_u32(b, NFTNL_SET_FLAGS)) + if (nftnl_set_get_u32(a, NFTNL_SET_FLAGS) != + nftnl_set_get_u32(b, NFTNL_SET_FLAGS)) print_err("Set flags mismatches"); - if (nftnl_set_attr_get_u32(a, NFTNL_SET_KEY_TYPE) != - nftnl_set_attr_get_u32(b, NFTNL_SET_KEY_TYPE)) + if (nftnl_set_get_u32(a, NFTNL_SET_KEY_TYPE) != + nftnl_set_get_u32(b, NFTNL_SET_KEY_TYPE)) print_err("Set key-type mismatches"); - if (nftnl_set_attr_get_u32(a, NFTNL_SET_KEY_LEN) != - nftnl_set_attr_get_u32(b, NFTNL_SET_KEY_LEN)) + if (nftnl_set_get_u32(a, NFTNL_SET_KEY_LEN) != + nftnl_set_get_u32(b, NFTNL_SET_KEY_LEN)) print_err("Set key-len mismatches"); - if (nftnl_set_attr_get_u32(a, NFTNL_SET_DATA_TYPE) != - nftnl_set_attr_get_u32(b, NFTNL_SET_DATA_TYPE)) + if (nftnl_set_get_u32(a, NFTNL_SET_DATA_TYPE) != + nftnl_set_get_u32(b, NFTNL_SET_DATA_TYPE)) print_err("Set data-type mismatches"); - if (nftnl_set_attr_get_u32(a, NFTNL_SET_DATA_LEN) != - nftnl_set_attr_get_u32(b, NFTNL_SET_DATA_LEN)) + if (nftnl_set_get_u32(a, NFTNL_SET_DATA_LEN) != + nftnl_set_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_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); + nftnl_set_set_str(a, NFTNL_SET_TABLE, "test-table"); + nftnl_set_set_str(a, NFTNL_SET_NAME, "test-name"); + nftnl_set_set_u32(a, NFTNL_SET_FLAGS, 0x12345678); + nftnl_set_set_u32(a, NFTNL_SET_KEY_TYPE, 0x12345678); + nftnl_set_set_u32(a, NFTNL_SET_KEY_LEN, 0x12345678); + nftnl_set_set_u32(a, NFTNL_SET_DATA_TYPE, 0x12345678); + nftnl_set_set_u32(a, NFTNL_SET_DATA_LEN, 0x12345678); + nftnl_set_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); diff --git a/tests/nft-table-test.c b/tests/nft-table-test.c index 2aad037..1031ffe 100644 --- a/tests/nft-table-test.c +++ b/tests/nft-table-test.c @@ -26,14 +26,14 @@ static void print_err(const char *msg) static void cmp_nftnl_table(struct nftnl_table *a, struct nftnl_table *b) { - if (strcmp(nftnl_table_attr_get_str(a, NFTNL_TABLE_NAME), - nftnl_table_attr_get_str(b, NFTNL_TABLE_NAME)) != 0) + if (strcmp(nftnl_table_get_str(a, NFTNL_TABLE_NAME), + nftnl_table_get_str(b, NFTNL_TABLE_NAME)) != 0) print_err("table name mismatches"); - if (nftnl_table_attr_get_u32(a, NFTNL_TABLE_FLAGS) != - nftnl_table_attr_get_u32(b, NFTNL_TABLE_FLAGS)) + if (nftnl_table_get_u32(a, NFTNL_TABLE_FLAGS) != + nftnl_table_get_u32(b, NFTNL_TABLE_FLAGS)) print_err("table flags mismatches"); - if (nftnl_table_attr_get_u32(a, NFTNL_TABLE_FAMILY) != - nftnl_table_attr_get_u32(b, NFTNL_TABLE_FAMILY)) + if (nftnl_table_get_u32(a, NFTNL_TABLE_FAMILY) != + nftnl_table_get_u32(b, NFTNL_TABLE_FAMILY)) print_err("tabke family mismatches"); } @@ -50,9 +50,9 @@ int main(int argc, char *argv[]) if (a == NULL || b == NULL) print_err("OOM"); - nftnl_table_attr_set_str(a, NFTNL_TABLE_NAME, "test"); - nftnl_table_attr_set_u32(a, NFTNL_TABLE_FAMILY, AF_INET); - nftnl_table_attr_set_u32(a, NFTNL_TABLE_FLAGS, 0); + nftnl_table_set_str(a, NFTNL_TABLE_NAME, "test"); + nftnl_table_set_u32(a, NFTNL_TABLE_FAMILY, AF_INET); + nftnl_table_set_u32(a, NFTNL_TABLE_FLAGS, 0); /* cmd extracted from include/linux/netfilter/nf_tables.h */ nlh = nftnl_table_nlmsg_build_hdr(buf, NFT_MSG_NEWTABLE, AF_INET, 0, |