Merge the two examples in one. An input argument choose the format to use.
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
include $(top_srcdir)/Make_global.am
check_PROGRAMS = nft-table-add \
- nft-table-xml-add \
- nft-table-json-add \
+ nft-table-parse-add \
nft-table-upd \
nft-table-del \
nft-table-get \
nft_table_add_SOURCES = nft-table-add.c
nft_table_add_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS}
-nft_table_xml_add_SOURCES = nft-table-xml-add.c
-nft_table_xml_add_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS}
-
-nft_table_json_add_SOURCES = nft-table-json-add.c
-nft_table_json_add_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS}
+nft_table_parse_add_SOURCES = nft-table-parse-add.c
+nft_table_parse_add_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS}
nft_table_upd_SOURCES = nft-table-upd.c
nft_table_upd_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS}
+++ /dev/null
-/*
- * (C) 2013 by Álvaro Neira Ayuso <alvaroneay@gmail.com>
- *
- * Based on nft-table-xml-add from:
- *
- * (C) 2013 by Pablo Neira Ayuso <pablo@netfilter.org>
- * (C) 2013 by Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
- *
- * 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.
- *
- * This code has been sponsored by Sophos Astaro <http://www.sophos.com>
- */
-
-#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/nf_tables.h>
-
-#include <libmnl/libmnl.h>
-#include <libnftnl/table.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_table *t = NULL;
- 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);
- }
-
- 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);
- }
- close(fd);
-
- t = nft_table_alloc();
- if (t == NULL) {
- perror("OOM");
- exit(EXIT_FAILURE);
- }
-
- err = nft_parse_err_alloc();
- if (err == 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 = nft_table_attr_get_u32(t, NFT_TABLE_ATTR_FAMILY);
-
- seq = time(NULL);
-
- nlh = 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 = 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;
-}
#include <libnftnl/table.h>
#include <libnftnl/common.h>
-int main(int argc, char *argv[])
+static struct nft_table *table_parse_file(const char *file, uint16_t format)
{
- struct mnl_socket *nl;
- char buf[MNL_SOCKET_BUFFER_SIZE];
- struct nlmsghdr *nlh;
- uint32_t portid, seq;
- struct nft_table *t = NULL;
- int ret, fd;
- uint16_t family;
- char xml[4096];
- char reprint[4096];
+ int fd;
+ struct nft_table *t;
struct nft_parse_err *err;
+ char data[4096];
- if (argc < 2) {
- printf("Usage: %s <xml-file>\n", argv[0]);
- exit(EXIT_FAILURE);
+ t = nft_table_alloc();
+ if (t == NULL) {
+ perror("OOM");
+ return NULL;
}
- fd = open(argv[1], O_RDONLY);
+ fd = open(file, O_RDONLY);
if (fd < 0) {
perror("open");
- exit(EXIT_FAILURE);
+ return NULL;
}
- if (read(fd, xml, sizeof(xml)) < 0) {
+ if (read(fd, data, sizeof(data)) < 0) {
perror("read");
close(fd);
- exit(EXIT_FAILURE);
+ return NULL;
}
close(fd);
- t = nft_table_alloc();
- if (t == NULL) {
- perror("OOM");
- exit(EXIT_FAILURE);
- }
-
err = nft_parse_err_alloc();
if (err == NULL) {
perror("error");
+ return NULL;
+ }
+
+ if (nft_table_parse(t, format, data, err) < 0) {
+ nft_parse_perror("Unable to parse file", err);
+ nft_parse_err_free(err);
+ return NULL;
+ }
+
+ nft_parse_err_free(err);
+ return t;
+
+}
+
+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 = NULL;
+ int ret;
+ uint16_t family, format, outformat;
+
+ if (argc < 3) {
+ printf("Usage: %s {xml|json} <file>\n", argv[0]);
exit(EXIT_FAILURE);
}
- if (nft_table_parse(t, NFT_PARSE_XML, xml, err) < 0) {
- nft_parse_perror("Unable to parse XML file", err);
+ 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 {
+ printf("Unknown format: xml, json\n");
exit(EXIT_FAILURE);
}
- nft_table_snprintf(reprint, sizeof(reprint), t, NFT_OUTPUT_XML, 0);
- printf("Parsed:\n%s\n", reprint);
+ t = table_parse_file(argv[2], format);
+ if (t == NULL)
+ exit(EXIT_FAILURE);
+
+ nft_table_fprintf(stdout, t, outformat, 0);
+ fprintf(stdout, "\n");
family = nft_table_attr_get_u32(t, NFT_TABLE_ATTR_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 = mnl_socket_open(NETLINK_NETFILTER);
if (nl == NULL) {
projects / thirdparty / libnftnl.git / commitdiff
