Let's add batching support to this code example.
While at it, generalize the code to sopport XML/JSON parsing.
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@xxxxxxxxx>
---
examples/Makefile.am | 6 +
examples/nft-set-json-add.c | 124 ------------------------------
examples/nft-set-parse-add.c | 171 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 174 insertions(+), 127 deletions(-)
delete mode 100644 examples/nft-set-json-add.c
create mode 100644 examples/nft-set-parse-add.c
diff --git a/examples/Makefile.am b/examples/Makefile.am
index c45b9df..fed3bf4 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -18,7 +18,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 \
@@ -81,8 +81,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}
diff --git a/examples/nft-set-json-add.c b/examples/nft-set-json-add.c
deleted file mode 100644
index a4535da..0000000
--- a/examples/nft-set-json-add.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * (C) 2013 by Álvaro Neira Ayuso <alvaroneay@xxxxxxxxx>
- *
- * Based on nft-set-xml-add from:
- *
- * (C) 2013 by Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
- * (C) 2013 by Arturo Borrero Gonzalez <arturo.borrero.glez@xxxxxxxxx>
- *
- * This program is free software; you can redistribute it and/or modify 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.
- */
-
-#include <stdlib.h>
-#include <time.h>
-#include <string.h>
-#include <netinet/in.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#include <linux/netfilter.h>
-#include <linux/netfilter/nf_tables.h>
-
-#include <libmnl/libmnl.h>
-#include <libnftnl/set.h>
-
-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_set *s;
- int ret, fd;
- uint16_t family;
- char json[4096];
- char reprint[4096];
- struct nft_parse_err *err;
-
- if (argc < 2) {
- printf("Usage: %s <json-file>\n", argv[0]);
- exit(EXIT_FAILURE);
- }
-
- s = nft_set_alloc();
- if (s == NULL) {
- perror("OOM");
- exit(EXIT_FAILURE);
- }
-
- fd = 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);
- }
-
- err = nft_parse_err_alloc();
- if (err == NULL) {
- perror("error");
- exit(EXIT_FAILURE);
- }
-
- close(fd);
-
- if (nft_set_parse(s, NFT_PARSE_JSON, json, err) < 0) {
- nft_parse_perror("Unable to parse JSON file", err);
- exit(EXIT_FAILURE);
- }
-
- nft_set_snprintf(reprint, sizeof(reprint), s, NFT_OUTPUT_JSON, 0);
- printf("Parsed:\n%s\n", reprint);
-
- family = nft_set_attr_get_u32(s, NFT_SET_ATTR_FAMILY);
-
- seq = time(NULL);
-
- nlh = nft_set_nlmsg_build_hdr(buf, NFT_MSG_NEWSET, family,
- NLM_F_CREATE|NLM_F_ACK, seq);
- nft_set_nlmsg_build_payload(nlh, s);
- nft_set_free(s);
- nft_parse_err_free(err);
-
- nl = mnl_socket_open(NETLINK_NETFILTER);
- if (nl == 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 = mnl_socket_get_portid(nl);
-
- if (mnl_socket_sendto(nl, nlh, nlh->nlmsg_len) < 0) {
- perror("mnl_socket_send");
- exit(EXIT_FAILURE);
- }
-
- ret = mnl_socket_recvfrom(nl, buf, sizeof(buf));
- while (ret > 0) {
- ret = mnl_cb_run(buf, ret, seq, portid, NULL, NULL);
- if (ret <= 0)
- break;
- ret = mnl_socket_recvfrom(nl, buf, sizeof(buf));
- }
- if (ret == -1) {
- perror("error");
- exit(EXIT_FAILURE);
- }
-
- mnl_socket_close(nl);
-
- return EXIT_SUCCESS;
-}
diff --git a/examples/nft-set-parse-add.c b/examples/nft-set-parse-add.c
new file mode 100644
index 0000000..283b783
--- /dev/null
+++ b/examples/nft-set-parse-add.c
@@ -0,0 +1,171 @@
+/*
+ * (C) 2013 by Álvaro Neira Ayuso <alvaroneay@xxxxxxxxx>
+ *
+ * Based on nft-set-xml-add from:
+ *
+ * (C) 2013 by Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
+ * (C) 2013 by Arturo Borrero Gonzalez <arturo.borrero.glez@xxxxxxxxx>
+ *
+ * This program is free software; you can redistribute it and/or modify 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.
+ */
+
+#include <stdlib.h>
+#include <time.h>
+#include <string.h>
+#include <netinet/in.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#include <linux/netfilter.h>
+#include <linux/netfilter/nf_tables.h>
+#include <linux/netfilter/nfnetlink.h>
+
+#include <libmnl/libmnl.h>
+#include <libnftnl/set.h>
+
+static void nft_mnl_batch_put(char *buf, uint16_t type, uint32_t seq)
+{
+ struct nlmsghdr *nlh;
+ struct nfgenmsg *nfg;
+
+ nlh = mnl_nlmsg_put_header(buf);
+ nlh->nlmsg_type = type;
+ nlh->nlmsg_flags = NLM_F_REQUEST;
+ nlh->nlmsg_seq = seq;
+
+ nfg = mnl_nlmsg_put_extra_header(nlh, sizeof(*nfg));
+ nfg->nfgen_family = AF_INET;
+ nfg->version = NFNETLINK_V0;
+ nfg->res_id = 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_set *s;
+ int ret, fd;
+ uint16_t family, format, outformat;
+ char data[4096];
+ struct nft_parse_err *err;
+
+ if (argc < 3) {
+ printf("Usage: %s {xml|json} <file>\n", argv[0]);
+ exit(EXIT_FAILURE);
+ }
+
+ if (strcmp(argv[1], "xml") == 0) {
+ format = NFT_PARSE_XML;
+ outformat = NFT_OUTPUT_XML;
+ } else if (strcmp(argv[1], "json") == 0) {
+ format = NFT_PARSE_JSON;
+ outformat = NFT_OUTPUT_JSON;
+ } else {
+ fprintf(stderr, "Unknow format: xml, json\n");
+ exit(EXIT_FAILURE);
+ }
+
+ s = nft_set_alloc();
+ if (s == NULL) {
+ perror("OOM");
+ exit(EXIT_FAILURE);
+ }
+
+ fd = 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);
+ }
+
+ err = nft_parse_err_alloc();
+ if (err == NULL) {
+ perror("error");
+ exit(EXIT_FAILURE);
+ }
+
+ close(fd);
+
+ if (nft_set_parse(s, format, data, err) < 0) {
+ nft_parse_perror("Unable to parse file", err);
+ exit(EXIT_FAILURE);
+ }
+
+ nft_set_fprintf(stdout, s, outformat, 0);
+ fprintf(stdout, "\n");
+
+ family = nft_set_attr_get_u32(s, NFT_SET_ATTR_FAMILY);
+
+ seq = time(NULL);
+ batch = 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 = 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);
+ 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 = mnl_socket_open(NETLINK_NETFILTER);
+ if (nl == 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 = mnl_socket_get_portid(nl);
+
+ if (mnl_socket_sendto(nl, nlh, nlh->nlmsg_len) < 0) {
+ perror("mnl_socket_send");
+ exit(EXIT_FAILURE);
+ }
+
+ ret = mnl_socket_sendto(nl, mnl_nlmsg_batch_head(batch),
+ mnl_nlmsg_batch_size(batch));
+ if (ret == -1) {
+ perror("mnl_socket_sendto");
+ exit(EXIT_FAILURE);
+ }
+
+ mnl_nlmsg_batch_stop(batch);
+
+ ret = mnl_socket_recvfrom(nl, buf, sizeof(buf));
+ if (ret == -1) {
+ perror("mnl_socket_recvfrom");
+ exit(EXIT_FAILURE);
+ }
+
+ ret = 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;
+}
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
