From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arturo Borrero Gonzalez Subject: [libnftnl PATCH 4/4] examples: fix and merge nft-table-{xml|json}-add.c Date: Mon, 11 Aug 2014 13:32:04 +0200 Message-ID: <20140811113204.13420.92217.stgit@nfdev.cica.es> References: <20140811113148.13420.26758.stgit@nfdev.cica.es> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: pablo@netfilter.org To: netfilter-devel@vger.kernel.org Return-path: Received: from smtp4.cica.es ([150.214.5.182]:47431 "EHLO smtp.cica.es" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752611AbaHKLcN (ORCPT ); Mon, 11 Aug 2014 07:32:13 -0400 In-Reply-To: <20140811113148.13420.26758.stgit@nfdev.cica.es> Sender: netfilter-devel-owner@vger.kernel.org List-ID: These code examples don't work because they don't support batching, wha= t the kernel subsystem API understand. This patch adds the nedded batching support. While at it merge the two examples in only one, with an input argument = to know which format to parse. Signed-off-by: Arturo Borrero Gonzalez --- examples/Makefile.am | 10 +- examples/nft-table-json-add.c | 124 ------------------------------ examples/nft-table-parse-add.c | 164 ++++++++++++++++++++++++++++++++= ++++++++ examples/nft-table-xml-add.c | 121 ------------------------------ 4 files changed, 167 insertions(+), 252 deletions(-) delete mode 100644 examples/nft-table-json-add.c create mode 100644 examples/nft-table-parse-add.c delete mode 100644 examples/nft-table-xml-add.c diff --git a/examples/Makefile.am b/examples/Makefile.am index c45b9df..e459dbe 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,8 +1,7 @@ include $(top_srcdir)/Make_global.am =20 check_PROGRAMS =3D nft-table-add \ - nft-table-xml-add \ - nft-table-json-add \ + nft-table-parse-add \ nft-table-upd \ nft-table-del \ nft-table-get \ @@ -30,11 +29,8 @@ check_PROGRAMS =3D nft-table-add \ nft_table_add_SOURCES =3D nft-table-add.c nft_table_add_LDADD =3D ../src/libnftnl.la ${LIBMNL_LIBS} =20 -nft_table_xml_add_SOURCES =3D nft-table-xml-add.c -nft_table_xml_add_LDADD =3D ../src/libnftnl.la ${LIBMNL_LIBS} - -nft_table_json_add_SOURCES =3D nft-table-json-add.c -nft_table_json_add_LDADD =3D ../src/libnftnl.la ${LIBMNL_LIBS} +nft_table_parse_add_SOURCES =3D nft-table-parse-add.c +nft_table_parse_add_LDADD =3D ../src/libnftnl.la ${LIBMNL_LIBS} =20 nft_table_upd_SOURCES =3D nft-table-upd.c nft_table_upd_LDADD =3D ../src/libnftnl.la ${LIBMNL_LIBS} diff --git a/examples/nft-table-json-add.c b/examples/nft-table-json-ad= d.c deleted file mode 100644 index a9bd217..0000000 --- a/examples/nft-table-json-add.c +++ /dev/null @@ -1,124 +0,0 @@ -/* - * (C) 2013 by =C3=81lvaro Neira Ayuso - * - * Based on nft-table-xml-add from: - * - * (C) 2013 by Pablo Neira Ayuso - * (C) 2013 by Arturo Borrero Gonzalez - * - * This program is free software; you can redistribute it and/or modif= y it - * under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This code has been sponsored by Sophos Astaro - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include - -int main(int argc, char *argv[]) -{ - struct mnl_socket *nl; - char buf[MNL_SOCKET_BUFFER_SIZE]; - struct nlmsghdr *nlh; - uint32_t portid, seq; - struct nft_table *t =3D NULL; - int ret, fd; - uint16_t family; - char json[4096]; - char reprint[4096]; - struct nft_parse_err *err; - - if (argc < 2) { - printf("Usage: %s \n", argv[0]); - exit(EXIT_FAILURE); - } - - fd =3D open(argv[1], O_RDONLY); - if (fd < 0) { - perror("open"); - exit(EXIT_FAILURE); - } - - if (read(fd, json, sizeof(json)) < 0) { - perror("read"); - close(fd); - exit(EXIT_FAILURE); - } - close(fd); - - t =3D nft_table_alloc(); - if (t =3D=3D NULL) { - perror("OOM"); - exit(EXIT_FAILURE); - } - - err =3D nft_parse_err_alloc(); - if (err =3D=3D NULL) { - perror("error"); - exit(EXIT_FAILURE); - } - - if (nft_table_parse(t, NFT_PARSE_JSON, json, err) < 0) { - nft_parse_perror("Unable to parse JSON file", err); - exit(EXIT_FAILURE); - } - - nft_table_snprintf(reprint, sizeof(reprint), t, NFT_OUTPUT_JSON, 0); - printf("Parsed:\n%s\n", reprint); - - family =3D nft_table_attr_get_u32(t, NFT_TABLE_ATTR_FAMILY); - - seq =3D time(NULL); - - nlh =3D nft_table_nlmsg_build_hdr(buf, NFT_MSG_NEWTABLE, family, - NLM_F_CREATE|NLM_F_ACK, seq); - nft_table_nlmsg_build_payload(nlh, t); - nft_table_free(t); - nft_parse_err_free(err); - - nl =3D mnl_socket_open(NETLINK_NETFILTER); - if (nl =3D=3D NULL) { - perror("mnl_socket_open"); - exit(EXIT_FAILURE); - } - - if (mnl_socket_bind(nl, 0, MNL_SOCKET_AUTOPID) < 0) { - perror("mnl_socket_bind"); - exit(EXIT_FAILURE); - } - portid =3D mnl_socket_get_portid(nl); - - if (mnl_socket_sendto(nl, nlh, nlh->nlmsg_len) < 0) { - perror("mnl_socket_send"); - exit(EXIT_FAILURE); - } - - ret =3D mnl_socket_recvfrom(nl, buf, sizeof(buf)); - while (ret > 0) { - ret =3D mnl_cb_run(buf, ret, seq, portid, NULL, NULL); - if (ret <=3D 0) - break; - ret =3D mnl_socket_recvfrom(nl, buf, sizeof(buf)); - } - if (ret =3D=3D -1) { - perror("error"); - exit(EXIT_FAILURE); - } - - mnl_socket_close(nl); - - return EXIT_SUCCESS; -} diff --git a/examples/nft-table-parse-add.c b/examples/nft-table-parse-= add.c new file mode 100644 index 0000000..49d1d7a --- /dev/null +++ b/examples/nft-table-parse-add.c @@ -0,0 +1,164 @@ +/* + * (C) 2013 by Pablo Neira Ayuso + * (C) 2013 by Arturo Borrero Gonzalez + * + * This program is free software; you can redistribute it and/or modif= y it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This code has been sponsored by Sophos Astaro + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include + +static void nft_mnl_batch_put(char *buf, uint16_t type, uint32_t seq) +{ + struct nlmsghdr *nlh; + struct nfgenmsg *nfg; + + nlh =3D mnl_nlmsg_put_header(buf); + nlh->nlmsg_type =3D type; + nlh->nlmsg_flags =3D NLM_F_REQUEST; + nlh->nlmsg_seq =3D seq; + + nfg =3D mnl_nlmsg_put_extra_header(nlh, sizeof(*nfg)); + nfg->nfgen_family =3D AF_INET; + nfg->version =3D NFNETLINK_V0; + nfg->res_id =3D NFNL_SUBSYS_NFTABLES; +} + +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; + struct nft_table *t =3D NULL; + int ret, fd; + uint16_t family, format, outformat; + char data[4096]; + struct nft_parse_err *err; + + if (argc < 3) { + printf("Usage: %s {xml|json} \n", argv[0]); + exit(EXIT_FAILURE); + } + + if (strcmp(argv[1], "xml") =3D=3D 0) { + format =3D NFT_PARSE_XML; + outformat =3D NFT_OUTPUT_XML; + } else if (strcmp(argv[1], "json") =3D=3D 0) { + format =3D NFT_PARSE_JSON; + outformat =3D NFT_OUTPUT_JSON; + } else { + fprintf(stderr, "Unknow format: xml, json\n"); + exit(EXIT_FAILURE); + } + + fd =3D open(argv[2], O_RDONLY); + if (fd < 0) { + perror("open"); + exit(EXIT_FAILURE); + } + + if (read(fd, data, sizeof(data)) < 0) { + perror("read"); + close(fd); + exit(EXIT_FAILURE); + } + close(fd); + + t =3D nft_table_alloc(); + if (t =3D=3D NULL) { + perror("OOM"); + exit(EXIT_FAILURE); + } + + err =3D nft_parse_err_alloc(); + if (err =3D=3D NULL) { + perror("error"); + exit(EXIT_FAILURE); + } + + if (nft_table_parse(t, format, data, err) < 0) { + nft_parse_perror("Unable to parse file", err); + exit(EXIT_FAILURE); + } + + nft_table_fprintf(stdout, t, outformat, 0); + fprintf(stdout, "\n"); + + family =3D nft_table_attr_get_u32(t, NFT_TABLE_ATTR_FAMILY); + + seq =3D time(NULL); + batch =3D mnl_nlmsg_batch_start(buf, sizeof(buf)); + + nft_mnl_batch_put(mnl_nlmsg_batch_current(batch), + NFNL_MSG_BATCH_BEGIN, seq++); + mnl_nlmsg_batch_next(batch); + + nlh =3D nft_table_nlmsg_build_hdr(mnl_nlmsg_batch_current(batch), + NFT_MSG_NEWTABLE, family, + NLM_F_CREATE|NLM_F_ACK, seq++); + nft_table_nlmsg_build_payload(nlh, t); + nft_table_free(t); + nft_parse_err_free(err); + mnl_nlmsg_batch_next(batch); + + nft_mnl_batch_put(mnl_nlmsg_batch_current(batch), + NFNL_MSG_BATCH_END, seq++); + mnl_nlmsg_batch_next(batch); + + nl =3D mnl_socket_open(NETLINK_NETFILTER); + if (nl =3D=3D NULL) { + perror("mnl_socket_open"); + exit(EXIT_FAILURE); + } + + if (mnl_socket_bind(nl, 0, MNL_SOCKET_AUTOPID) < 0) { + perror("mnl_socket_bind"); + exit(EXIT_FAILURE); + } + portid =3D mnl_socket_get_portid(nl); + + ret =3D mnl_socket_sendto(nl, mnl_nlmsg_batch_head(batch), + mnl_nlmsg_batch_size(batch)); + if (ret =3D=3D -1) { + perror("mnl_socket_sendto"); + exit(EXIT_FAILURE); + } + + mnl_nlmsg_batch_stop(batch); + + ret =3D mnl_socket_recvfrom(nl, buf, sizeof(buf)); + if (ret =3D=3D -1) { + perror("mnl_socket_recvfrom"); + exit(EXIT_FAILURE); + } + + ret =3D mnl_cb_run(buf, ret, 0, portid, NULL, NULL); + if (ret < 0) { + perror("mnl_cb_run"); + exit(EXIT_FAILURE); + } + + mnl_socket_close(nl); + + return EXIT_SUCCESS; +} diff --git a/examples/nft-table-xml-add.c b/examples/nft-table-xml-add.= c deleted file mode 100644 index f36f0ab..0000000 --- a/examples/nft-table-xml-add.c +++ /dev/null @@ -1,121 +0,0 @@ -/* - * (C) 2013 by Pablo Neira Ayuso - * (C) 2013 by Arturo Borrero Gonzalez - * - * This program is free software; you can redistribute it and/or modif= y it - * under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This code has been sponsored by Sophos Astaro - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include - -int main(int argc, char *argv[]) -{ - struct mnl_socket *nl; - char buf[MNL_SOCKET_BUFFER_SIZE]; - struct nlmsghdr *nlh; - uint32_t portid, seq; - struct nft_table *t =3D NULL; - int ret, fd; - uint16_t family; - char xml[4096]; - char reprint[4096]; - struct nft_parse_err *err; - - if (argc < 2) { - printf("Usage: %s \n", argv[0]); - exit(EXIT_FAILURE); - } - - fd =3D open(argv[1], O_RDONLY); - if (fd < 0) { - perror("open"); - exit(EXIT_FAILURE); - } - - if (read(fd, xml, sizeof(xml)) < 0) { - perror("read"); - close(fd); - exit(EXIT_FAILURE); - } - close(fd); - - t =3D nft_table_alloc(); - if (t =3D=3D NULL) { - perror("OOM"); - exit(EXIT_FAILURE); - } - - err =3D nft_parse_err_alloc(); - if (err =3D=3D NULL) { - perror("error"); - exit(EXIT_FAILURE); - } - - if (nft_table_parse(t, NFT_PARSE_XML, xml, err) < 0) { - nft_parse_perror("Unable to parse XML file", err); - exit(EXIT_FAILURE); - } - - nft_table_snprintf(reprint, sizeof(reprint), t, NFT_OUTPUT_XML, 0); - printf("Parsed:\n%s\n", reprint); - - family =3D nft_table_attr_get_u32(t, NFT_TABLE_ATTR_FAMILY); - - seq =3D time(NULL); - - nlh =3D nft_table_nlmsg_build_hdr(buf, NFT_MSG_NEWTABLE, family, - NLM_F_CREATE|NLM_F_ACK, seq); - nft_table_nlmsg_build_payload(nlh, t); - nft_table_free(t); - nft_parse_err_free(err); - - nl =3D mnl_socket_open(NETLINK_NETFILTER); - if (nl =3D=3D NULL) { - perror("mnl_socket_open"); - exit(EXIT_FAILURE); - } - - if (mnl_socket_bind(nl, 0, MNL_SOCKET_AUTOPID) < 0) { - perror("mnl_socket_bind"); - exit(EXIT_FAILURE); - } - portid =3D mnl_socket_get_portid(nl); - - if (mnl_socket_sendto(nl, nlh, nlh->nlmsg_len) < 0) { - perror("mnl_socket_send"); - exit(EXIT_FAILURE); - } - - ret =3D mnl_socket_recvfrom(nl, buf, sizeof(buf)); - while (ret > 0) { - ret =3D mnl_cb_run(buf, ret, seq, portid, NULL, NULL); - if (ret <=3D 0) - break; - ret =3D mnl_socket_recvfrom(nl, buf, sizeof(buf)); - } - if (ret =3D=3D -1) { - perror("error"); - exit(EXIT_FAILURE); - } - - mnl_socket_close(nl); - - return EXIT_SUCCESS; -} -- To unsubscribe from this list: send the line "unsubscribe netfilter-dev= el" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html