summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/nft-chain-add.c4
-rw-r--r--examples/nft-chain-del.c4
-rw-r--r--examples/nft-chain-get.c4
-rw-r--r--examples/nft-ct-helper-get.c6
-rw-r--r--examples/nft-ct-timeout-add.c3
-rw-r--r--examples/nft-ct-timeout-get.c6
-rw-r--r--examples/nft-flowtable-add.c6
-rw-r--r--examples/nft-flowtable-del.c4
-rw-r--r--examples/nft-flowtable-get.c4
-rw-r--r--examples/nft-obj-get.c6
-rw-r--r--examples/nft-rule-add.c4
-rw-r--r--examples/nft-rule-ct-expectation-add.c4
-rw-r--r--examples/nft-rule-ct-helper-add.c4
-rw-r--r--examples/nft-rule-ct-timeout-add.c4
-rw-r--r--examples/nft-rule-del.c4
-rw-r--r--examples/nft-set-del.c4
-rw-r--r--examples/nft-set-elem-add.c4
-rw-r--r--examples/nft-set-elem-del.c4
-rw-r--r--examples/nft-set-elem-get.c4
-rw-r--r--examples/nft-table-get.c2
-rw-r--r--examples/nft-table-upd.c2
21 files changed, 44 insertions, 43 deletions
diff --git a/examples/nft-chain-add.c b/examples/nft-chain-add.c
index 5796d10..cde4c97 100644
--- 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 09a4718..9956009 100644
--- 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 fcccbf7..4e3b3c1 100644
--- 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 eb03133..34134af 100644
--- 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 57c0cf0..913290f 100644
--- 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 badcd23..18aed52 100644
--- 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 8363027..f42d206 100644
--- 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 b25f041..4866ea2 100644
--- 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 1a034ce..0d92fff 100644
--- 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 e6a19fe..87be3b4 100644
--- 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 6aaf5a0..9780515 100644
--- 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 238e224..2012b3c 100644
--- 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 1a4fefd..632cc5c 100644
--- 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 d779d9a..d3f843e 100644
--- 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 bfd37ab..fee3011 100644
--- 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 8c216df..7f20e21 100644
--- 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 d5d93d3..438966f 100644
--- 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 b53a86b..7f63eaf 100644
--- 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 1bc9abc..778e40f 100644
--- 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 eac2f2f..c0c8454 100644
--- 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 586d84c..1c7f9b3 100644
--- 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;