examples: Replace use of deprecated symbols

Do not use unqualified setters to avoid the warnings. Pass a (false)
zero length value to nftnl_flowtable_set_data() when assigning to
NFTNL_FLOWTABLE_DEVICES as the length value is unused and not even
usable. Maybe one should introduce a dedicated
nftnl_flowtable_set_devices() at a later point.

Fixes: 7349a70634fa0 ("Deprecate untyped data setters")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Acked-by: Arturo Borrero Gonzalez <arturo@netfilter.org>

diff --git a/examples/nft-chain-add.c b/examples/nft-chain-add.c
index 5796d10f8668c6ca2793e84d55f384f3ea1f1729..cde4c974759a0f31b5dae81a9f889fee5bb3a73a 100644 (file)
--- a/examples/nft-chain-add.c
+++ b/examples/nft-chain-add.c
@@ -48,8 +48,8 @@ static struct nftnl_chain *chain_add_parse(int argc, char *argv[])
                perror("OOM");
                return NULL;
        }
-       nftnl_chain_set(t, NFTNL_CHAIN_TABLE, argv[2]);
-       nftnl_chain_set(t, NFTNL_CHAIN_NAME, argv[3]);
+       nftnl_chain_set_str(t, NFTNL_CHAIN_TABLE, argv[2]);
+       nftnl_chain_set_str(t, NFTNL_CHAIN_NAME, argv[3]);
        if (argc == 6) {
                nftnl_chain_set_u32(t, NFTNL_CHAIN_HOOKNUM, hooknum);
                nftnl_chain_set_u32(t, NFTNL_CHAIN_PRIO, atoi(argv[5]));

diff --git a/examples/nft-chain-del.c b/examples/nft-chain-del.c
index 09a47182fe499b3ee45edcef3cccb206f6ddad0c..9956009bb20b739087b5df1b52f2ea4429f3044b 100644 (file)
--- a/examples/nft-chain-del.c
+++ b/examples/nft-chain-del.c
@@ -30,8 +30,8 @@ static struct nftnl_chain *chain_del_parse(int argc, char *argv[])
                return NULL;
        }
 
-       nftnl_chain_set(t, NFTNL_CHAIN_TABLE, argv[2]);
-       nftnl_chain_set(t, NFTNL_CHAIN_NAME, argv[3]);
+       nftnl_chain_set_str(t, NFTNL_CHAIN_TABLE, argv[2]);
+       nftnl_chain_set_str(t, NFTNL_CHAIN_NAME, argv[3]);
 
        return t;
 }

diff --git a/examples/nft-chain-get.c b/examples/nft-chain-get.c
index fcccbf718fd7ee25cbdebecb1241192efa80e049..4e3b3c1459dc85a3c36ee4c7e5a0027d94f40cdd 100644 (file)
--- a/examples/nft-chain-get.c
+++ b/examples/nft-chain-get.c
@@ -86,8 +86,8 @@ int main(int argc, char *argv[])
                }
                nlh = nftnl_chain_nlmsg_build_hdr(buf, NFT_MSG_GETCHAIN, family,
                                                NLM_F_ACK, seq);
-               nftnl_chain_set(t, NFTNL_CHAIN_TABLE, argv[2]);
-               nftnl_chain_set(t, NFTNL_CHAIN_NAME, argv[3]);
+               nftnl_chain_set_str(t, NFTNL_CHAIN_TABLE, argv[2]);
+               nftnl_chain_set_str(t, NFTNL_CHAIN_NAME, argv[3]);
                nftnl_chain_nlmsg_build_payload(nlh, t);
                nftnl_chain_free(t);
        } else if (argc >= 2) {

diff --git a/examples/nft-ct-helper-get.c b/examples/nft-ct-helper-get.c
index eb0313322ca792e7165855992618719580dd7474..34134af196a83f64bc269f28bd015f6c73c0e4ea 100644 (file)
--- a/examples/nft-ct-helper-get.c
+++ b/examples/nft-ct-helper-get.c
@@ -90,13 +90,13 @@ int main(int argc, char *argv[])
                nlh = nftnl_nlmsg_build_hdr(buf, NFT_MSG_GETOBJ, family,
                                            NLM_F_DUMP, seq);
                if (argc == 3) {
-                       nftnl_obj_set(t, NFTNL_OBJ_TABLE, argv[2]);
+                       nftnl_obj_set_str(t, NFTNL_OBJ_TABLE, argv[2]);
                        nftnl_obj_nlmsg_build_payload(nlh, t);
                        nftnl_obj_free(t);
                }
        } else {
-               nftnl_obj_set(t, NFTNL_OBJ_TABLE, argv[2]);
-               nftnl_obj_set(t, NFTNL_OBJ_NAME, argv[3]);
+               nftnl_obj_set_str(t, NFTNL_OBJ_TABLE, argv[2]);
+               nftnl_obj_set_str(t, NFTNL_OBJ_NAME, argv[3]);
 
                nlh = nftnl_nlmsg_build_hdr(buf, NFT_MSG_GETOBJ, family,
                                            NLM_F_ACK, seq);

diff --git a/examples/nft-ct-timeout-add.c b/examples/nft-ct-timeout-add.c
index 57c0cf00ea7a4717465c1e816d4e5a1ada9b0fdc..913290f92340d3889c2249782f31cf1e1b64464e 100644 (file)
--- a/examples/nft-ct-timeout-add.c
+++ b/examples/nft-ct-timeout-add.c
@@ -71,7 +71,8 @@ static struct nftnl_obj *obj_add_parse(int argc, char *argv[])
        nftnl_obj_set_str(t, NFTNL_OBJ_NAME, argv[3]);
        nftnl_obj_set_u8(t, NFTNL_OBJ_CT_TIMEOUT_L4PROTO, l4proto);
        nftnl_obj_set_u16(t, NFTNL_OBJ_CT_TIMEOUT_L3PROTO, NFPROTO_IPV4);
-       nftnl_obj_set(t, NFTNL_OBJ_CT_TIMEOUT_ARRAY, timeout);
+       nftnl_obj_set_data(t, NFTNL_OBJ_CT_TIMEOUT_ARRAY,
+                          timeout, timeout_array_size);
        return t;
 
 }

diff --git a/examples/nft-ct-timeout-get.c b/examples/nft-ct-timeout-get.c
index badcd234529b9382caa2b4a9ec94899485527fc6..18aed52e987e416573d1706be742cb6f58c61d58 100644 (file)
--- a/examples/nft-ct-timeout-get.c
+++ b/examples/nft-ct-timeout-get.c
@@ -89,13 +89,13 @@ int main(int argc, char *argv[])
                nlh = nftnl_nlmsg_build_hdr(buf, NFT_MSG_GETOBJ, family,
                                            NLM_F_DUMP, seq);
                if (argc == 3) {
-                       nftnl_obj_set(t, NFTNL_OBJ_TABLE, argv[2]);
+                       nftnl_obj_set_str(t, NFTNL_OBJ_TABLE, argv[2]);
                        nftnl_obj_nlmsg_build_payload(nlh, t);
                        nftnl_obj_free(t);
                }
        } else {
-               nftnl_obj_set(t, NFTNL_OBJ_TABLE, argv[2]);
-               nftnl_obj_set(t, NFTNL_OBJ_NAME, argv[3]);
+               nftnl_obj_set_str(t, NFTNL_OBJ_TABLE, argv[2]);
+               nftnl_obj_set_str(t, NFTNL_OBJ_NAME, argv[3]);
 
                nlh = nftnl_nlmsg_build_hdr(buf, NFT_MSG_GETOBJ, family,
                                            NLM_F_ACK, seq);

diff --git a/examples/nft-flowtable-add.c b/examples/nft-flowtable-add.c
index 8363027deb544ef6ddf3884ad8dc97ae1e41b980..f42d20667c9781cd5fa5fb753f22ec44eebf9fab 100644 (file)
--- a/examples/nft-flowtable-add.c
+++ b/examples/nft-flowtable-add.c
@@ -27,13 +27,13 @@ static struct nftnl_flowtable *flowtable_add_parse(int argc, char *argv[])
                perror("OOM");
                return NULL;
        }
-       nftnl_flowtable_set(t, NFTNL_FLOWTABLE_TABLE, argv[2]);
-       nftnl_flowtable_set(t, NFTNL_FLOWTABLE_NAME, argv[3]);
+       nftnl_flowtable_set_str(t, NFTNL_FLOWTABLE_TABLE, argv[2]);
+       nftnl_flowtable_set_str(t, NFTNL_FLOWTABLE_NAME, argv[3]);
        if (argc == 6) {
                nftnl_flowtable_set_u32(t, NFTNL_FLOWTABLE_HOOKNUM, hooknum);
                nftnl_flowtable_set_u32(t, NFTNL_FLOWTABLE_PRIO, atoi(argv[5]));
        }
-       nftnl_flowtable_set(t, NFTNL_FLOWTABLE_DEVICES, dev_array);
+       nftnl_flowtable_set_data(t, NFTNL_FLOWTABLE_DEVICES, dev_array, 0);
 
        return t;
 }

diff --git a/examples/nft-flowtable-del.c b/examples/nft-flowtable-del.c
index b25f041a6f6d7dfdefa27579d83044f821048425..4866ea2c2ae440a0eaaf954edb83ca3d873eae4e 100644 (file)
--- a/examples/nft-flowtable-del.c
+++ b/examples/nft-flowtable-del.c
@@ -19,8 +19,8 @@ static struct nftnl_flowtable *flowtable_del_parse(int argc, char *argv[])
                return NULL;
        }
 
-       nftnl_flowtable_set(t, NFTNL_FLOWTABLE_TABLE, argv[2]);
-       nftnl_flowtable_set(t, NFTNL_FLOWTABLE_NAME, argv[3]);
+       nftnl_flowtable_set_str(t, NFTNL_FLOWTABLE_TABLE, argv[2]);
+       nftnl_flowtable_set_str(t, NFTNL_FLOWTABLE_NAME, argv[3]);
 
        return t;
 }

diff --git a/examples/nft-flowtable-get.c b/examples/nft-flowtable-get.c
index 1a034ce60579b118cb818cf2156f92951f01c7e5..0d92fff3cf2e0112c3b39cca8286c97dd740a02d 100644 (file)
--- a/examples/nft-flowtable-get.c
+++ b/examples/nft-flowtable-get.c
@@ -75,8 +75,8 @@ int main(int argc, char *argv[])
                }
                nlh = nftnl_flowtable_nlmsg_build_hdr(buf, NFT_MSG_GETFLOWTABLE, family,
                                                NLM_F_ACK, seq);
-               nftnl_flowtable_set(t, NFTNL_FLOWTABLE_TABLE, argv[2]);
-               nftnl_flowtable_set(t, NFTNL_FLOWTABLE_NAME, argv[3]);
+               nftnl_flowtable_set_str(t, NFTNL_FLOWTABLE_TABLE, argv[2]);
+               nftnl_flowtable_set_str(t, NFTNL_FLOWTABLE_NAME, argv[3]);
                nftnl_flowtable_nlmsg_build_payload(nlh, t);
                nftnl_flowtable_free(t);
        } else if (argc >= 2) {

diff --git a/examples/nft-obj-get.c b/examples/nft-obj-get.c
index e6a19fe3baf8e811fcd6699f6e589613263ad5bd..87be3b48bc3f272bbfe95c1ee73b7be7a6a0d3a5 100644 (file)
--- a/examples/nft-obj-get.c
+++ b/examples/nft-obj-get.c
@@ -89,13 +89,13 @@ int main(int argc, char *argv[])
                nlh = nftnl_nlmsg_build_hdr(buf, NFT_MSG_GETOBJ, family,
                                            NLM_F_DUMP, seq);
                if (argc == 3) {
-                       nftnl_obj_set(t, NFTNL_OBJ_TABLE, argv[2]);
+                       nftnl_obj_set_str(t, NFTNL_OBJ_TABLE, argv[2]);
                        nftnl_obj_nlmsg_build_payload(nlh, t);
                        nftnl_obj_free(t);
                }
        } else {
-               nftnl_obj_set(t, NFTNL_OBJ_TABLE, argv[2]);
-               nftnl_obj_set(t, NFTNL_OBJ_NAME, argv[3]);
+               nftnl_obj_set_str(t, NFTNL_OBJ_TABLE, argv[2]);
+               nftnl_obj_set_str(t, NFTNL_OBJ_NAME, argv[3]);
                nftnl_obj_set_u32(t, NFTNL_OBJ_TYPE, NFT_OBJECT_COUNTER);
 
                nlh = nftnl_nlmsg_build_hdr(buf, NFT_MSG_GETOBJ, family,

diff --git a/examples/nft-rule-add.c b/examples/nft-rule-add.c
index 6aaf5a0650f8a99a19b27e444389a056fead954c..97805155ba07e8ace87921702c64953cffa761c9 100644 (file)
--- a/examples/nft-rule-add.c
+++ b/examples/nft-rule-add.c
@@ -93,8 +93,8 @@ static struct nftnl_rule *setup_rule(uint8_t family, const char *table,
                exit(EXIT_FAILURE);
        }
 
-       nftnl_rule_set(r, NFTNL_RULE_TABLE, table);
-       nftnl_rule_set(r, NFTNL_RULE_CHAIN, chain);
+       nftnl_rule_set_str(r, NFTNL_RULE_TABLE, table);
+       nftnl_rule_set_str(r, NFTNL_RULE_CHAIN, chain);
        nftnl_rule_set_u32(r, NFTNL_RULE_FAMILY, family);
 
        if (handle != NULL) {

diff --git a/examples/nft-rule-ct-expectation-add.c b/examples/nft-rule-ct-expectation-add.c
index 238e224b409b201b508585ed3251ab0ebf728f76..2012b3cfc7572af9a5b54ae6cf1ef43a8616d916 100644 (file)
--- a/examples/nft-rule-ct-expectation-add.c
+++ b/examples/nft-rule-ct-expectation-add.c
@@ -69,8 +69,8 @@ static struct nftnl_rule *setup_rule(uint8_t family, const char *table,
                exit(EXIT_FAILURE);
        }
 
-       nftnl_rule_set(r, NFTNL_RULE_TABLE, table);
-       nftnl_rule_set(r, NFTNL_RULE_CHAIN, chain);
+       nftnl_rule_set_str(r, NFTNL_RULE_TABLE, table);
+       nftnl_rule_set_str(r, NFTNL_RULE_CHAIN, chain);
        nftnl_rule_set_u32(r, NFTNL_RULE_FAMILY, family);
 
        if (handle != NULL) {

diff --git a/examples/nft-rule-ct-helper-add.c b/examples/nft-rule-ct-helper-add.c
index 1a4fefd46e488c4f035d0b007f3ce8800c19ad9c..632cc5ccd4e8af4e64f7368a6ca5d598a6ef4479 100644 (file)
--- a/examples/nft-rule-ct-helper-add.c
+++ b/examples/nft-rule-ct-helper-add.c
@@ -56,8 +56,8 @@ static struct nftnl_rule *setup_rule(uint8_t family, const char *table,
                exit(EXIT_FAILURE);
        }
 
-       nftnl_rule_set(r, NFTNL_RULE_TABLE, table);
-       nftnl_rule_set(r, NFTNL_RULE_CHAIN, chain);
+       nftnl_rule_set_str(r, NFTNL_RULE_TABLE, table);
+       nftnl_rule_set_str(r, NFTNL_RULE_CHAIN, chain);
        nftnl_rule_set_u32(r, NFTNL_RULE_FAMILY, family);
 
        if (handle != NULL) {

diff --git a/examples/nft-rule-ct-timeout-add.c b/examples/nft-rule-ct-timeout-add.c
index d779d9a1b3b85c13b0f31f41baa12c79f0343f6e..d3f843ed1c73bf02c9624e73d2b9cba784f2989c 100644 (file)
--- a/examples/nft-rule-ct-timeout-add.c
+++ b/examples/nft-rule-ct-timeout-add.c
@@ -56,8 +56,8 @@ static struct nftnl_rule *setup_rule(uint8_t family, const char *table,
                exit(EXIT_FAILURE);
        }
 
-       nftnl_rule_set(r, NFTNL_RULE_TABLE, table);
-       nftnl_rule_set(r, NFTNL_RULE_CHAIN, chain);
+       nftnl_rule_set_str(r, NFTNL_RULE_TABLE, table);
+       nftnl_rule_set_str(r, NFTNL_RULE_CHAIN, chain);
        nftnl_rule_set_u32(r, NFTNL_RULE_FAMILY, family);
 
        if (handle != NULL) {

diff --git a/examples/nft-rule-del.c b/examples/nft-rule-del.c
index bfd37abf1621db701290ac37bbbdff5fb9fae266..fee3011bc4a5e7009b9c6a6b475903235230d747 100644 (file)
--- a/examples/nft-rule-del.c
+++ b/examples/nft-rule-del.c
@@ -58,8 +58,8 @@ int main(int argc, char *argv[])
        }
 
        seq = time(NULL);
-       nftnl_rule_set(r, NFTNL_RULE_TABLE, argv[2]);
-       nftnl_rule_set(r, NFTNL_RULE_CHAIN, argv[3]);
+       nftnl_rule_set_str(r, NFTNL_RULE_TABLE, argv[2]);
+       nftnl_rule_set_str(r, NFTNL_RULE_CHAIN, argv[3]);
 
        /* If no handle is specified, delete all rules in the chain */
        if (argc == 5)

diff --git a/examples/nft-set-del.c b/examples/nft-set-del.c
index 8c216df861d7b4a740472ce641d32371a39c0a4c..7f20e218705e1a70e7791195c02adaba76a2307c 100644 (file)
--- a/examples/nft-set-del.c
+++ b/examples/nft-set-del.c
@@ -63,8 +63,8 @@ int main(int argc, char *argv[])
        nlh = nftnl_set_nlmsg_build_hdr(mnl_nlmsg_batch_current(batch),
                                        NFT_MSG_DELSET, family,
                                        NLM_F_ACK, seq);
-       nftnl_set_set(t, NFTNL_SET_TABLE, argv[2]);
-       nftnl_set_set(t, NFTNL_SET_NAME, argv[3]);
+       nftnl_set_set_str(t, NFTNL_SET_TABLE, argv[2]);
+       nftnl_set_set_str(t, NFTNL_SET_NAME, argv[3]);
 
        nftnl_set_nlmsg_build_payload(nlh, t);
        nftnl_set_free(t);

diff --git a/examples/nft-set-elem-add.c b/examples/nft-set-elem-add.c
index d5d93d3cf94152ecd013bc6ef276928d0af6591c..438966f4d57d0ef1005469832b2dd798f80683a4 100644 (file)
--- a/examples/nft-set-elem-add.c
+++ b/examples/nft-set-elem-add.c
@@ -57,8 +57,8 @@ int main(int argc, char *argv[])
                exit(EXIT_FAILURE);
        }
 
-       nftnl_set_set(s, NFTNL_SET_TABLE, argv[2]);
-       nftnl_set_set(s, NFTNL_SET_NAME, argv[3]);
+       nftnl_set_set_str(s, NFTNL_SET_TABLE, argv[2]);
+       nftnl_set_set_str(s, NFTNL_SET_NAME, argv[3]);
 
        /* Add to dummy elements to set */
        e = nftnl_set_elem_alloc();

diff --git a/examples/nft-set-elem-del.c b/examples/nft-set-elem-del.c
index b53a86bd908e7fa0ac4b61e817e849da5359652c..7f63eaf50b7ca0f08870d108d20d5fdec2907e36 100644 (file)
--- a/examples/nft-set-elem-del.c
+++ b/examples/nft-set-elem-del.c
@@ -55,8 +55,8 @@ int main(int argc, char *argv[])
                exit(EXIT_FAILURE);
        }
 
-       nftnl_set_set(s, NFTNL_SET_TABLE, argv[2]);
-       nftnl_set_set(s, NFTNL_SET_NAME, argv[3]);
+       nftnl_set_set_str(s, NFTNL_SET_TABLE, argv[2]);
+       nftnl_set_set_str(s, NFTNL_SET_NAME, argv[3]);
 
        /* Add to dummy elements to set */
        e = nftnl_set_elem_alloc();

diff --git a/examples/nft-set-elem-get.c b/examples/nft-set-elem-get.c
index 1bc9abca3711ab330cbd764e81afefa46f373dbf..778e40f1ba0140ede3d0b725d68fec4ab8b22e67 100644 (file)
--- a/examples/nft-set-elem-get.c
+++ b/examples/nft-set-elem-get.c
@@ -81,8 +81,8 @@ int main(int argc, char *argv[])
 
        nlh = nftnl_set_nlmsg_build_hdr(buf, NFT_MSG_GETSETELEM, family,
                                        NLM_F_DUMP|NLM_F_ACK, seq);
-       nftnl_set_set(t, NFTNL_SET_NAME, argv[3]);
-       nftnl_set_set(t, NFTNL_SET_TABLE, argv[2]);
+       nftnl_set_set_str(t, NFTNL_SET_NAME, argv[3]);
+       nftnl_set_set_str(t, NFTNL_SET_TABLE, argv[2]);
        nftnl_set_elems_nlmsg_build_payload(nlh, t);
        nftnl_set_free(t);
 

diff --git a/examples/nft-table-get.c b/examples/nft-table-get.c
index eac2f2f6dfc8f49a559cf0a9e21ced423e6b0a70..c0c845470c851a7d09c2eee2c098d43008cb8ca0 100644 (file)
--- a/examples/nft-table-get.c
+++ b/examples/nft-table-get.c
@@ -91,7 +91,7 @@ int main(int argc, char *argv[])
        } else {
                nlh = nftnl_table_nlmsg_build_hdr(buf, NFT_MSG_GETTABLE, family,
                                                NLM_F_ACK, seq);
-               nftnl_table_set(t, NFTNL_TABLE_NAME, argv[2]);
+               nftnl_table_set_str(t, NFTNL_TABLE_NAME, argv[2]);
                nftnl_table_nlmsg_build_payload(nlh, t);
                nftnl_table_free(t);
        }

diff --git a/examples/nft-table-upd.c b/examples/nft-table-upd.c
index 586d84ca48a6f2a4aad3d9bff1fbe7263c68761d..1c7f9b3fda3a15a3d4baf03bb58b73509d04d26b 100644 (file)
--- a/examples/nft-table-upd.c
+++ b/examples/nft-table-upd.c
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
                exit(EXIT_FAILURE);
        }
 
-       nftnl_table_set(t, NFTNL_TABLE_NAME, argv[2]);
+       nftnl_table_set_str(t, NFTNL_TABLE_NAME, argv[2]);
        nftnl_table_set_u32(t, NFTNL_TABLE_FLAGS, flags);
 
        table_seq = seq;