tests: shuffle values that are injected

Shuffle value that are used to set attributes, this variability should
help us catch more problems in the future.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/tests/nft-chain-test.c b/tests/nft-chain-test.c
index 3f5c5a52d7f0b0a5e8b300c5c16da61237ba5b70..d678d46e556a305622653315f48f40cf1214d962 100644 (file)
--- a/tests/nft-chain-test.c
+++ b/tests/nft-chain-test.c
@@ -79,12 +79,12 @@ int main(int argc, char *argv[])
        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_u32(a, NFTNL_CHAIN_HOOKNUM, 0x34567812);
+       nftnl_chain_set_s32(a, NFTNL_CHAIN_PRIO, 0x56781234);
+       nftnl_chain_set_u32(a, NFTNL_CHAIN_USE, 0x78123456);
        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_u64(a, NFTNL_CHAIN_BYTES, 0x7812345678123456);
+       nftnl_chain_set_u64(a, NFTNL_CHAIN_HANDLE, 0x5678123456781234);
        nftnl_chain_set_str(a, NFTNL_CHAIN_TYPE, "Prueba");
        nftnl_chain_set_str(a, NFTNL_CHAIN_DEV, "eth0");
 

diff --git a/tests/nft-expr_bitwise-test.c b/tests/nft-expr_bitwise-test.c
index 4b59751f57bff0c7ab0342c95c448f3db92f7af7..64c14466dbd294034a2c146911aad27aa59496a0 100644 (file)
--- a/tests/nft-expr_bitwise-test.c
+++ b/tests/nft-expr_bitwise-test.c
@@ -72,8 +72,8 @@ int main(int argc, char *argv[])
                print_err("OOM");
 
        nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_SREG, 0x12345678);
-       nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_DREG, 0x12345678);
-       nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_LEN, 0x12345678);
+       nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_DREG, 0x78123456);
+       nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_LEN, 0x56781234);
        nftnl_expr_set(ex, NFTNL_EXPR_BITWISE_MASK, &mask, sizeof(mask));
        nftnl_expr_set(ex, NFTNL_EXPR_BITWISE_XOR, &xor, sizeof(xor));
 

diff --git a/tests/nft-expr_cmp-test.c b/tests/nft-expr_cmp-test.c
index 23292c92bc9a17894cc1ed28958b2edaa028b291..ec00bb92182c8b4476e603450b04eda56d540da4 100644 (file)
--- a/tests/nft-expr_cmp-test.c
+++ b/tests/nft-expr_cmp-test.c
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
 
        nftnl_expr_set(ex, NFTNL_EXPR_CMP_DATA, &data_len, sizeof(data_len));
        nftnl_expr_set_u32(ex, NFTNL_EXPR_CMP_SREG, 0x12345678);
-       nftnl_expr_set_u32(ex, NFTNL_EXPR_CMP_OP, 0x12345678);
+       nftnl_expr_set_u32(ex, NFTNL_EXPR_CMP_OP, 0x78123456);
 
        nftnl_rule_add_expr(a, ex);
 

diff --git a/tests/nft-expr_counter-test.c b/tests/nft-expr_counter-test.c
index d5159522c0f6ac5a10885ea6b3a67c05fce7861e..519bc1f84592c10cac69ebb96cecc58321789406 100644 (file)
--- a/tests/nft-expr_counter-test.c
+++ b/tests/nft-expr_counter-test.c
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
                print_err("OOM");
 
        nftnl_expr_set_u64(ex, NFTNL_EXPR_CTR_BYTES, 0x123456789abcdef0);
-       nftnl_expr_set_u64(ex, NFTNL_EXPR_CTR_PACKETS, 0x123456789abcdef0);
+       nftnl_expr_set_u64(ex, NFTNL_EXPR_CTR_PACKETS, 0xf0123456789abcde);
        nftnl_rule_add_expr(a, ex);
 
        nlh = nftnl_rule_nlmsg_build_hdr(buf, NFT_MSG_NEWRULE, AF_INET, 0, 1234);

diff --git a/tests/nft-expr_ct-test.c b/tests/nft-expr_ct-test.c
index af695872a07b5c926ff25a2b4ccd43128f4558c7..e98fbabf9ccc3f38640546391e1383eaa10edb37 100644 (file)
--- a/tests/nft-expr_ct-test.c
+++ b/tests/nft-expr_ct-test.c
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
 
        nftnl_expr_set_u32(ex, NFTNL_EXPR_CT_KEY, 0x1234568);
        nftnl_expr_set_u32(ex, NFTNL_EXPR_CT_DIR, 0x12);
-       nftnl_expr_set_u32(ex, NFTNL_EXPR_CT_DREG, 0x12345678);
+       nftnl_expr_set_u32(ex, NFTNL_EXPR_CT_DREG, 0x78123456);
 
        nftnl_rule_add_expr(a, ex);
 

diff --git a/tests/nft-expr_exthdr-test.c b/tests/nft-expr_exthdr-test.c
index 622015c0814dbfc8d0339b3a9823ae17dbd2e83f..fef2dd09f0230605d3f29a9720bd80a3c7fecf71 100644 (file)
--- a/tests/nft-expr_exthdr-test.c
+++ b/tests/nft-expr_exthdr-test.c
@@ -63,8 +63,8 @@ int main(int argc, char *argv[])
 
        nftnl_expr_set_u32(ex, NFTNL_EXPR_EXTHDR_DREG, 0x12345678);
        nftnl_expr_set_u32(ex, NFTNL_EXPR_EXTHDR_TYPE, 0x12);
-       nftnl_expr_set_u32(ex, NFTNL_EXPR_EXTHDR_OFFSET, 0x12345678);
-       nftnl_expr_set_u32(ex, NFTNL_EXPR_EXTHDR_LEN, 0x12345678);
+       nftnl_expr_set_u32(ex, NFTNL_EXPR_EXTHDR_OFFSET, 0x78123456);
+       nftnl_expr_set_u32(ex, NFTNL_EXPR_EXTHDR_LEN, 0x56781234);
 
        nftnl_rule_add_expr(a, ex);
 

diff --git a/tests/nft-expr_immediate-test.c b/tests/nft-expr_immediate-test.c
index abde2e1e1cb5478c8151a20287d2f78d2e2a25bb..695e0b0edbaff097c40f7695266696275f4f9d10 100644 (file)
--- a/tests/nft-expr_immediate-test.c
+++ b/tests/nft-expr_immediate-test.c
@@ -56,8 +56,8 @@ int main(int argc, char *argv[])
        char buf[4096];
        struct nftnl_expr_iter *iter_a, *iter_b;
        struct nftnl_expr *rule_a, *rule_b;
-       uint32_t chain_t = 0x12345678;
-       uint32_t data_t = 0x12345678;
+       uint32_t chain = 0x12345678;
+       uint32_t data = 0x56781234;
 
        a = nftnl_rule_alloc();
        b = nftnl_rule_alloc();
@@ -68,9 +68,9 @@ int main(int argc, char *argv[])
                print_err("OOM");
 
        nftnl_expr_set_u32(ex, NFTNL_EXPR_IMM_DREG, 0x1234568);
-       nftnl_expr_set(ex, NFTNL_EXPR_IMM_DATA, &chain_t, sizeof(chain_t));
-       nftnl_expr_set_u32(ex, NFTNL_EXPR_IMM_VERDICT, 0x12345678);
-       nftnl_expr_set(ex, NFTNL_EXPR_IMM_CHAIN, &data_t, sizeof(data_t));
+       nftnl_expr_set(ex, NFTNL_EXPR_IMM_DATA, &data, sizeof(data));
+       nftnl_expr_set_u32(ex, NFTNL_EXPR_IMM_VERDICT, 0x78123456);
+       nftnl_expr_set(ex, NFTNL_EXPR_IMM_CHAIN, &chain, sizeof(chain));
 
        nftnl_rule_add_expr(a, ex);
 

diff --git a/tests/nft-expr_limit-test.c b/tests/nft-expr_limit-test.c
index 29fb4894b23e55e5c47d5b8afa9c2a5ecf9e55d0..2838941c4d74845fac45271a1b76bd14c59f4643 100644 (file)
--- a/tests/nft-expr_limit-test.c
+++ b/tests/nft-expr_limit-test.c
@@ -66,10 +66,10 @@ int main(int argc, char *argv[])
                print_err("OOM");
 
        nftnl_expr_set_u64(ex, NFTNL_EXPR_LIMIT_RATE, 0x123456789abcdef0);
-       nftnl_expr_set_u64(ex, NFTNL_EXPR_LIMIT_UNIT, 0x123456789abcdef0);
+       nftnl_expr_set_u64(ex, NFTNL_EXPR_LIMIT_UNIT, 0xf0123456789abcde);
        nftnl_expr_set_u32(ex, NFTNL_EXPR_LIMIT_BURST, 0x89123456);
        nftnl_expr_set_u32(ex, NFTNL_EXPR_LIMIT_TYPE, 0xdef01234);
-       nftnl_expr_set_u32(ex, NFTNL_EXPR_LIMIT_FLAGS, 0xdef01234);
+       nftnl_expr_set_u32(ex, NFTNL_EXPR_LIMIT_FLAGS, 0x34def012);
 
        nftnl_rule_add_expr(a, ex);
 

diff --git a/tests/nft-expr_log-test.c b/tests/nft-expr_log-test.c
index 3815778e02ce51b101d6e0d07475fa3cdbb93f83..b7aa3023abcd950a0c808c08de25726925150218 100644 (file)
--- a/tests/nft-expr_log-test.c
+++ b/tests/nft-expr_log-test.c
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
 
        nftnl_expr_set_u32(ex, NFTNL_EXPR_LOG_SNAPLEN, 0x12345678);
        nftnl_expr_set_u16(ex, NFTNL_EXPR_LOG_GROUP, 0x1234);
-       nftnl_expr_set_u16(ex, NFTNL_EXPR_LOG_QTHRESHOLD, 0x1234);
+       nftnl_expr_set_u16(ex, NFTNL_EXPR_LOG_QTHRESHOLD, 0x3412);
        nftnl_expr_set_str(ex, NFTNL_EXPR_LOG_PREFIX, "test");
 
        nftnl_rule_add_expr(a, ex);

diff --git a/tests/nft-expr_lookup-test.c b/tests/nft-expr_lookup-test.c
index ad028e92be1efe3ae290bed71508ca1c58335b05..83fa829814f6199679c1fbe739d6f5696d7f2904 100644 (file)
--- a/tests/nft-expr_lookup-test.c
+++ b/tests/nft-expr_lookup-test.c
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
                print_err("OOM");
 
        nftnl_expr_set_u32(ex, NFTNL_EXPR_LOOKUP_SREG, 0x12345678);
-       nftnl_expr_set_u32(ex, NFTNL_EXPR_LOOKUP_DREG, 0x12345678);
+       nftnl_expr_set_u32(ex, NFTNL_EXPR_LOOKUP_DREG, 0x78123456);
        nftnl_expr_set(ex, NFTNL_EXPR_LOOKUP_SET, &lookup_set,
                          sizeof(lookup_set));
 

diff --git a/tests/nft-expr_meta-test.c b/tests/nft-expr_meta-test.c
index 82f8fcf778b62ddd329e40e9b411b4068094cb03..8fb78737421e37a41c9be392890a01c640813a3e 100644 (file)
--- a/tests/nft-expr_meta-test.c
+++ b/tests/nft-expr_meta-test.c
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
                print_err("OOM");
 
        nftnl_expr_set_u32(ex, NFTNL_EXPR_META_KEY, 0x1234568);
-       nftnl_expr_set_u32(ex, NFTNL_EXPR_META_DREG, 0x12345678);
+       nftnl_expr_set_u32(ex, NFTNL_EXPR_META_DREG, 0x78123456);
 
        nftnl_rule_add_expr(a, ex);
 

diff --git a/tests/nft-expr_payload-test.c b/tests/nft-expr_payload-test.c
index c6521958217c334b44ab49eacb69212de16d5c5c..371372cdfb89756cf2c9e3b7a84efa3bea1d1b6a 100644 (file)
--- a/tests/nft-expr_payload-test.c
+++ b/tests/nft-expr_payload-test.c
@@ -63,9 +63,9 @@ int main(int argc, char *argv[])
                print_err("OOM");
 
        nftnl_expr_set_u32(ex, NFTNL_EXPR_PAYLOAD_DREG, 0x1234568);
-       nftnl_expr_set_u32(ex, NFTNL_EXPR_PAYLOAD_BASE, 0x12345678);
-       nftnl_expr_set_u32(ex, NFTNL_EXPR_PAYLOAD_OFFSET, 0x12345678);
-       nftnl_expr_set_u32(ex, NFTNL_EXPR_PAYLOAD_LEN, 0x12345678);
+       nftnl_expr_set_u32(ex, NFTNL_EXPR_PAYLOAD_BASE, 0x78123456);
+       nftnl_expr_set_u32(ex, NFTNL_EXPR_PAYLOAD_OFFSET, 0x56781234);
+       nftnl_expr_set_u32(ex, NFTNL_EXPR_PAYLOAD_LEN, 0x78561234);
 
        nftnl_rule_add_expr(a, ex);
 

diff --git a/tests/nft-expr_queue-test.c b/tests/nft-expr_queue-test.c
index 654e13ce0cb2ccf214b0f391369b72a25595b352..1cc39aaed64572547135451ffc52561d4a537b3c 100644 (file)
--- a/tests/nft-expr_queue-test.c
+++ b/tests/nft-expr_queue-test.c
@@ -58,9 +58,9 @@ int main(int argc, char *argv[])
        if (ex == NULL)
                print_err("OOM");
 
-       nftnl_expr_set_u16(ex, NFTNL_EXPR_QUEUE_NUM, 0x123);
-       nftnl_expr_set_u16(ex, NFTNL_EXPR_QUEUE_TOTAL, 0x2);
-       nftnl_expr_set_u16(ex, NFTNL_EXPR_QUEUE_FLAGS, 0x2);
+       nftnl_expr_set_u16(ex, NFTNL_EXPR_QUEUE_NUM, 0x01010);
+       nftnl_expr_set_u16(ex, NFTNL_EXPR_QUEUE_TOTAL, 0x1234);
+       nftnl_expr_set_u16(ex, NFTNL_EXPR_QUEUE_FLAGS, 0x4321);
 
        nftnl_rule_add_expr(a, ex);
 

diff --git a/tests/nft-expr_redir-test.c b/tests/nft-expr_redir-test.c
index 978cac679e581e21e7935a250ecfcc760dea1ee1..6c8caec969c1ee690a2abd21553bcab206ec3d5a 100644 (file)
--- a/tests/nft-expr_redir-test.c
+++ b/tests/nft-expr_redir-test.c
@@ -56,9 +56,9 @@ int main(int argc, char *argv[])
        if (ex == NULL)
                print_err("OOM");
 
-       nftnl_expr_set_u32(ex, NFTNL_EXPR_REDIR_REG_PROTO_MIN, 0x1234568);
-       nftnl_expr_set_u32(ex, NFTNL_EXPR_REDIR_REG_PROTO_MAX, 0x23456);
-       nftnl_expr_set_u32(ex, NFTNL_EXPR_REDIR_FLAGS, 0x1234568);
+       nftnl_expr_set_u32(ex, NFTNL_EXPR_REDIR_REG_PROTO_MIN, 0x12345678);
+       nftnl_expr_set_u32(ex, NFTNL_EXPR_REDIR_REG_PROTO_MAX, 0x56781234);
+       nftnl_expr_set_u32(ex, NFTNL_EXPR_REDIR_FLAGS, 0x12003400);
 
        nftnl_rule_add_expr(a, ex);
 

diff --git a/tests/nft-expr_reject-test.c b/tests/nft-expr_reject-test.c
index 5fa4cda6806615a0aba076aaffe7995f13e3f536..d8189ea8dedbdf2db25f1cf0fdce0a82d75f144b 100644 (file)
--- a/tests/nft-expr_reject-test.c
+++ b/tests/nft-expr_reject-test.c
@@ -56,8 +56,8 @@ int main(int argc, char *argv[])
        if (ex == NULL)
                print_err("OOM");
 
-       nftnl_expr_set_u32(ex, NFTNL_EXPR_REJECT_TYPE, 0x1234568);
-       nftnl_expr_set_u32(ex, NFTNL_EXPR_REJECT_CODE, 0x1234568);
+       nftnl_expr_set_u32(ex, NFTNL_EXPR_REJECT_TYPE, 0x12345678);
+       nftnl_expr_set_u32(ex, NFTNL_EXPR_REJECT_CODE, 0x45681234);
 
        nftnl_rule_add_expr(a, ex);
 

diff --git a/tests/nft-expr_target-test.c b/tests/nft-expr_target-test.c
index 634fc0a8f8d2d5ed7505376182e8fd7b6d620be1..ba56b278524e57eedd9eb05da5d9562bb715f3d3 100644 (file)
--- a/tests/nft-expr_target-test.c
+++ b/tests/nft-expr_target-test.c
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
                print_err("OOM");
 
        nftnl_expr_set(ex, NFTNL_EXPR_TG_NAME, "test", strlen("test"));
-       nftnl_expr_set_u32(ex, NFTNL_EXPR_TG_REV, 0x12345678);
+       nftnl_expr_set_u32(ex, NFTNL_EXPR_TG_REV, 0x56781234);
        nftnl_expr_set(ex, NFTNL_EXPR_TG_INFO, strdup(data), sizeof(data));
        nftnl_rule_add_expr(a, ex);