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 <pablo@netfilter.org>

diff --git a/examples/nft-chain-add.c b/examples/nft-chain-add.c
index f711e098b52b8be0f24d5cce13e09186ccf7da69..13be982324180f4e4e5c4b8664fe1f7cec1528e4 100644 (file)
--- a/examples/nft-chain-add.c
+++ b/examples/nft-chain-add.c
@@ -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);

diff --git a/examples/nft-chain-del.c b/examples/nft-chain-del.c
index bcc714e610790c9f1b25282f406446195379d277..3cd483ea6c027b5e05a195b6d4341994bb058219 100644 (file)
--- a/examples/nft-chain-del.c
+++ b/examples/nft-chain-del.c
@@ -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);

diff --git a/examples/nft-chain-get.c b/examples/nft-chain-get.c
index 8a6ef91298c7bc8e0fcd1ffe2f69c7726ce373e0..612f58be7553ccbd37643869651e1ffffc5ffc8b 100644 (file)
--- a/examples/nft-chain-get.c
+++ b/examples/nft-chain-get.c
@@ -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);

diff --git a/examples/nft-flowtable-add.c b/examples/nft-flowtable-add.c
index 4e0e50b95cbffce2e9d973ffcd889e3149687d0d..f509f23cf743544ec7cb41ba9983325ba65d2420 100644 (file)
--- a/examples/nft-flowtable-add.c
+++ b/examples/nft-flowtable-add.c
@@ -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);

diff --git a/examples/nft-flowtable-del.c b/examples/nft-flowtable-del.c
index ffc83b25f716667b46580daf9101add904224ec0..c5ce339d69f5853dc29dc4d2ea9c2e052675afc9 100644 (file)
--- a/examples/nft-flowtable-del.c
+++ b/examples/nft-flowtable-del.c
@@ -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);

diff --git a/examples/nft-flowtable-get.c b/examples/nft-flowtable-get.c
index 38929f317d67a4b1d5efb72b9f0de170b97f9192..1d10cc87c4eeca63c2397be1b5ac2e783c25c910 100644 (file)
--- a/examples/nft-flowtable-get.c
+++ b/examples/nft-flowtable-get.c
@@ -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);

diff --git a/examples/nft-map-add.c b/examples/nft-map-add.c
index 7c6eeb93cb03d3dec3db53a3072204f0e066eac7..e5ce664af6b5bc532d5484d76b1327bea034c433 100644 (file)
--- a/examples/nft-map-add.c
+++ b/examples/nft-map-add.c
@@ -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);

diff --git a/examples/nft-rule-add.c b/examples/nft-rule-add.c
index 77ee4805f4a4ced51ad9fcfd61ada6d0e379aa10..7d13b92f6ef5585199fff9a8a8a26b86ce1c65f0 100644 (file)
--- a/examples/nft-rule-add.c
+++ b/examples/nft-rule-add.c
@@ -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);

diff --git a/examples/nft-rule-ct-expectation-add.c b/examples/nft-rule-ct-expectation-add.c
index 2012b3cfc7572af9a5b54ae6cf1ef43a8616d916..07c8306d9154c2e52bcdf44abff6348decfa5075 100644 (file)
--- a/examples/nft-rule-ct-expectation-add.c
+++ b/examples/nft-rule-ct-expectation-add.c
@@ -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);

diff --git a/examples/nft-rule-ct-helper-add.c b/examples/nft-rule-ct-helper-add.c
index e0338a8c0efff9c5d00339fdc98bd37834b901d6..594e6ba8e6ddc4720d5cb6d5da9528e08cf9ad00 100644 (file)
--- a/examples/nft-rule-ct-helper-add.c
+++ b/examples/nft-rule-ct-helper-add.c
@@ -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);

diff --git a/examples/nft-rule-ct-timeout-add.c b/examples/nft-rule-ct-timeout-add.c
index d93cde11345c96ecd8db4b9e4b3fd15dd835da62..0953cb4a396f1b7b1730addd42dcfe0bbdf7de3a 100644 (file)
--- a/examples/nft-rule-ct-timeout-add.c
+++ b/examples/nft-rule-ct-timeout-add.c
@@ -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);

diff --git a/examples/nft-rule-del.c b/examples/nft-rule-del.c
index 035aaa27476f84493899f10788baf49bc592bfe8..cb085ff10b3bbbbf47a62b8fb97f48c873d928b5 100644 (file)
--- a/examples/nft-rule-del.c
+++ b/examples/nft-rule-del.c
@@ -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);

diff --git a/examples/nft-rule-get.c b/examples/nft-rule-get.c
index 8fb654f36bdb01df831013c1c553c59a22987bea..8da5b59ae372ca6e75b36b948b1326a0b4a814c5 100644 (file)
--- a/examples/nft-rule-get.c
+++ b/examples/nft-rule-get.c
@@ -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) {

diff --git a/examples/nft-ruleset-get.c b/examples/nft-ruleset-get.c
index cba9b098db0e3755a6cdf0814ab69006728288fb..34ebe1fb6155c2cd7f8cf45df05cbca6a202a1cb 100644 (file)
--- a/examples/nft-ruleset-get.c
+++ b/examples/nft-ruleset-get.c
@@ -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);
 

diff --git a/examples/nft-set-add.c b/examples/nft-set-add.c
index c9e249d09db5df39009280260a363e23b3ae1059..109e33a75ac0ebe86285ca48717587f334b8e56f 100644 (file)
--- a/examples/nft-set-add.c
+++ b/examples/nft-set-add.c
@@ -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);

diff --git a/examples/nft-set-del.c b/examples/nft-set-del.c
index eafd5d750c570f435006103329339d88618a6515..5e8dea975a7395a54e3415c2b066e1ce098c573d 100644 (file)
--- a/examples/nft-set-del.c
+++ b/examples/nft-set-del.c
@@ -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]);
 

diff --git a/examples/nft-set-elem-del.c b/examples/nft-set-elem-del.c
index b569feaf3f6903d3ce1de3ebfab9524a17dfa077..1e6c90df816875518f03f123f395b0c6d2ed1b58 100644 (file)
--- a/examples/nft-set-elem-del.c
+++ b/examples/nft-set-elem-del.c
@@ -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);

diff --git a/examples/nft-set-elem-get.c b/examples/nft-set-elem-get.c
index 52cdd516713ff3d3debf46c773d13507c6a3a66a..7f99a602b0317a0e78de1f7bec06c111bee4e813 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[])
                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);

diff --git a/examples/nft-set-get.c b/examples/nft-set-get.c
index cbe3f85700b21ee9b5e7e6f8421fe090d17dca51..48a0699cad2ba3606f733b4b0ad05138106edd75 100644 (file)
--- a/examples/nft-set-get.c
+++ b/examples/nft-set-get.c
@@ -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);

diff --git a/examples/nft-table-add.c b/examples/nft-table-add.c
index 5b5c1dd0db0f4c5107b63cbc900d500c71312948..3d54e0e5d5097ceb076302a577c35f23c0b909b8 100644 (file)
--- a/examples/nft-table-add.c
+++ b/examples/nft-table-add.c
@@ -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);

diff --git a/examples/nft-table-del.c b/examples/nft-table-del.c
index 3d78fd407d834bb65c36846b9754c7d2f454f7f6..44f0b1f0e090282df8064c6d3134b1b91fdfb651 100644 (file)
--- a/examples/nft-table-del.c
+++ b/examples/nft-table-del.c
@@ -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);

diff --git a/examples/nft-table-get.c b/examples/nft-table-get.c
index 64fd66cac5984ec9dbbb233f74e381a2a08d5177..58eca9c1f32e2efbedb1295ba75fdbc8cd93e452 100644 (file)
--- a/examples/nft-table-get.c
+++ b/examples/nft-table-get.c
@@ -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);

diff --git a/examples/nft-table-upd.c b/examples/nft-table-upd.c
index 663d09f0742996ca0097fd2e9394289c23df7354..7346636d5d47b1034f435ffaf3dfa122968e3842 100644 (file)
--- a/examples/nft-table-upd.c
+++ b/examples/nft-table-upd.c
@@ -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);

diff --git a/src/common.c b/src/common.c
index 08572c3fc917fd8546635dad03cdb51a4412e168..ec84fa0db541f9690d2a795526a537e92cac1700 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -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++);

diff --git a/tests/nft-chain-test.c b/tests/nft-chain-test.c
index d678d46e556a305622653315f48f40cf1214d962..35a65be8d1587ff7e7244dc56e8c4131898364d3 100644 (file)
--- a/tests/nft-chain-test.c
+++ b/tests/nft-chain-test.c
@@ -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)

diff --git a/tests/nft-expr_bitwise-test.c b/tests/nft-expr_bitwise-test.c
index f134728fdd86004feae7140845c8a4d6d2f1947c..44c4bf06f041072893d9245e0f2a7d1cca37156e 100644 (file)
--- a/tests/nft-expr_bitwise-test.c
+++ b/tests/nft-expr_bitwise-test.c
@@ -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)

diff --git a/tests/nft-expr_byteorder-test.c b/tests/nft-expr_byteorder-test.c
index 5994e5bd7d22f320c17b74dca75823e789f32c71..30e64c0eb61005dc2358c5864d79693b3edf0759 100644 (file)
--- a/tests/nft-expr_byteorder-test.c
+++ b/tests/nft-expr_byteorder-test.c
@@ -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)

diff --git a/tests/nft-expr_cmp-test.c b/tests/nft-expr_cmp-test.c
index ec00bb92182c8b4476e603450b04eda56d540da4..0bab67b851a814490b81f97f3eca2f018d73f3a0 100644 (file)
--- a/tests/nft-expr_cmp-test.c
+++ b/tests/nft-expr_cmp-test.c
@@ -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)

diff --git a/tests/nft-expr_counter-test.c b/tests/nft-expr_counter-test.c
index 519bc1f84592c10cac69ebb96cecc58321789406..81c3fe10d74b33cdda45e9e5856711ec7f81e9ac 100644 (file)
--- a/tests/nft-expr_counter-test.c
+++ b/tests/nft-expr_counter-test.c
@@ -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)

diff --git a/tests/nft-expr_ct-test.c b/tests/nft-expr_ct-test.c
index e98fbabf9ccc3f38640546391e1383eaa10edb37..548a426dd84649a1d32337e6a35633d7a9924df3 100644 (file)
--- a/tests/nft-expr_ct-test.c
+++ b/tests/nft-expr_ct-test.c
@@ -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)

diff --git a/tests/nft-expr_dup-test.c b/tests/nft-expr_dup-test.c
index 3c37d4a58462285484a04d3d9cbe8bce6d5b0969..0c5df9a9b7d446aba1a576d56b7419e61e35e26a 100644 (file)
--- a/tests/nft-expr_dup-test.c
+++ b/tests/nft-expr_dup-test.c
@@ -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)

diff --git a/tests/nft-expr_exthdr-test.c b/tests/nft-expr_exthdr-test.c
index fef2dd09f0230605d3f29a9720bd80a3c7fecf71..b2c72b7357c6afdb2d9645515fbd1d6216675b00 100644 (file)
--- a/tests/nft-expr_exthdr-test.c
+++ b/tests/nft-expr_exthdr-test.c
@@ -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");

diff --git a/tests/nft-expr_fwd-test.c b/tests/nft-expr_fwd-test.c
index 4fdf53d7bab100145df3cc79262765b2e9d0da6e..825dad3a456bd50e4a4dc7aad542a750453be5a6 100644 (file)
--- a/tests/nft-expr_fwd-test.c
+++ b/tests/nft-expr_fwd-test.c
@@ -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)

diff --git a/tests/nft-expr_hash-test.c b/tests/nft-expr_hash-test.c
index 7be6e9efd8c3579e5732ecfb930337e65a5b8a6e..6644bb7f3ac0d0df195fe9693804d569e6168616 100644 (file)
--- a/tests/nft-expr_hash-test.c
+++ b/tests/nft-expr_hash-test.c
@@ -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");

diff --git a/tests/nft-expr_immediate-test.c b/tests/nft-expr_immediate-test.c
index c25eedb08710993a408656ce653e3b6939b39190..5027813626b1dcf9ceb8d7701f13623d2de1e006 100644 (file)
--- a/tests/nft-expr_immediate-test.c
+++ b/tests/nft-expr_immediate-test.c
@@ -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)

diff --git a/tests/nft-expr_limit-test.c b/tests/nft-expr_limit-test.c
index 2838941c4d74845fac45271a1b76bd14c59f4643..38aaf56551e97fb583a0f8530b88c056ab521a75 100644 (file)
--- a/tests/nft-expr_limit-test.c
+++ b/tests/nft-expr_limit-test.c
@@ -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)

diff --git a/tests/nft-expr_log-test.c b/tests/nft-expr_log-test.c
index b7aa3023abcd950a0c808c08de25726925150218..275ffaefc377222bfaf38b90ba8e7d29fb3e2848 100644 (file)
--- a/tests/nft-expr_log-test.c
+++ b/tests/nft-expr_log-test.c
@@ -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");

diff --git a/tests/nft-expr_lookup-test.c b/tests/nft-expr_lookup-test.c
index 9e6e0513eeafdfb0eea8e05eb40157ccb367a178..9b7052565d6e99a4a885bbf9741192b354c60651 100644 (file)
--- a/tests/nft-expr_lookup-test.c
+++ b/tests/nft-expr_lookup-test.c
@@ -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)

diff --git a/tests/nft-expr_masq-test.c b/tests/nft-expr_masq-test.c
index 3f9903ddfdd1e96b511e03b906614c82c745a25b..09179149421e24d54806c6f67056801ba1afec51 100644 (file)
--- a/tests/nft-expr_masq-test.c
+++ b/tests/nft-expr_masq-test.c
@@ -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)

diff --git a/tests/nft-expr_match-test.c b/tests/nft-expr_match-test.c
index 39a49d8e29d48908a0b457c93ed91cdcc1a31dd3..fdeacc488e2886620131d01a9ce24e6c11ec9169 100644 (file)
--- a/tests/nft-expr_match-test.c
+++ b/tests/nft-expr_match-test.c
@@ -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)

diff --git a/tests/nft-expr_meta-test.c b/tests/nft-expr_meta-test.c
index 8fb78737421e37a41c9be392890a01c640813a3e..2f03fb16f7b809f1795326e7a533a9c7c88b93f3 100644 (file)
--- a/tests/nft-expr_meta-test.c
+++ b/tests/nft-expr_meta-test.c
@@ -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");

diff --git a/tests/nft-expr_nat-test.c b/tests/nft-expr_nat-test.c
index fd3a488fd6da3dda134fbfe38cc073bb76677faa..3a365dd307c26bc2cd3694695978bfa362fb6c8f 100644 (file)
--- a/tests/nft-expr_nat-test.c
+++ b/tests/nft-expr_nat-test.c
@@ -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)

diff --git a/tests/nft-expr_numgen-test.c b/tests/nft-expr_numgen-test.c
index 0d0a3bbf164de146cb40caaefef0a90e9a9e8ad2..94df50f6e40c5a6d5d8cce048994fbdfa4fe221b 100644 (file)
--- a/tests/nft-expr_numgen-test.c
+++ b/tests/nft-expr_numgen-test.c
@@ -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");

diff --git a/tests/nft-expr_payload-test.c b/tests/nft-expr_payload-test.c
index 371372cdfb89756cf2c9e3b7a84efa3bea1d1b6a..aec17106ef0faf909195294302fa09bba0859f49 100644 (file)
--- a/tests/nft-expr_payload-test.c
+++ b/tests/nft-expr_payload-test.c
@@ -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");

diff --git a/tests/nft-expr_queue-test.c b/tests/nft-expr_queue-test.c
index 81d7dd22c7fb37a87e464ee47613d9bbd6811f22..d007b98a71391ab7ee1028c5831c14680fd3639a 100644 (file)
--- a/tests/nft-expr_queue-test.c
+++ b/tests/nft-expr_queue-test.c
@@ -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)

diff --git a/tests/nft-expr_quota-test.c b/tests/nft-expr_quota-test.c
index 232055118025d9b0a609fb457bc1a32d2e9bc2a9..a3eb2e3c45f3caaae61ae5cb10ff2ce788e67759 100644 (file)
--- a/tests/nft-expr_quota-test.c
+++ b/tests/nft-expr_quota-test.c
@@ -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)

diff --git a/tests/nft-expr_range-test.c b/tests/nft-expr_range-test.c
index b92dfc0b94e64aa0b2219ab91a02e36cf6b897a7..6ef896beb08a898b2f32d56c4f3096ba04fa9e02 100644 (file)
--- a/tests/nft-expr_range-test.c
+++ b/tests/nft-expr_range-test.c
@@ -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)

diff --git a/tests/nft-expr_redir-test.c b/tests/nft-expr_redir-test.c
index 6c8caec969c1ee690a2abd21553bcab206ec3d5a..8e1f30c43332567d313f138473f3b84343f4d739 100644 (file)
--- a/tests/nft-expr_redir-test.c
+++ b/tests/nft-expr_redir-test.c
@@ -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)

diff --git a/tests/nft-expr_reject-test.c b/tests/nft-expr_reject-test.c
index d8189ea8dedbdf2db25f1cf0fdce0a82d75f144b..049401da1565cb7b46486c74c5f795b4d0008304 100644 (file)
--- a/tests/nft-expr_reject-test.c
+++ b/tests/nft-expr_reject-test.c
@@ -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)

diff --git a/tests/nft-expr_target-test.c b/tests/nft-expr_target-test.c
index ba56b278524e57eedd9eb05da5d9562bb715f3d3..a5172064c13b2e61a4444a42a13d2bde8810dfd0 100644 (file)
--- a/tests/nft-expr_target-test.c
+++ b/tests/nft-expr_target-test.c
@@ -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)

diff --git a/tests/nft-rule-test.c b/tests/nft-rule-test.c
index dee35305e5607f801e5038e49990fa7c47bf8109..3652bf62c51302266bee3fb25caf2489d1ba031b 100644 (file)
--- a/tests/nft-rule-test.c
+++ b/tests/nft-rule-test.c
@@ -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)

diff --git a/tests/nft-set-test.c b/tests/nft-set-test.c
index 173c17f829e039f75f8da14c51c270e3be696fa2..66916fe0d523828e9dff4e3e274b2e1ff75abce1 100644 (file)
--- a/tests/nft-set-test.c
+++ b/tests/nft-set-test.c
@@ -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)

diff --git a/tests/nft-table-test.c b/tests/nft-table-test.c
index 1031ffef09ccddeff643249563a914837cee20f2..1b2f280d22ccf83278cdc70854a36eb4927dee1a 100644 (file)
--- a/tests/nft-table-test.c
+++ b/tests/nft-table-test.c
@@ -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)