nft: replace nftnl_.*_nlmsg_build_hdr() by nftnl_nlmsg_build_hdr()
Pablo Neira Ayuso
maintainerPATCH 1/1 nft: replace nftnl_.*_nlmsg_build_hdr() by nftnl_nlmsg_build_hdr()
Replace alias to real nftnl_nlmsg_build_hdr() function call.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- iptables/nft-cache.c | 16 ++++++++-------- iptables/nft.c | 12 ++++++------ iptables/xtables-monitor.c | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-)
iptables/nft-cache.c +8 -8
@@ -141,8 +141,8 @@ static int fetch_table_cache(struct nft_handle *h)char buf[16536 ];int i, ret; - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_GETTABLE , h->family, -NLM_F_DUMP , h->seq); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_GETTABLE , h->family, +NLM_F_DUMP , h->seq); ret =mnl_talk (h, nlh, nftnl_table_list_cb, h);if (ret <0 && errno ==EINTR )
@@ -453,8 +453,8 @@ static int fetch_set_cache(struct nft_handle *h, } } - nlh =nftnl_set_nlmsg_build_hdr (buf,NFT_MSG_GETSET , - h->family, flags, h->seq); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_GETSET , + h->family, flags, h->seq);if (s) {nftnl_set_nlmsg_build_payload (nlh, s);
@@ -496,8 +496,8 @@ static int __fetch_chain_cache(struct nft_handle *h,struct nlmsghdr *nlh;int ret; - nlh =nftnl_chain_nlmsg_build_hdr (buf,NFT_MSG_GETCHAIN , h->family, - c ?NLM_F_ACK :NLM_F_DUMP , h->seq); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_GETCHAIN , h->family, + c ?NLM_F_ACK :NLM_F_DUMP , h->seq);if (c)nftnl_chain_nlmsg_build_payload (nlh, c);
@@ -591,8 +591,8 @@ static int nft_rule_list_update(struct nft_chain *nc, void *data)nftnl_rule_set_str (rule,NFTNL_RULE_CHAIN ,nftnl_chain_get_str (c,NFTNL_CHAIN_NAME )); - nlh =nftnl_rule_nlmsg_build_hdr (buf,NFT_MSG_GETRULE , h->family, -NLM_F_DUMP , h->seq); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_GETRULE , h->family, +NLM_F_DUMP , h->seq);nftnl_rule_nlmsg_build_payload (nlh, rule); ret =mnl_talk (h, nlh, nftnl_rule_list_cb, &rld);
iptables/nft.c +6 -6
@@ -2891,8 +2891,8 @@ static void nft_compat_table_batch_add(struct nft_handle *h, uint16_t type, {struct nlmsghdr *nlh; - nlh =nftnl_table_nlmsg_build_hdr (nftnl_batch_buffer (h->batch), - type, h->family, flags, seq); + nlh =nftnl_nlmsg_build_hdr (nftnl_batch_buffer (h->batch), + type, h->family, flags, seq);nftnl_table_nlmsg_build_payload (nlh, table);nft_table_print_debug (h, table, nlh); }
@@ -2936,8 +2936,8 @@ static void nft_compat_chain_batch_add(struct nft_handle *h, uint16_t type, {struct nlmsghdr *nlh; - nlh =nftnl_chain_nlmsg_build_hdr (nftnl_batch_buffer (h->batch), - type, h->family, flags, seq); + nlh =nftnl_nlmsg_build_hdr (nftnl_batch_buffer (h->batch), + type, h->family, flags, seq);nftnl_chain_nlmsg_build_payload (nlh, chain);nft_chain_print_debug (h, chain, nlh); }
@@ -2948,8 +2948,8 @@ static void nft_compat_rule_batch_add(struct nft_handle *h, uint16_t type, {struct nlmsghdr *nlh; - nlh =nftnl_rule_nlmsg_build_hdr (nftnl_batch_buffer (h->batch), - type, h->family, flags, seq); + nlh =nftnl_nlmsg_build_hdr (nftnl_batch_buffer (h->batch), + type, h->family, flags, seq);nftnl_rule_nlmsg_build_payload (nlh, rule);nft_rule_print_debug (h, rule, nlh); }
iptables/xtables-monitor.c +1 -1
@@ -227,7 +227,7 @@ static void trace_print_rule(const struct nftnl_trace *nlt, struct cb_arg *args)exit (EXIT_FAILURE ); } - nlh =nftnl_chain_nlmsg_build_hdr (buf,NFT_MSG_GETRULE , family,0 ,0 ); + nlh =nftnl_nlmsg_build_hdr (buf,NFT_MSG_GETRULE , family,0 ,0 );nftnl_rule_set_u32 (r,NFTNL_RULE_FAMILY , family);nftnl_rule_set_str (r,NFTNL_RULE_CHAIN , chain);
Signature · 1 line
2.30.2
Quoted 3 lines · Pablo Neira Ayuso
Replace alias to real
nftnl_nlmsg_build_hdr()function call.Signed-off-by Pablo Neira Ayuso <[email protected]>
Applied, thanks!