examples: nft-set-json-add: generalize parsing format support
PATCH 1/2 examples: nft-set-json-add: generalize parsing format support
Let's create a single code example with XML/JSON support.
--- examples/Makefile.am | 6 +- examples/nft-set-json-add.c | 124 ----------------------------------- examples/nft-set-parse-add.c | 147 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 150 insertions(+), 127 deletions(-) delete mode 100644 examples/nft-set-json-add.c create mode 100644 examples/nft-set-parse-add.c
examples/Makefile.am +3 -3
@@ -15,7 +15,7 @@ check_PROGRAMS = nft-table-add \ nft-rule-get \ nft-events \ nft-set-add \ - nft-set-json-add \ + nft-set-parse-add \ nft-set-get \ nft-set-del \ nft-set-elem-add \
@@ -69,8 +69,8 @@ nft_events_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_set_add_SOURCES = nft-set-add.c nft_set_add_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} -nft_set_json_add_SOURCES = nft-set-json-add.c -nft_set_json_add_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} +nft_set_parse_add_SOURCES = nft-set-parse-add.c +nft_set_parse_add_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_set_del_SOURCES = nft-set-del.c nft_set_del_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS}
examples/nft-set-json-add.c deleted +0 -124
124 lines not on this page · raw message
examples/nft-set-parse-add.c new file +147 -0
147 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-set-parse-add: give batching support
Batching is needed in current kernels.
--- examples/nft-set-parse-add.c | 43 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-)
examples/nft-set-parse-add.c +35 -8
@@ -23,6 +23,7 @@#include <linux/netfilter.h> #include <linux/netfilter/nf_tables.h> +#include <linux/netfilter/nfnetlink.h> #include <libmnl/libmnl.h> #include <libnftnl/set.h>
@@ -66,6 +67,8 @@ static struct nft_set *set_parse_file(const char *file, uint16_t format) }nft_parse_err_free (err); + +nft_set_attr_set_u32 (s,NFT_SET_ATTR_ID ,1 );return s; }
@@ -75,10 +78,11 @@ int main(int argc, char *argv[])struct mnl_socket *nl;char buf[MNL_SOCKET_BUFFER_SIZE ];struct nlmsghdr *nlh; -uint32_t portid, seq; +uint32_t portid, seq, set_seq;struct nft_set *s; -int ret; +int ret, batching;uint16_t family, format, outformat; +struct mnl_nlmsg_batch *batch;if (argc <2 ) {printf ("Usage: %s {xml|json} <file>\n" , argv[0 ]);
@@ -103,14 +107,34 @@ int main(int argc, char *argv[])nft_set_fprintf (stdout, s, outformat,0 );fprintf (stdout,"\n" ); - family =nft_set_attr_get_u32 (s,NFT_SET_ATTR_FAMILY ); - seq =time (NULL ); + batching =nft_batch_is_supported (); +if (batching <0 ) { +perror ("cannot talk to nfnetlink" ); +exit (EXIT_FAILURE ); + } + + batch =mnl_nlmsg_batch_start (buf,sizeof (buf)); - nlh =nft_set_nlmsg_build_hdr (buf,NFT_MSG_NEWSET , family, -NLM_F_CREATE |NLM_F_ACK , seq); +if (batching) { +nft_batch_begin (mnl_nlmsg_batch_current (batch), seq++); +mnl_nlmsg_batch_next (batch); + } + + family =nft_set_attr_get_u32 (s,NFT_SET_ATTR_FAMILY ); + + set_seq = seq; + nlh =nft_set_nlmsg_build_hdr (mnl_nlmsg_batch_current (batch), +NFT_MSG_NEWSET , family, +NLM_F_CREATE |NLM_F_ACK , seq++);nft_set_nlmsg_build_payload (nlh, s);nft_set_free (s); +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 ) {
@@ -124,14 +148,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, set_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-set-parse-add: give batching support
examples/nft-set-parse-add.c static struct nft_set *set_parse_file(const char *file, uint16_t format) · line 74
Quoted 9 lines · Arturo Borrero Gonzalez
examples/nft-set-parse-add.c +2
-0@@ -66,6 +67,8 @@ static struct nft_set *set_parse_file(const char *file, uint16_t format) }nft_parse_err_free (err); + +nft_set_attr_set_u32 (s,NFT_SET_ATTR_ID ,1 );return s; }
I guess this works if you parse one single set definition in a file. With more than one set, this will break.
IIRC, Alvaro started a patch time ago to add a new interface to libnftnl to handle the set internal id which was incomplete.
Cc'ing him to know its status.
A message that is not in the archive (sent off-list or not yet received): CAOkSjBhujE4fx-1YnH1ZqdP1aUsZxaPQR+rrXoLC6wBBbONjYg@mail.gmail.com
Pablo Neira Ayuso
maintainerRe: [libnftnl PATCH 2/2] examples: nft-set-parse-add: give batching support
Quoted 17 lines · Arturo Borrero Gonzalez
Quoted 3 lines · Pablo Neira Ayuso
Review static struct nft_set *set_parse_file(const char
Quoted 1 line · Arturo Borrero Gonzalez
(quoted diff) +0
-0@@ -66,6 +67,8 @@ static struct nft_set *set_parse_file(const char*file,
uint16_tformat)Quoted 12 lines
examples/nft-set-parse-add.c static struct nft_set *set_parse_file(const char *file, uint16_t format) · line 74
Quoted 8 lines
examples/nft-set-parse-add.c +2
-0}nft_parse_err_free (err); + +nft_set_attr_set_u32 (s,NFT_SET_ATTR_ID ,1 );return s; }I guess this works if you parse one single set definition in a file. With more than one set, this will break.
Quoted 6 lines
Quoted 4 lines
IIRC, Alvaro started a patch time ago to add a new interface to libnftnl to handle the set internal id which was incomplete.
Cc'ing him to know its status.
Yes, there is a issue here. But this code example just parse one set.
Right. Then applied, thanks.
--
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
Quoted 1 line · Arturo Borrero Gonzalez
Let's create a single code example with XML/JSON support.
Applied, thanks.