src: replace nftnl_*_nlmsg_build_hdr() by nftnl_nlmsg_build_hdr()
Pablo Neira Ayuso
maintainerPATCH 1/1 src: replace nftnl_*_nlmsg_build_hdr() by nftnl_nlmsg_build_hdr()
Use nftnl_nlmsg_build_hdr() instead of nftnl_*_nlmsg_build_hdr().
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- examples/nft-chain-add.c | 6 +++--- examples/nft-chain-del.c | 5 ++--- examples/nft-chain-get.c | 8 ++++---- examples/nft-flowtable-add.c | 6 +++--- examples/nft-flowtable-del.c | 6 +++--- examples/nft-flowtable-get.c | 8 ++++---- examples/nft-map-add.c | 6 +++--- examples/nft-rule-add.c | 10 +++++----- examples/nft-rule-ct-expectation-add.c | 11 +++++------ examples/nft-rule-ct-helper-add.c | 10 +++++----- examples/nft-rule-ct-timeout-add.c | 10 +++++----- examples/nft-rule-del.c | 7 ++----- examples/nft-rule-get.c | 4 ++-- examples/nft-ruleset-get.c | 20 ++++++++++---------- examples/nft-set-add.c | 6 +++--- examples/nft-set-del.c | 5 ++--- examples/nft-set-elem-del.c | 5 ++--- examples/nft-set-elem-get.c | 4 ++-- examples/nft-set-get.c | 4 ++-- examples/nft-table-add.c | 6 +++--- examples/nft-table-del.c | 6 +++--- examples/nft-table-get.c | 8 ++++---- examples/nft-table-upd.c | 5 ++--- src/common.c | 5 ++--- tests/nft-chain-test.c | 3 +-- tests/nft-expr_bitwise-test.c | 6 +++--- tests/nft-expr_byteorder-test.c | 2 +- tests/nft-expr_cmp-test.c | 2 +- tests/nft-expr_counter-test.c | 2 +- tests/nft-expr_ct-test.c | 2 +- tests/nft-expr_dup-test.c | 2 +- tests/nft-expr_exthdr-test.c | 2 +- tests/nft-expr_fwd-test.c | 2 +- tests/nft-expr_hash-test.c | 2 +- tests/nft-expr_immediate-test.c | 2 +- tests/nft-expr_limit-test.c | 2 +- tests/nft-expr_log-test.c | 2 +- tests/nft-expr_lookup-test.c | 2 +- tests/nft-expr_masq-test.c | 2 +- tests/nft-expr_match-test.c | 2 +- tests/nft-expr_meta-test.c | 2 +- tests/nft-expr_nat-test.c | 2 +- tests/nft-expr_numgen-test.c | 2 +- tests/nft-expr_payload-test.c | 2 +- tests/nft-expr_queue-test.c | 2 +- tests/nft-expr_quota-test.c | 2 +- tests/nft-expr_range-test.c | 2 +- tests/nft-expr_redir-test.c | 2 +- tests/nft-expr_reject-test.c | 2 +- tests/nft-expr_target-test.c | 2 +- tests/nft-rule-test.c | 2 +- tests/nft-set-test.c | 2 +- tests/nft-table-test.c | 3 +-- 53 files changed, 112 insertions(+), 123 deletions(-)
examples/nft-chain-add.c +3 -3
@@ -101,9 +101,9 @@ int main(int argc, char *argv[])mnl_nlmsg_batch_next (batch); chain_seq = seq; - nlh =nftnl_chain_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), -NFT_MSG_NEWCHAIN , family, -NLM_F_CREATE |NLM_F_ACK , seq++); + nlh =nftnl_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), +NFT_MSG_NEWCHAIN , family, +NLM_F_CREATE |NLM_F_ACK , seq++);nftnl_chain_nlmsg_build_payload (nlh, t);nftnl_chain_free (t);mnl_nlmsg_batch_next (batch);
examples/nft-chain-del.c +2 -3
@@ -78,9 +78,8 @@ int main(int argc, char *argv[])mnl_nlmsg_batch_next (batch); chain_seq = seq; - nlh =nftnl_chain_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), -NFT_MSG_DELCHAIN , family, -NLM_F_ACK , seq++); + nlh =nftnl_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), +NFT_MSG_DELCHAIN , family,NLM_F_ACK , seq++);nftnl_chain_nlmsg_build_payload (nlh, t);nftnl_chain_free (t);mnl_nlmsg_batch_next (batch);
examples/nft-chain-get.c +4 -4
@@ -86,15 +86,15 @@ int main(int argc, char *argv[])perror ("OOM" );exit (EXIT_FAILURE ); } - nlh =nftnl_chain_nlmsg_build_hdr (buf,NFT_MSG_GETCHAIN , family, -NLM_F_ACK , seq); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_GETCHAIN , family, +NLM_F_ACK , seq);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 ) { - nlh =nftnl_chain_nlmsg_build_hdr (buf,NFT_MSG_GETCHAIN , family, -NLM_F_DUMP , seq); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_GETCHAIN , family, +NLM_F_DUMP , seq); } nl =mnl_socket_open (NETLINK_NETFILTER );
examples/nft-flowtable-add.c +3 -3
@@ -80,9 +80,9 @@ int main(int argc, char *argv[])mnl_nlmsg_batch_next (batch); flowtable_seq = seq; - nlh =nftnl_flowtable_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), -NFT_MSG_NEWFLOWTABLE , family, -NLM_F_CREATE |NLM_F_ACK , seq++); + nlh =nftnl_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), +NFT_MSG_NEWFLOWTABLE , family, +NLM_F_CREATE |NLM_F_ACK , seq++);nftnl_flowtable_nlmsg_build_payload (nlh, t);nftnl_flowtable_free (t);mnl_nlmsg_batch_next (batch);
examples/nft-flowtable-del.c +3 -3
@@ -67,9 +67,9 @@ int main(int argc, char *argv[])mnl_nlmsg_batch_next (batch); flowtable_seq = seq; - nlh =nftnl_flowtable_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), -NFT_MSG_DELFLOWTABLE , family, -NLM_F_ACK , seq++); + nlh =nftnl_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), +NFT_MSG_DELFLOWTABLE , family, +NLM_F_ACK , seq++);nftnl_flowtable_nlmsg_build_payload (nlh, t);nftnl_flowtable_free (t);mnl_nlmsg_batch_next (batch);
examples/nft-flowtable-get.c +4 -4
@@ -75,15 +75,15 @@ int main(int argc, char *argv[])perror ("OOM" );exit (EXIT_FAILURE ); } - nlh =nftnl_flowtable_nlmsg_build_hdr (buf,NFT_MSG_GETFLOWTABLE , family, -NLM_F_ACK , seq); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_GETFLOWTABLE , family, +NLM_F_ACK , seq);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 ) { - nlh =nftnl_flowtable_nlmsg_build_hdr (buf,NFT_MSG_GETFLOWTABLE , family, -NLM_F_DUMP , seq); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_GETFLOWTABLE , family, +NLM_F_DUMP , seq); } nl =mnl_socket_open (NETLINK_NETFILTER );
examples/nft-map-add.c +3 -3
@@ -103,9 +103,9 @@ int main(int argc, char *argv[])nftnl_batch_begin (mnl_nlmsg_batch_current (batch), seq++);mnl_nlmsg_batch_next (batch); - nlh =nftnl_set_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), -NFT_MSG_NEWSET , family, -NLM_F_CREATE |NLM_F_ACK , seq++); + nlh =nftnl_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), +NFT_MSG_NEWSET , family, +NLM_F_CREATE |NLM_F_ACK , seq++);nftnl_set_nlmsg_build_payload (nlh, s);nftnl_set_free (s);
examples/nft-rule-add.c +5 -5
@@ -165,11 +165,11 @@ int main(int argc, char *argv[])nftnl_batch_begin (mnl_nlmsg_batch_current (batch), seq++);mnl_nlmsg_batch_next (batch); - nlh =nftnl_rule_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), -NFT_MSG_NEWRULE , -nftnl_rule_get_u32 (r,NFTNL_RULE_FAMILY ), -NLM_F_APPEND |NLM_F_CREATE |NLM_F_ACK , seq++); - + nlh =nftnl_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), +NFT_MSG_NEWRULE , +nftnl_rule_get_u32 (r,NFTNL_RULE_FAMILY ), +NLM_F_APPEND |NLM_F_CREATE |NLM_F_ACK , + seq++);nftnl_rule_nlmsg_build_payload (nlh, r);nftnl_rule_free (r);mnl_nlmsg_batch_next (batch);
examples/nft-rule-ct-expectation-add.c +5 -6
@@ -123,12 +123,11 @@ int main(int argc, char *argv[])nftnl_batch_begin (mnl_nlmsg_batch_current (batch), seq++);mnl_nlmsg_batch_next (batch); - nlh =nftnl_rule_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), -NFT_MSG_NEWRULE , -nftnl_rule_get_u32 (r,NFTNL_RULE_FAMILY ), -NLM_F_APPEND |NLM_F_CREATE |NLM_F_ACK , - seq++); - + nlh =nftnl_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), +NFT_MSG_NEWRULE , +nftnl_rule_get_u32 (r,NFTNL_RULE_FAMILY ), +NLM_F_APPEND |NLM_F_CREATE |NLM_F_ACK , + seq++);nftnl_rule_nlmsg_build_payload (nlh, r);nftnl_rule_free (r);mnl_nlmsg_batch_next (batch);
examples/nft-rule-ct-helper-add.c +5 -5
@@ -117,11 +117,11 @@ int main(int argc, char *argv[])nftnl_batch_begin (mnl_nlmsg_batch_current (batch), seq++);mnl_nlmsg_batch_next (batch); - nlh =nftnl_rule_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), -NFT_MSG_NEWRULE , -nftnl_rule_get_u32 (r,NFTNL_RULE_FAMILY ), -NLM_F_APPEND |NLM_F_CREATE |NLM_F_ACK , seq++); - + nlh =nftnl_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), +NFT_MSG_NEWRULE , +nftnl_rule_get_u32 (r,NFTNL_RULE_FAMILY ), +NLM_F_APPEND |NLM_F_CREATE |NLM_F_ACK , + seq++);nftnl_rule_nlmsg_build_payload (nlh, r);nftnl_rule_free (r);mnl_nlmsg_batch_next (batch);
examples/nft-rule-ct-timeout-add.c +5 -5
@@ -117,11 +117,11 @@ int main(int argc, char *argv[])nftnl_batch_begin (mnl_nlmsg_batch_current (batch), seq++);mnl_nlmsg_batch_next (batch); - nlh =nftnl_rule_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), -NFT_MSG_NEWRULE , -nftnl_rule_get_u32 (r,NFTNL_RULE_FAMILY ), -NLM_F_APPEND |NLM_F_CREATE |NLM_F_ACK , seq++); - + nlh =nftnl_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), +NFT_MSG_NEWRULE , +nftnl_rule_get_u32 (r,NFTNL_RULE_FAMILY ), +NLM_F_APPEND |NLM_F_CREATE |NLM_F_ACK , + seq++);nftnl_rule_nlmsg_build_payload (nlh, r);nftnl_rule_free (r);mnl_nlmsg_batch_next (batch);
examples/nft-rule-del.c +2 -5
@@ -72,11 +72,8 @@ int main(int argc, char *argv[])nftnl_batch_begin (mnl_nlmsg_batch_current (batch), seq++);mnl_nlmsg_batch_next (batch); - nlh =nftnl_rule_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), -NFT_MSG_DELRULE , - family, -NLM_F_ACK , seq++); - + nlh =nftnl_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), +NFT_MSG_DELRULE , family,NLM_F_ACK , seq++);nftnl_rule_nlmsg_build_payload (nlh, r);nftnl_rule_free (r);mnl_nlmsg_batch_next (batch);
examples/nft-rule-get.c +2 -2
@@ -111,8 +111,8 @@ int main(int argc, char *argv[]) } seq =time (NULL ); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_GETRULE , family, -NLM_F_DUMP , seq); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_GETRULE , family, +NLM_F_DUMP , seq); r =setup_rule (family, table, chain,NULL );if (!r) {
examples/nft-ruleset-get.c +10 -10
@@ -97,8 +97,8 @@ static struct nftnl_rule_list *mnl_rule_dump(struct mnl_socket *nf_sock,if (nlr_list ==NULL )memory_allocation_error (); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_GETRULE , family, -NLM_F_DUMP , seq); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_GETRULE , family, +NLM_F_DUMP , seq); ret =mnl_talk (nf_sock, nlh, nlh->nlmsg_len, rule_cb, nlr_list);if (ret <0 )
@@ -145,8 +145,8 @@ static struct nftnl_chain_list *mnl_chain_dump(struct mnl_socket *nf_sock,if (nlc_list ==NULL )memory_allocation_error (); - nlh =nftnl_chain_nlmsg_build_hdr (buf,NFT_MSG_GETCHAIN , family, -NLM_F_DUMP , seq); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_GETCHAIN , family, +NLM_F_DUMP , seq); ret =mnl_talk (nf_sock, nlh, nlh->nlmsg_len, chain_cb, nlc_list);if (ret <0 )
@@ -193,8 +193,8 @@ static struct nftnl_table_list *mnl_table_dump(struct mnl_socket *nf_sock,if (nlt_list ==NULL )memory_allocation_error (); - nlh =nftnl_table_nlmsg_build_hdr (buf,NFT_MSG_GETTABLE , family, -NLM_F_DUMP , seq); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_GETTABLE , family, +NLM_F_DUMP , seq); ret =mnl_talk (nf_sock, nlh, nlh->nlmsg_len, table_cb, nlt_list);if (ret <0 )
@@ -221,8 +221,8 @@ static int mnl_setelem_get(struct mnl_socket *nf_sock, struct nftnl_set *nls)struct nlmsghdr *nlh;uint32_t family =nftnl_set_get_u32 (nls,NFTNL_SET_FAMILY ); - nlh =nftnl_set_nlmsg_build_hdr (buf,NFT_MSG_GETSETELEM , family, -NLM_F_DUMP |NLM_F_ACK , seq); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_GETSETELEM , family, +NLM_F_DUMP |NLM_F_ACK , seq);nftnl_set_nlmsg_build_payload (nlh, nls);return mnl_talk (nf_sock, nlh, nlh->nlmsg_len, set_elem_cb, nls);
@@ -266,8 +266,8 @@ mnl_set_dump(struct mnl_socket *nf_sock, int family)if (s ==NULL )memory_allocation_error (); - nlh =nftnl_set_nlmsg_build_hdr (buf,NFT_MSG_GETSET , family, -NLM_F_DUMP |NLM_F_ACK , seq); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_GETSET , family, +NLM_F_DUMP |NLM_F_ACK , seq);nftnl_set_nlmsg_build_payload (nlh, s);nftnl_set_free (s);
examples/nft-set-add.c +3 -3
@@ -99,9 +99,9 @@ int main(int argc, char *argv[])nftnl_batch_begin (mnl_nlmsg_batch_current (batch), seq++);mnl_nlmsg_batch_next (batch); - nlh =nftnl_set_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), -NFT_MSG_NEWSET , family, -NLM_F_CREATE |NLM_F_ACK , seq++); + nlh =nftnl_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), +NFT_MSG_NEWSET , family, +NLM_F_CREATE |NLM_F_ACK , seq++);nftnl_set_nlmsg_build_payload (nlh, s);nftnl_set_free (s);
examples/nft-set-del.c +2 -3
@@ -62,9 +62,8 @@ int main(int argc, char *argv[])nftnl_batch_begin (mnl_nlmsg_batch_current (batch), seq++);mnl_nlmsg_batch_next (batch); - nlh =nftnl_set_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), -NFT_MSG_DELSET , family, -NLM_F_ACK , seq); + nlh =nftnl_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), +NFT_MSG_DELSET , family,NLM_F_ACK , seq);nftnl_set_set_str (t,NFTNL_SET_TABLE , argv[2 ]);nftnl_set_set_str (t,NFTNL_SET_NAME , argv[3 ]);
examples/nft-set-elem-del.c +2 -3
@@ -87,9 +87,8 @@ int main(int argc, char *argv[])nftnl_batch_begin (mnl_nlmsg_batch_current (batch), seq++);mnl_nlmsg_batch_next (batch); - nlh =nftnl_set_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), -NFT_MSG_DELSETELEM , family, -NLM_F_ACK , seq); + nlh =nftnl_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), +NFT_MSG_DELSETELEM , family,NLM_F_ACK , seq);nftnl_set_elems_nlmsg_build_payload (nlh, s);nftnl_set_free (s);mnl_nlmsg_batch_next (batch);
examples/nft-set-elem-get.c +2 -2
@@ -81,8 +81,8 @@ int main(int argc, char *argv[])exit (EXIT_FAILURE ); } - nlh =nftnl_set_nlmsg_build_hdr (buf,NFT_MSG_GETSETELEM , family, -NLM_F_DUMP |NLM_F_ACK , seq); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_GETSETELEM , family, +NLM_F_DUMP |NLM_F_ACK , seq);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);
examples/nft-set-get.c +2 -2
@@ -83,8 +83,8 @@ int main(int argc, char *argv[])exit (EXIT_FAILURE ); } - nlh =nftnl_set_nlmsg_build_hdr (buf,NFT_MSG_GETSET , family, -NLM_F_DUMP |NLM_F_ACK , seq); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_GETSET , family, +NLM_F_DUMP |NLM_F_ACK , seq);/* Use this below if you want to obtain sets per table */ /* nftnl_set_set(t, NFT_SET_TABLE, argv[2]); */ nftnl_set_nlmsg_build_payload (nlh, t);
examples/nft-table-add.c +3 -3
@@ -79,9 +79,9 @@ int main(int argc, char *argv[]) table_seq = seq; family =nftnl_table_get_u32 (t,NFTNL_TABLE_FAMILY ); - nlh =nftnl_table_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), -NFT_MSG_NEWTABLE , family, -NLM_F_CREATE |NLM_F_ACK , seq++); + nlh =nftnl_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), +NFT_MSG_NEWTABLE , family, +NLM_F_CREATE |NLM_F_ACK , seq++);nftnl_table_nlmsg_build_payload (nlh, t);nftnl_table_free (t);mnl_nlmsg_batch_next (batch);
examples/nft-table-del.c +3 -3
@@ -79,9 +79,9 @@ int main(int argc, char *argv[]) table_seq = seq; family =nftnl_table_get_u32 (t,NFTNL_TABLE_FAMILY ); - nlh =nftnl_table_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), -NFT_MSG_DELTABLE , family, -NLM_F_ACK , seq++); + nlh =nftnl_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), +NFT_MSG_DELTABLE , family, +NLM_F_ACK , seq++);nftnl_table_nlmsg_build_payload (nlh, t);mnl_nlmsg_batch_next (batch);nftnl_table_free (t);
examples/nft-table-get.c +4 -4
@@ -88,11 +88,11 @@ int main(int argc, char *argv[]) seq =time (NULL );if (t ==NULL ) { - nlh =nftnl_table_nlmsg_build_hdr (buf,NFT_MSG_GETTABLE , family, -NLM_F_DUMP , seq); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_GETTABLE , family, +NLM_F_DUMP , seq); }else { - nlh =nftnl_table_nlmsg_build_hdr (buf,NFT_MSG_GETTABLE , family, -NLM_F_ACK , seq); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_GETTABLE , family, +NLM_F_ACK , seq);nftnl_table_set_str (t,NFTNL_TABLE_NAME , argv[2 ]);nftnl_table_nlmsg_build_payload (nlh, t);nftnl_table_free (t);
examples/nft-table-upd.c +2 -3
@@ -78,9 +78,8 @@ int main(int argc, char *argv[])nftnl_table_set_u32 (t,NFTNL_TABLE_FLAGS , flags); table_seq = seq; - nlh =nftnl_table_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), -NFT_MSG_NEWTABLE , family, -NLM_F_ACK , seq++); + nlh =nftnl_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), +NFT_MSG_NEWTABLE , family,NLM_F_ACK , seq++);nftnl_table_nlmsg_build_payload (nlh, t);nftnl_table_free (t);mnl_nlmsg_batch_next (batch);
src/common.c +2 -3
@@ -127,9 +127,8 @@ int nftnl_batch_is_supported(void)mnl_nlmsg_batch_next (b); req_seq = seq; -nftnl_set_nlmsg_build_hdr (mnl_nlmsg_batch_current (b), -NFT_MSG_NEWSET ,AF_INET , -NLM_F_ACK , seq++); +nftnl_nlmsg_build_hdr (mnl_nlmsg_batch_current (b),NFT_MSG_NEWSET , +AF_INET ,NLM_F_ACK , seq++);mnl_nlmsg_batch_next (b);nftnl_batch_end (mnl_nlmsg_batch_current (b), seq++);
tests/nft-chain-test.c +1 -2
@@ -89,8 +89,7 @@ int main(int argc, char *argv[])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 , -0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWCHAIN ,AF_INET ,0 ,1234 );nftnl_chain_nlmsg_build_payload (nlh, a);if (nftnl_chain_nlmsg_parse (nlh, b) <0 )
tests/nft-expr_bitwise-test.c +3 -3
@@ -129,7 +129,7 @@ static void test_bool(void)nftnl_rule_add_expr (a, ex); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )
@@ -183,7 +183,7 @@ static void test_lshift(void)nftnl_rule_add_expr (a, ex); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )
@@ -237,7 +237,7 @@ static void test_rshift(void)nftnl_rule_add_expr (a, ex); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )
tests/nft-expr_byteorder-test.c +1 -1
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])nftnl_rule_add_expr (a, ex); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )
tests/nft-expr_cmp-test.c +1 -1
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])nftnl_rule_add_expr (a, ex); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )
tests/nft-expr_counter-test.c +1 -1
@@ -60,7 +60,7 @@ int main(int argc, char *argv[])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 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )
tests/nft-expr_ct-test.c +1 -1
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])nftnl_rule_add_expr (a, ex); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )
tests/nft-expr_dup-test.c +1 -1
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])nftnl_rule_add_expr (a, ex); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )
tests/nft-expr_exthdr-test.c +1 -1
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])nftnl_rule_add_expr (a, ex); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )print_err ("parsing problems" );
tests/nft-expr_fwd-test.c +1 -1
@@ -55,7 +55,7 @@ int main(int argc, char *argv[])nftnl_rule_add_expr (a, ex); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )
tests/nft-expr_hash-test.c +1 -1
@@ -76,7 +76,7 @@ int main(int argc, char *argv[])nftnl_rule_add_expr (a, ex); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )print_err ("parsing problems" );
tests/nft-expr_immediate-test.c +1 -1
@@ -93,7 +93,7 @@ int main(int argc, char *argv[])nftnl_rule_add_expr (a, ex_val);nftnl_rule_add_expr (a, ex_ver); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )
tests/nft-expr_limit-test.c +1 -1
@@ -73,7 +73,7 @@ int main(int argc, char *argv[])nftnl_rule_add_expr (a, ex); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )
tests/nft-expr_log-test.c +1 -1
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])nftnl_rule_add_expr (a, ex); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )print_err ("parsing problems" );
tests/nft-expr_lookup-test.c +1 -1
@@ -76,7 +76,7 @@ int main(int argc, char *argv[])nftnl_rule_add_expr (a, ex); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )
tests/nft-expr_masq-test.c +1 -1
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])nftnl_rule_add_expr (a, ex); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )
tests/nft-expr_match-test.c +1 -1
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])nftnl_expr_set (ex,NFTNL_EXPR_MT_INFO ,strdup (data),sizeof (data));nftnl_rule_add_expr (a, ex); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )
tests/nft-expr_meta-test.c +1 -1
@@ -60,7 +60,7 @@ int main(int argc, char *argv[])nftnl_rule_add_expr (a, ex); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )print_err ("parsing problems" );
tests/nft-expr_nat-test.c +1 -1
@@ -81,7 +81,7 @@ int main(int argc, char *argv[])nftnl_rule_add_expr (a, ex); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )
tests/nft-expr_numgen-test.c +1 -1
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])nftnl_rule_add_expr (a, ex); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )print_err ("parsing problems" );
tests/nft-expr_payload-test.c +1 -1
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])nftnl_rule_add_expr (a, ex); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )print_err ("parsing problems" );
tests/nft-expr_queue-test.c +1 -1
@@ -67,7 +67,7 @@ int main(int argc, char *argv[])nftnl_rule_add_expr (a, ex); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )
tests/nft-expr_quota-test.c +1 -1
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])nftnl_expr_set_u32 (ex,NFTNL_EXPR_QUOTA_FLAGS ,0x12345678 );nftnl_rule_add_expr (a, ex); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )
tests/nft-expr_range-test.c +1 -1
@@ -75,7 +75,7 @@ int main(int argc, char *argv[])nftnl_rule_add_expr (a, ex); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )
tests/nft-expr_redir-test.c +1 -1
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])nftnl_rule_add_expr (a, ex); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )
tests/nft-expr_reject-test.c +1 -1
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])nftnl_rule_add_expr (a, ex); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )
tests/nft-expr_target-test.c +1 -1
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])nftnl_expr_set (ex,NFTNL_EXPR_TG_INFO ,strdup (data),sizeof (data));nftnl_rule_add_expr (a, ex); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )
tests/nft-rule-test.c +1 -1
@@ -90,7 +90,7 @@ int main(int argc, char *argv[]) nftnl_udata_buf_len(udata));nftnl_udata_buf_free (udata); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE ,AF_INET ,0 ,1234 );nftnl_rule_nlmsg_build_payload (nlh, a);if (nftnl_rule_nlmsg_parse (nlh, b) <0 )
tests/nft-set-test.c +1 -1
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])nftnl_set_set_str (a,NFTNL_SET_USERDATA ,"testing user data" );/* cmd extracted from include/linux/netfilter/nf_tables.h */ - nlh =nftnl_set_nlmsg_build_hdr (buf,NFT_MSG_NEWSET ,AF_INET ,0 ,1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWSET ,AF_INET ,0 ,1234 );nftnl_set_nlmsg_build_payload (nlh, a);if (nftnl_set_nlmsg_parse (nlh, b) <0 )
tests/nft-table-test.c +1 -2
@@ -55,8 +55,7 @@ int main(int argc, char *argv[])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 , -1234 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_NEWTABLE ,AF_INET ,0 ,1234 );nftnl_table_nlmsg_build_payload (nlh, a);if (nftnl_table_nlmsg_parse (nlh, b) <0 )
Signature · 1 line
2.30.2