examples: merge nft-rule-{xml|json}-add.c
PATCH 1/2 examples: merge nft-rule-{xml|json}-add.c
Merge the two examples in just one. An input argument choose the format to use.
--- examples/Makefile.am | 10 +-- examples/nft-rule-json-add.c | 123 ---------------------------------- examples/nft-rule-parse-add.c | 148 +++++++++++++++++++++++++++++++++++++++++ examples/nft-rule-xml-add.c | 123 ---------------------------------- 4 files changed, 151 insertions(+), 253 deletions(-) delete mode 100644 examples/nft-rule-json-add.c create mode 100644 examples/nft-rule-parse-add.c delete mode 100644 examples/nft-rule-xml-add.c
examples/Makefile.am +3 -7
@@ -10,8 +10,7 @@ check_PROGRAMS = nft-table-add \ nft-chain-del \ nft-chain-get \ nft-rule-add \ - nft-rule-xml-add \ - nft-rule-json-add \ + nft-rule-parse-add \ nft-rule-del \ nft-rule-get \ nft-events \
@@ -55,11 +54,8 @@ nft_chain_get_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_rule_add_SOURCES = nft-rule-add.c nft_rule_add_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} -nft_rule_xml_add_SOURCES = nft-rule-xml-add.c -nft_rule_xml_add_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} - -nft_rule_json_add_SOURCES = nft-rule-json-add.c -nft_rule_json_add_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} +nft_rule_parse_add_SOURCES = nft-rule-parse-add.c +nft_rule_parse_add_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_rule_del_SOURCES = nft-rule-del.c nft_rule_del_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS}
examples/nft-rule-json-add.c deleted +0 -123
123 lines not on this page · raw message
examples/nft-rule-parse-add.c new file +148 -0
148 lines not on this page · raw message
examples/nft-rule-xml-add.c deleted +0 -123
123 lines not on this page · raw message
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 2/2 examples: nft-rule-parse-add: give batching support
Let's add support for current kernels.
--- examples/nft-rule-parse-add.c | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-)
examples/nft-rule-parse-add.c +29 -6
@@ -75,11 +75,12 @@ static struct nft_rule *rule_parse_file(const char *file, uint16_t format)int main (int argc,char *argv[]) {struct mnl_socket *nl; +struct mnl_nlmsg_batch *batch;char buf[MNL_SOCKET_BUFFER_SIZE ];struct nlmsghdr *nlh; -uint32_t portid, seq; +uint32_t portid, seq, rule_seq;struct nft_rule *r; -int ret; +int ret, batching;uint16_t family, format, outformat;if (argc <3 ) {
@@ -105,14 +106,33 @@ int main(int argc, char *argv[])nft_rule_fprintf (stdout, r, outformat,0 );fprintf (stdout,"\n" ); - family =nft_rule_attr_get_u32 (r,NFT_RULE_ATTR_FAMILY ); + batching =nft_batch_is_supported (); +if (batching <0 ) { +perror ("Cannot talk to nfnetlink" ); +exit (EXIT_FAILURE ); + } seq =time (NULL ); + batch =mnl_nlmsg_batch_start (buf,sizeof (buf)); + +if (batching) { +nft_batch_begin (mnl_nlmsg_batch_current (batch), seq++); +mnl_nlmsg_batch_next (batch); + } + + rule_seq = seq; + family =nft_rule_attr_get_u32 (r,NFT_RULE_ATTR_FAMILY ); nlh =nft_rule_nlmsg_build_hdr (buf,NFT_MSG_NEWRULE , family,NLM_F_CREATE |NLM_F_APPEND |NLM_F_ACK , - seq); + seq++);nft_rule_nlmsg_build_payload (nlh, r);nft_rule_free (r); +mnl_nlmsg_batch_next (batch); + +if (batching) { +nft_batch_end (mnl_nlmsg_batch_current (batch), seq++); +mnl_nlmsg_batch_next (batch); + } nl =mnl_socket_open (NETLINK_NETFILTER );if (nl ==NULL ) {
@@ -126,14 +146,17 @@ int main(int argc, char *argv[]) } portid =mnl_socket_get_portid (nl); -if (mnl_socket_sendto (nl, nlh, nlh->nlmsg_len) <0 ) { +if (mnl_socket_sendto (nl,mnl_nlmsg_batch_head (batch), +mnl_nlmsg_batch_size (batch)) <0 ) {perror ("mnl_socket_send" );exit (EXIT_FAILURE ); } +mnl_nlmsg_batch_stop (batch); + ret =mnl_socket_recvfrom (nl, buf,sizeof (buf));while (ret >0 ) { - ret =mnl_cb_run (buf, ret, seq, portid,NULL ,NULL ); + ret =mnl_cb_run (buf, ret, rule_seq, portid,NULL ,NULL );if (ret <=0 )break ; ret =mnl_socket_recvfrom (nl, buf,sizeof (buf));
Pablo Neira Ayuso
maintainerRe: [libnftnl PATCH 2/2] examples: nft-rule-parse-add: give batching support
Quoted 1 line · Arturo Borrero Gonzalez
Let's add support for current kernels.
Also applied, thanks.
Quoted 1 line · Arturo Borrero Gonzalez
Merge the two examples in just one. An input argument choose the format to use.
Applied, thanks