diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-02-03 14:04:42 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-02-03 18:43:13 +0100 |
| commit | 29fd6a1df9f6c80d155a7a73b8514a68dc9cd22d (patch) | |
| tree | 9dc15a3e19a6ff36ae9ee3d38c7b8190b73f0a72 /examples/nft-chain-json-add.c | |
| parent | 16871a3615edcf358d688a8d079b1e7b20053fb1 (diff) | |
| parent | 076fd1e66e7f1bc3b2bd91f3efb84080da26fb9c (diff) | |
Merge branch 'master' into next-3.14
This patch includes changes to adapt this branch to the library
rename that happened in the master branch.
Conflicts:
src/Makefile.am
src/expr/cmp.c
src/expr/ct.c
src/expr/data_reg.c
src/expr/meta.c
tests/jsonfiles/01-table.json
tests/jsonfiles/02-table.json
tests/jsonfiles/64-ruleset.json
tests/xmlfiles/01-table.xml
tests/xmlfiles/02-table.xml
Diffstat (limited to 'examples/nft-chain-json-add.c')
| -rw-r--r-- | examples/nft-chain-json-add.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/examples/nft-chain-json-add.c b/examples/nft-chain-json-add.c index 50cb29f..4fd0551 100644 --- a/examples/nft-chain-json-add.c +++ b/examples/nft-chain-json-add.c @@ -25,8 +25,8 @@ #include <linux/netfilter/nf_tables.h> #include <libmnl/libmnl.h> -#include <libnftables/chain.h> -#include <libnftables/rule.h> +#include <libnftnl/chain.h> +#include <libnftnl/rule.h> int main(int argc, char *argv[]) { @@ -39,6 +39,7 @@ int main(int argc, char *argv[]) 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]); @@ -63,10 +64,16 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } + err = nft_parse_err_alloc(); + if (err == NULL) { + perror("error"); + exit(EXIT_FAILURE); + } + close(fd); - if (nft_chain_parse(c, NFT_PARSE_JSON, json) < 0) { - printf("E: Unable to parse JSON file: %s\n", strerror(errno)); + if (nft_chain_parse(c, NFT_PARSE_JSON, json, err) < 0) { + nft_parse_perror("Unable to parse JSON file", err); exit(EXIT_FAILURE); } @@ -82,6 +89,7 @@ int main(int argc, char *argv[]) nft_chain_nlmsg_build_payload(nlh, c); nft_chain_free(c); + nft_parse_err_free(err); nl = mnl_socket_open(NETLINK_NETFILTER); if (nl == NULL) { |