From 59e949294f4688bafe44b7def2972987224520c8 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Mon, 20 Jan 2014 10:26:57 +0100 Subject: rename library to libnftnl We plan to use this library name for the higher layer library. Signed-off-by: Pablo Neira Ayuso --- .gitignore | 2 +- Makefile.am | 2 +- configure.ac | 6 +- doxygen.cfg.in | 2 +- examples/Makefile.am | 52 +++++------ examples/nft-chain-add.c | 2 +- examples/nft-chain-del.c | 2 +- examples/nft-chain-get.c | 2 +- examples/nft-chain-json-add.c | 4 +- examples/nft-chain-xml-add.c | 4 +- examples/nft-events.c | 6 +- examples/nft-rule-add.c | 4 +- examples/nft-rule-del.c | 2 +- examples/nft-rule-get.c | 2 +- examples/nft-rule-insert.c | 4 +- examples/nft-rule-json-add.c | 2 +- examples/nft-rule-xml-add.c | 2 +- examples/nft-set-add.c | 4 +- examples/nft-set-del.c | 2 +- examples/nft-set-elem-add.c | 2 +- examples/nft-set-elem-del.c | 2 +- examples/nft-set-elem-get.c | 2 +- examples/nft-set-get.c | 2 +- examples/nft-set-json-add.c | 2 +- examples/nft-table-add.c | 2 +- examples/nft-table-del.c | 2 +- examples/nft-table-get.c | 2 +- examples/nft-table-json-add.c | 2 +- examples/nft-table-upd.c | 2 +- examples/nft-table-xml-add.c | 4 +- include/Makefile.am | 2 +- include/libnftables/Makefile.am | 7 -- include/libnftables/chain.h | 85 ----------------- include/libnftables/common.h | 31 ------- include/libnftables/expr.h | 150 ------------------------------ include/libnftables/rule.h | 91 ------------------ include/libnftables/ruleset.h | 44 --------- include/libnftables/set.h | 119 ------------------------ include/libnftables/table.h | 73 --------------- include/libnftnl/Makefile.am | 7 ++ include/libnftnl/chain.h | 85 +++++++++++++++++ include/libnftnl/common.h | 31 +++++++ include/libnftnl/expr.h | 150 ++++++++++++++++++++++++++++++ include/libnftnl/rule.h | 91 ++++++++++++++++++ include/libnftnl/ruleset.h | 44 +++++++++ include/libnftnl/set.h | 119 ++++++++++++++++++++++++ include/libnftnl/table.h | 73 +++++++++++++++ libnftables.pc.in | 15 --- libnftnl.pc.in | 15 +++ src/Makefile.am | 74 +++++++-------- src/chain.c | 2 +- src/common.c | 2 +- src/expr.c | 2 +- src/expr/bitwise.c | 4 +- src/expr/byteorder.c | 4 +- src/expr/cmp.c | 4 +- src/expr/counter.c | 4 +- src/expr/ct.c | 4 +- src/expr/data_reg.c | 4 +- src/expr/exthdr.c | 4 +- src/expr/immediate.c | 4 +- src/expr/limit.c | 4 +- src/expr/log.c | 4 +- src/expr/lookup.c | 4 +- src/expr/match.c | 4 +- src/expr/meta.c | 4 +- src/expr/nat.c | 4 +- src/expr/payload.c | 4 +- src/expr/reject.c | 4 +- src/expr/target.c | 4 +- src/internal.h | 2 +- src/jansson.c | 4 +- src/libnftables.map | 198 ---------------------------------------- src/libnftnl.map | 198 ++++++++++++++++++++++++++++++++++++++++ src/mxml.c | 10 +- src/rule.c | 4 +- src/ruleset.c | 10 +- src/set.c | 2 +- src/set_elem.c | 4 +- src/table.c | 2 +- tests/Makefile.am | 42 ++++----- tests/nft-chain-test.c | 2 +- tests/nft-expr_bitwise-test.c | 4 +- tests/nft-expr_byteorder-test.c | 4 +- tests/nft-expr_cmp-test.c | 4 +- tests/nft-expr_counter-test.c | 4 +- tests/nft-expr_ct-test.c | 4 +- tests/nft-expr_exthdr-test.c | 4 +- tests/nft-expr_immediate-test.c | 4 +- tests/nft-expr_limit-test.c | 4 +- tests/nft-expr_log-test.c | 4 +- tests/nft-expr_lookup-test.c | 4 +- tests/nft-expr_match-test.c | 4 +- tests/nft-expr_meta-test.c | 4 +- tests/nft-expr_nat-test.c | 4 +- tests/nft-expr_payload-test.c | 4 +- tests/nft-expr_reject-test.c | 4 +- tests/nft-expr_target-test.c | 4 +- tests/nft-parsing-test.c | 10 +- tests/nft-rule-test.c | 2 +- tests/nft-set-test.c | 2 +- tests/nft-table-test.c | 2 +- 102 files changed, 1034 insertions(+), 1034 deletions(-) delete mode 100644 include/libnftables/Makefile.am delete mode 100644 include/libnftables/chain.h delete mode 100644 include/libnftables/common.h delete mode 100644 include/libnftables/expr.h delete mode 100644 include/libnftables/rule.h delete mode 100644 include/libnftables/ruleset.h delete mode 100644 include/libnftables/set.h delete mode 100644 include/libnftables/table.h create mode 100644 include/libnftnl/Makefile.am create mode 100644 include/libnftnl/chain.h create mode 100644 include/libnftnl/common.h create mode 100644 include/libnftnl/expr.h create mode 100644 include/libnftnl/rule.h create mode 100644 include/libnftnl/ruleset.h create mode 100644 include/libnftnl/set.h create mode 100644 include/libnftnl/table.h delete mode 100644 libnftables.pc.in create mode 100644 libnftnl.pc.in delete mode 100644 src/libnftables.map create mode 100644 src/libnftnl.map diff --git a/.gitignore b/.gitignore index d8a55bf..5fada45 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,7 @@ configure autom4te.cache stamp-h1 aclocal.m4 -libnftables.pc +libnftnl.pc libtool build-aux doxygen.cfg diff --git a/Makefile.am b/Makefile.am index 83f176d..4163829 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,4 +6,4 @@ SUBDIRS = src include examples tests DIST_SUBDIRS = src include examples tests pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libnftables.pc +pkgconfig_DATA = libnftnl.pc diff --git a/configure.ac b/configure.ac index 6219737..54c66fe 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to create configure. -AC_INIT([libnftables], [1.0.0]) +AC_INIT([libnftnl], [1.0.0]) AC_CONFIG_AUX_DIR([build-aux]) AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) @@ -50,10 +50,10 @@ regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \ -Wformat=2 -pipe" AC_SUBST([regular_CPPFLAGS]) AC_SUBST([regular_CFLAGS]) -AC_CONFIG_FILES([Makefile src/Makefile include/Makefile include/libnftables/Makefile include/linux/Makefile include/linux/netfilter/Makefile examples/Makefile tests/Makefile libnftables.pc doxygen.cfg]) +AC_CONFIG_FILES([Makefile src/Makefile include/Makefile include/libnftnl/Makefile include/linux/Makefile include/linux/netfilter/Makefile examples/Makefile tests/Makefile libnftnl.pc doxygen.cfg]) AC_OUTPUT echo " -libnftables configuration: +libnftnl configuration: XML support: ${with_xml_parsing} JSON support: ${with_json_parsing}" diff --git a/doxygen.cfg.in b/doxygen.cfg.in index 9582600..85e8d36 100644 --- a/doxygen.cfg.in +++ b/doxygen.cfg.in @@ -67,7 +67,7 @@ WARN_FORMAT = "$file:$line: $text" WARN_LOGFILE = INPUT = . INPUT_ENCODING = UTF-8 -FILE_PATTERNS = *.c libnftables.h +FILE_PATTERNS = *.c libnftnl.h RECURSIVE = YES EXCLUDE = EXCLUDE_SYMLINKS = NO diff --git a/examples/Makefile.am b/examples/Makefile.am index 9965387..13b7e79 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -28,79 +28,79 @@ check_PROGRAMS = nft-table-add \ nft-compat-get nft_table_add_SOURCES = nft-table-add.c -nft_table_add_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +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/libnftables.la ${LIBMNL_LIBS} +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/libnftables.la ${LIBMNL_LIBS} +nft_table_json_add_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_table_upd_SOURCES = nft-table-upd.c -nft_table_upd_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_table_upd_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_table_del_SOURCES = nft-table-del.c -nft_table_del_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_table_del_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_table_get_SOURCES = nft-table-get.c -nft_table_get_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_table_get_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_chain_add_SOURCES = nft-chain-add.c -nft_chain_add_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_chain_add_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_chain_xml_add_SOURCES = nft-chain-xml-add.c -nft_chain_xml_add_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_chain_xml_add_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_chain_json_add_SOURCES = nft-chain-json-add.c -nft_chain_json_add_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} ${LIBXML_LIBS} ${LIBJSON_LIBS} +nft_chain_json_add_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} ${LIBXML_LIBS} ${LIBJSON_LIBS} nft_chain_del_SOURCES = nft-chain-del.c -nft_chain_del_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_chain_del_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_chain_get_SOURCES = nft-chain-get.c -nft_chain_get_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_chain_get_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_rule_add_SOURCES = nft-rule-add.c -nft_rule_add_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_rule_add_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_rule_insert_SOURCES = nft-rule-insert.c -nft_rule_insert_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} ${LIBXML_LIBS} +nft_rule_insert_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} ${LIBXML_LIBS} nft_rule_xml_add_SOURCES = nft-rule-xml-add.c -nft_rule_xml_add_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_rule_xml_add_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_rule_json_add_SOURCES = nft-rule-json-add.c -nft_rule_json_add_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_rule_json_add_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_rule_del_SOURCES = nft-rule-del.c -nft_rule_del_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_rule_del_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_rule_get_SOURCES = nft-rule-get.c -nft_rule_get_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_rule_get_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_events_SOURCES = nft-events.c -nft_events_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_events_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_set_add_SOURCES = nft-set-add.c -nft_set_add_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +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/libnftables.la ${LIBMNL_LIBS} +nft_set_json_add_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_set_del_SOURCES = nft-set-del.c -nft_set_del_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_set_del_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_set_get_SOURCES = nft-set-get.c -nft_set_get_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_set_get_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_set_elem_add_SOURCES = nft-set-elem-add.c -nft_set_elem_add_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_set_elem_add_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_set_elem_del_SOURCES = nft-set-elem-del.c -nft_set_elem_del_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_set_elem_del_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_set_elem_get_SOURCES = nft-set-elem-get.c -nft_set_elem_get_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_set_elem_get_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_compat_get_SOURCES = nft-compat-get.c -nft_compat_get_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_compat_get_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} diff --git a/examples/nft-chain-add.c b/examples/nft-chain-add.c index 22f9f3b..3edff86 100644 --- a/examples/nft-chain-add.c +++ b/examples/nft-chain-add.c @@ -18,7 +18,7 @@ #include #include -#include +#include int main(int argc, char *argv[]) { diff --git a/examples/nft-chain-del.c b/examples/nft-chain-del.c index 95a1a7f..c87ab92 100644 --- a/examples/nft-chain-del.c +++ b/examples/nft-chain-del.c @@ -18,7 +18,7 @@ #include #include -#include +#include int main(int argc, char *argv[]) { diff --git a/examples/nft-chain-get.c b/examples/nft-chain-get.c index 7e162f6..76fa5d9 100644 --- a/examples/nft-chain-get.c +++ b/examples/nft-chain-get.c @@ -18,7 +18,7 @@ #include #include -#include +#include static int table_cb(const struct nlmsghdr *nlh, void *data) { diff --git a/examples/nft-chain-json-add.c b/examples/nft-chain-json-add.c index 1802fb0..4fd0551 100644 --- a/examples/nft-chain-json-add.c +++ b/examples/nft-chain-json-add.c @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include int main(int argc, char *argv[]) { diff --git a/examples/nft-chain-xml-add.c b/examples/nft-chain-xml-add.c index 79b1541..5d26af6 100644 --- a/examples/nft-chain-xml-add.c +++ b/examples/nft-chain-xml-add.c @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include int main(int argc, char *argv[]) { diff --git a/examples/nft-events.c b/examples/nft-events.c index 29cb659..150346a 100644 --- a/examples/nft-events.c +++ b/examples/nft-events.c @@ -18,9 +18,9 @@ #include #include -#include -#include -#include +#include +#include +#include static int table_cb(const struct nlmsghdr *nlh, int type) { diff --git a/examples/nft-rule-add.c b/examples/nft-rule-add.c index 0534fa5..dbe93f5 100644 --- a/examples/nft-rule-add.c +++ b/examples/nft-rule-add.c @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include static void add_payload(struct nft_rule *r, uint32_t base, uint32_t dreg, uint32_t offset, uint32_t len) diff --git a/examples/nft-rule-del.c b/examples/nft-rule-del.c index c2b1a70..6f665b0 100644 --- a/examples/nft-rule-del.c +++ b/examples/nft-rule-del.c @@ -19,7 +19,7 @@ #include #include -#include +#include int main(int argc, char *argv[]) { diff --git a/examples/nft-rule-get.c b/examples/nft-rule-get.c index f17630b..5803143 100644 --- a/examples/nft-rule-get.c +++ b/examples/nft-rule-get.c @@ -18,7 +18,7 @@ #include #include -#include +#include static int table_cb(const struct nlmsghdr *nlh, void *data) { diff --git a/examples/nft-rule-insert.c b/examples/nft-rule-insert.c index 1418127..1b377de 100644 --- a/examples/nft-rule-insert.c +++ b/examples/nft-rule-insert.c @@ -20,8 +20,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/examples/nft-rule-json-add.c b/examples/nft-rule-json-add.c index de1fb54..b33025b 100644 --- a/examples/nft-rule-json-add.c +++ b/examples/nft-rule-json-add.c @@ -25,7 +25,7 @@ #include #include -#include +#include int main(int argc, char *argv[]) { diff --git a/examples/nft-rule-xml-add.c b/examples/nft-rule-xml-add.c index 8a7685d..dd16922 100644 --- a/examples/nft-rule-xml-add.c +++ b/examples/nft-rule-xml-add.c @@ -25,7 +25,7 @@ #include #include -#include +#include int main(int argc, char *argv[]) { diff --git a/examples/nft-set-add.c b/examples/nft-set-add.c index 0d17c38..4e54c39 100644 --- a/examples/nft-set-add.c +++ b/examples/nft-set-add.c @@ -18,8 +18,8 @@ #include #include -#include -#include +#include +#include int main(int argc, char *argv[]) { diff --git a/examples/nft-set-del.c b/examples/nft-set-del.c index 7828ae0..5abd3b1 100644 --- a/examples/nft-set-del.c +++ b/examples/nft-set-del.c @@ -18,7 +18,7 @@ #include #include -#include +#include int main(int argc, char *argv[]) { diff --git a/examples/nft-set-elem-add.c b/examples/nft-set-elem-add.c index e2e278d..ffc025c 100644 --- a/examples/nft-set-elem-add.c +++ b/examples/nft-set-elem-add.c @@ -18,7 +18,7 @@ #include #include -#include +#include int main(int argc, char *argv[]) { diff --git a/examples/nft-set-elem-del.c b/examples/nft-set-elem-del.c index 36f1016..af70cde 100644 --- a/examples/nft-set-elem-del.c +++ b/examples/nft-set-elem-del.c @@ -18,7 +18,7 @@ #include #include -#include +#include int main(int argc, char *argv[]) { diff --git a/examples/nft-set-elem-get.c b/examples/nft-set-elem-get.c index 0b46f36..6908c2a 100644 --- a/examples/nft-set-elem-get.c +++ b/examples/nft-set-elem-get.c @@ -18,7 +18,7 @@ #include #include -#include +#include static int set_cb(const struct nlmsghdr *nlh, void *data) { diff --git a/examples/nft-set-get.c b/examples/nft-set-get.c index 6762032..7a94506 100644 --- a/examples/nft-set-get.c +++ b/examples/nft-set-get.c @@ -18,7 +18,7 @@ #include #include -#include +#include static int set_cb(const struct nlmsghdr *nlh, void *data) { diff --git a/examples/nft-set-json-add.c b/examples/nft-set-json-add.c index 9553ebf..a4535da 100644 --- a/examples/nft-set-json-add.c +++ b/examples/nft-set-json-add.c @@ -25,7 +25,7 @@ #include #include -#include +#include int main(int argc, char *argv[]) { diff --git a/examples/nft-table-add.c b/examples/nft-table-add.c index e4d7db9..3b7572f 100644 --- a/examples/nft-table-add.c +++ b/examples/nft-table-add.c @@ -18,7 +18,7 @@ #include #include -#include +#include int main(int argc, char *argv[]) { diff --git a/examples/nft-table-del.c b/examples/nft-table-del.c index 11762fe..ed1140d 100644 --- a/examples/nft-table-del.c +++ b/examples/nft-table-del.c @@ -18,7 +18,7 @@ #include #include -#include +#include int main(int argc, char *argv[]) { diff --git a/examples/nft-table-get.c b/examples/nft-table-get.c index c5bc89d..6ac56d6 100644 --- a/examples/nft-table-get.c +++ b/examples/nft-table-get.c @@ -18,7 +18,7 @@ #include #include -#include +#include static int table_cb(const struct nlmsghdr *nlh, void *data) { diff --git a/examples/nft-table-json-add.c b/examples/nft-table-json-add.c index f3a57c0..a9bd217 100644 --- a/examples/nft-table-json-add.c +++ b/examples/nft-table-json-add.c @@ -26,7 +26,7 @@ #include #include -#include +#include int main(int argc, char *argv[]) { diff --git a/examples/nft-table-upd.c b/examples/nft-table-upd.c index 1cf41a4..9f0e809 100644 --- a/examples/nft-table-upd.c +++ b/examples/nft-table-upd.c @@ -18,7 +18,7 @@ #include #include -#include +#include int main(int argc, char *argv[]) { diff --git a/examples/nft-table-xml-add.c b/examples/nft-table-xml-add.c index edef1d4..f36f0ab 100644 --- a/examples/nft-table-xml-add.c +++ b/examples/nft-table-xml-add.c @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include int main(int argc, char *argv[]) { diff --git a/include/Makefile.am b/include/Makefile.am index 10332b7..5976bbd 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = libnftables linux +SUBDIRS = libnftnl linux noinst_HEADERS = linux_list.h diff --git a/include/libnftables/Makefile.am b/include/libnftables/Makefile.am deleted file mode 100644 index a0841d2..0000000 --- a/include/libnftables/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -pkginclude_HEADERS = table.h \ - chain.h \ - rule.h \ - expr.h \ - set.h \ - ruleset.h \ - common.h diff --git a/include/libnftables/chain.h b/include/libnftables/chain.h deleted file mode 100644 index d213bf1..0000000 --- a/include/libnftables/chain.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef _LIBNFTABLES_CHAIN_H_ -#define _LIBNFTABLES_CHAIN_H_ - -#include -#include -#include -#include - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -struct nft_chain; - -struct nft_chain *nft_chain_alloc(void); -void nft_chain_free(struct nft_chain *); - -enum { - NFT_CHAIN_ATTR_NAME = 0, - NFT_CHAIN_ATTR_FAMILY, - NFT_CHAIN_ATTR_TABLE, - NFT_CHAIN_ATTR_HOOKNUM, - NFT_CHAIN_ATTR_PRIO = 4, - NFT_CHAIN_ATTR_POLICY, - NFT_CHAIN_ATTR_USE, - NFT_CHAIN_ATTR_BYTES, - NFT_CHAIN_ATTR_PACKETS = 8, - NFT_CHAIN_ATTR_HANDLE, - NFT_CHAIN_ATTR_TYPE, -}; - -bool nft_chain_attr_is_set(const struct nft_chain *c, uint16_t attr); -void nft_chain_attr_unset(struct nft_chain *c, uint16_t attr); -void nft_chain_attr_set(struct nft_chain *t, uint16_t attr, const void *data); -void nft_chain_attr_set_u8(struct nft_chain *t, uint16_t attr, uint8_t data); -void nft_chain_attr_set_u32(struct nft_chain *t, uint16_t attr, uint32_t data); -void nft_chain_attr_set_s32(struct nft_chain *t, uint16_t attr, int32_t data); -void nft_chain_attr_set_u64(struct nft_chain *t, uint16_t attr, uint64_t data); -void nft_chain_attr_set_str(struct nft_chain *t, uint16_t attr, const char *str); - -const void *nft_chain_attr_get(struct nft_chain *c, uint16_t attr); -const char *nft_chain_attr_get_str(struct nft_chain *c, uint16_t attr); -uint8_t nft_chain_attr_get_u8(struct nft_chain *c, uint16_t attr); -uint32_t nft_chain_attr_get_u32(struct nft_chain *c, uint16_t attr); -int32_t nft_chain_attr_get_s32(struct nft_chain *c, uint16_t attr); -uint64_t nft_chain_attr_get_u64(struct nft_chain *c, uint16_t attr); - -struct nlmsghdr; - -void nft_chain_nlmsg_build_payload(struct nlmsghdr *nlh, const struct nft_chain *t); - -int nft_chain_parse(struct nft_chain *c, enum nft_parse_type type, - const char *data, struct nft_parse_err *err); -int nft_chain_parse_file(struct nft_chain *c, enum nft_parse_type type, - FILE *fp, struct nft_parse_err *err); -int nft_chain_snprintf(char *buf, size_t size, struct nft_chain *t, uint32_t type, uint32_t flags); -int nft_chain_fprintf(FILE *fp, struct nft_chain *c, uint32_t type, uint32_t flags); - -#define nft_chain_nlmsg_build_hdr nft_nlmsg_build_hdr -int nft_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_chain *t); - -struct nft_chain_list; - -struct nft_chain_list *nft_chain_list_alloc(void); -void nft_chain_list_free(struct nft_chain_list *list); -int nft_chain_list_is_empty(struct nft_chain_list *list); -int nft_chain_list_foreach(struct nft_chain_list *chain_list, int (*cb)(struct nft_chain *t, void *data), void *data); - -void nft_chain_list_add(struct nft_chain *r, struct nft_chain_list *list); -void nft_chain_list_add_tail(struct nft_chain *r, struct nft_chain_list *list); -void nft_chain_list_del(struct nft_chain *c); - -struct nft_chain_list_iter; - -struct nft_chain_list_iter *nft_chain_list_iter_create(struct nft_chain_list *l); -struct nft_chain *nft_chain_list_iter_next(struct nft_chain_list_iter *iter); -void nft_chain_list_iter_destroy(struct nft_chain_list_iter *iter); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* _LIBNFTABLES_CHAIN_H_ */ diff --git a/include/libnftables/common.h b/include/libnftables/common.h deleted file mode 100644 index 1ef88ba..0000000 --- a/include/libnftables/common.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef _LIBNFTABLES_COMMON_H_ -#define _LIBNFTABLES_COMMON_H_ - -enum { - NFT_PARSE_EBADINPUT = 0, - NFT_PARSE_EMISSINGNODE, - NFT_PARSE_EBADTYPE, -}; - -enum nft_output_type { - NFT_OUTPUT_DEFAULT = 0, - NFT_OUTPUT_XML, - NFT_OUTPUT_JSON, -}; - -enum nft_parse_type { - NFT_PARSE_NONE = 0, - NFT_PARSE_XML, - NFT_PARSE_JSON, - NFT_PARSE_MAX, -}; - -struct nft_parse_err; - -struct nlmsghdr *nft_nlmsg_build_hdr(char *buf, uint16_t cmd, uint16_t family, - uint16_t type, uint32_t seq); - -struct nft_parse_err *nft_parse_err_alloc(void); -void nft_parse_err_free(struct nft_parse_err *); -int nft_parse_perror(const char *str, struct nft_parse_err *err); -#endif diff --git a/include/libnftables/expr.h b/include/libnftables/expr.h deleted file mode 100644 index 54de186..0000000 --- a/include/libnftables/expr.h +++ /dev/null @@ -1,150 +0,0 @@ -#ifndef _LIBNFTABLES_RULE_EXPR_H_ -#define _LIBNFTABLES_RULE_EXPR_H_ - -#include -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -struct nft_rule_expr; - -enum { - NFT_RULE_EXPR_ATTR_NAME = 0, - NFT_RULE_EXPR_ATTR_BASE, -}; - -struct nft_rule_expr *nft_rule_expr_alloc(const char *name); -void nft_rule_expr_free(struct nft_rule_expr *expr); - -bool nft_rule_expr_is_set(const struct nft_rule_expr *expr, uint16_t type); -void nft_rule_expr_set(struct nft_rule_expr *expr, uint16_t type, const void *data, uint32_t data_len); -void nft_rule_expr_set_u8(struct nft_rule_expr *expr, uint16_t type, uint8_t data); -void nft_rule_expr_set_u16(struct nft_rule_expr *expr, uint16_t type, uint16_t data); -void nft_rule_expr_set_u32(struct nft_rule_expr *expr, uint16_t type, uint32_t data); -void nft_rule_expr_set_u64(struct nft_rule_expr *expr, uint16_t type, uint64_t data); -void nft_rule_expr_set_str(struct nft_rule_expr *expr, uint16_t type, const char *str); - -const void *nft_rule_expr_get(const struct nft_rule_expr *expr, uint16_t type, uint32_t *data_len); -uint8_t nft_rule_expr_get_u8(const struct nft_rule_expr *expr, uint16_t type); -uint16_t nft_rule_expr_get_u16(const struct nft_rule_expr *expr, uint16_t type); -uint32_t nft_rule_expr_get_u32(const struct nft_rule_expr *expr, uint16_t type); -uint64_t nft_rule_expr_get_u64(const struct nft_rule_expr *expr, uint16_t type); -const char *nft_rule_expr_get_str(const struct nft_rule_expr *expr, uint16_t type); - -struct nlmsghdr; - -void nft_rule_expr_build_payload(struct nlmsghdr *nlh, struct nft_rule_expr *expr); - -int nft_rule_expr_snprintf(char *buf, size_t buflen, struct nft_rule_expr *expr, uint32_t type, uint32_t flags); - -enum { - NFT_EXPR_PAYLOAD_DREG = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_PAYLOAD_BASE, - NFT_EXPR_PAYLOAD_OFFSET, - NFT_EXPR_PAYLOAD_LEN, -}; - -enum { - NFT_EXPR_META_KEY = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_META_DREG, -}; - -enum { - NFT_EXPR_CMP_SREG = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_CMP_OP, - NFT_EXPR_CMP_DATA, -}; - -enum { - NFT_EXPR_IMM_DREG = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_IMM_DATA, - NFT_EXPR_IMM_VERDICT, - NFT_EXPR_IMM_CHAIN, -}; - -enum { - NFT_EXPR_CTR_PACKETS = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_CTR_BYTES, -}; - -enum { - NFT_EXPR_BITWISE_SREG = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_BITWISE_DREG, - NFT_EXPR_BITWISE_LEN, - NFT_EXPR_BITWISE_MASK, - NFT_EXPR_BITWISE_XOR, -}; - -enum { - NFT_EXPR_TG_NAME = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_TG_REV, - NFT_EXPR_TG_INFO, -}; - -enum { - NFT_EXPR_MT_NAME = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_MT_REV, - NFT_EXPR_MT_INFO, -}; - -enum { - NFT_EXPR_NAT_TYPE = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_NAT_FAMILY, - NFT_EXPR_NAT_REG_ADDR_MIN, - NFT_EXPR_NAT_REG_ADDR_MAX, - NFT_EXPR_NAT_REG_PROTO_MIN, - NFT_EXPR_NAT_REG_PROTO_MAX, -}; - -enum { - NFT_EXPR_LOOKUP_SREG = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_LOOKUP_DREG, - NFT_EXPR_LOOKUP_SET, -}; - -enum { - NFT_EXPR_LOG_PREFIX = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_LOG_GROUP, - NFT_EXPR_LOG_SNAPLEN, - NFT_EXPR_LOG_QTHRESHOLD, -}; - -enum { - NFT_EXPR_EXTHDR_DREG = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_EXTHDR_TYPE, - NFT_EXPR_EXTHDR_OFFSET, - NFT_EXPR_EXTHDR_LEN, -}; - -enum { - NFT_EXPR_CT_DREG = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_CT_KEY, - NFT_EXPR_CT_DIR, -}; - -enum { - NFT_EXPR_BYTEORDER_DREG = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_BYTEORDER_SREG, - NFT_EXPR_BYTEORDER_OP, - NFT_EXPR_BYTEORDER_LEN, - NFT_EXPR_BYTEORDER_SIZE, -}; - -enum { - NFT_EXPR_LIMIT_RATE = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_LIMIT_UNIT, -}; - -enum { - NFT_EXPR_REJECT_TYPE = NFT_RULE_EXPR_ATTR_BASE, - NFT_EXPR_REJECT_CODE, -}; - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* _LIBNFTABLES_RULE_EXPR_H_ */ diff --git a/include/libnftables/rule.h b/include/libnftables/rule.h deleted file mode 100644 index 48b9974..0000000 --- a/include/libnftables/rule.h +++ /dev/null @@ -1,91 +0,0 @@ -#ifndef _LIBNFTABLES_RULE_H_ -#define _LIBNFTABLES_RULE_H_ - -#include -#include -#include -#include - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -struct nft_rule; -struct nft_rule_expr; - -struct nft_rule *nft_rule_alloc(void); -void nft_rule_free(struct nft_rule *); - -enum { - NFT_RULE_ATTR_FAMILY = 0, - NFT_RULE_ATTR_TABLE, - NFT_RULE_ATTR_CHAIN, - NFT_RULE_ATTR_HANDLE, - NFT_RULE_ATTR_COMPAT_PROTO, - NFT_RULE_ATTR_COMPAT_FLAGS, - NFT_RULE_ATTR_POSITION, -}; - -void nft_rule_attr_unset(struct nft_rule *r, uint16_t attr); -bool nft_rule_attr_is_set(const struct nft_rule *r, uint16_t attr); -void nft_rule_attr_set(struct nft_rule *r, uint16_t attr, const void *data); -void nft_rule_attr_set_u32(struct nft_rule *r, uint16_t attr, uint32_t val); -void nft_rule_attr_set_u64(struct nft_rule *r, uint16_t attr, uint64_t val); -void nft_rule_attr_set_str(struct nft_rule *r, uint16_t attr, const char *str); - -const void *nft_rule_attr_get(const struct nft_rule *r, uint16_t attr); -const char *nft_rule_attr_get_str(const struct nft_rule *r, uint16_t attr); -uint8_t nft_rule_attr_get_u8(const struct nft_rule *r, uint16_t attr); -uint32_t nft_rule_attr_get_u32(const struct nft_rule *r, uint16_t attr); -uint64_t nft_rule_attr_get_u64(const struct nft_rule *r, uint16_t attr); - -void nft_rule_add_expr(struct nft_rule *r, struct nft_rule_expr *expr); - -struct nlmsghdr; - -void nft_rule_nlmsg_build_payload(struct nlmsghdr *nlh, struct nft_rule *t); - -int nft_rule_parse(struct nft_rule *r, enum nft_parse_type type, - const char *data, struct nft_parse_err *err); -int nft_rule_parse_file(struct nft_rule *r, enum nft_parse_type type, - FILE *fp, struct nft_parse_err *err); -int nft_rule_snprintf(char *buf, size_t size, struct nft_rule *t, uint32_t type, uint32_t flags); -int nft_rule_fprintf(FILE *fp, struct nft_rule *r, uint32_t type, uint32_t flags); - -#define nft_rule_nlmsg_build_hdr nft_nlmsg_build_hdr -int nft_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_rule *t); - -int nft_rule_expr_foreach(struct nft_rule *r, - int (*cb)(struct nft_rule_expr *e, void *data), - void *data); - -struct nft_rule_expr_iter; - -struct nft_rule_expr_iter *nft_rule_expr_iter_create(struct nft_rule *r); -struct nft_rule_expr *nft_rule_expr_iter_next(struct nft_rule_expr_iter *iter); -void nft_rule_expr_iter_destroy(struct nft_rule_expr_iter *iter); - -struct nft_rule_list; - -struct nft_rule_list *nft_rule_list_alloc(void); -void nft_rule_list_free(struct nft_rule_list *list); -int nft_rule_list_is_empty(struct nft_rule_list *list); -void nft_rule_list_add(struct nft_rule *r, struct nft_rule_list *list); -void nft_rule_list_add_tail(struct nft_rule *r, struct nft_rule_list *list); -void nft_rule_list_del(struct nft_rule *r); -int nft_rule_list_foreach(struct nft_rule_list *rule_list, int (*cb)(struct nft_rule *t, void *data), void *data); - -struct nft_rule_list_iter; - -struct nft_rule_list_iter *nft_rule_list_iter_create(struct nft_rule_list *l); -struct nft_rule *nft_rule_list_iter_cur(struct nft_rule_list_iter *iter); -struct nft_rule *nft_rule_list_iter_next(struct nft_rule_list_iter *iter); -void nft_rule_list_iter_destroy(struct nft_rule_list_iter *iter); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* _LIBNFTABLES_RULE_H_ */ diff --git a/include/libnftables/ruleset.h b/include/libnftables/ruleset.h deleted file mode 100644 index f916fba..0000000 --- a/include/libnftables/ruleset.h +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef _LIBNFTABLES_RULESET_H_ -#define _LIBNFTABLES_RULESET_H_ - -#include - -#include -#include -#include - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -struct nft_ruleset; - -struct nft_ruleset *nft_ruleset_alloc(void); -void nft_ruleset_free(struct nft_ruleset *r); - -enum { - NFT_RULESET_ATTR_TABLELIST = 0, - NFT_RULESET_ATTR_CHAINLIST, - NFT_RULESET_ATTR_SETLIST, - NFT_RULESET_ATTR_RULELIST, -}; - -bool nft_ruleset_attr_is_set(const struct nft_ruleset *r, uint16_t attr); -void nft_ruleset_attr_unset(struct nft_ruleset *r, uint16_t attr); -void nft_ruleset_attr_set(struct nft_ruleset *r, uint16_t attr, void *data); -const void *nft_ruleset_attr_get(const struct nft_ruleset *r, uint16_t attr); - -int nft_ruleset_parse(struct nft_ruleset *rs, enum nft_parse_type type, - const char *data, struct nft_parse_err *err); -int nft_ruleset_parse_file(struct nft_ruleset *rs, enum nft_parse_type type, - FILE *fp, struct nft_parse_err *err); -int nft_ruleset_snprintf(char *buf, size_t size, const struct nft_ruleset *rs, uint32_t type, uint32_t flags); -int nft_ruleset_fprintf(FILE *fp, const struct nft_ruleset *rs, uint32_t type, uint32_t flags); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* _LIBNFTABLES_RULESET_H_ */ diff --git a/include/libnftables/set.h b/include/libnftables/set.h deleted file mode 100644 index c4b1ff6..0000000 --- a/include/libnftables/set.h +++ /dev/null @@ -1,119 +0,0 @@ -#ifndef _LIBNFTABLES_SET_H_ -#define _LIBNFTABLES_SET_H_ - -#include -#include -#include -#include - -#include - -enum { - NFT_SET_ATTR_TABLE, - NFT_SET_ATTR_NAME, - NFT_SET_ATTR_FLAGS, - NFT_SET_ATTR_KEY_TYPE, - NFT_SET_ATTR_KEY_LEN, - NFT_SET_ATTR_DATA_TYPE, - NFT_SET_ATTR_DATA_LEN, - NFT_SET_ATTR_FAMILY, -}; - -struct nft_set; - -struct nft_set *nft_set_alloc(void); -void nft_set_free(struct nft_set *s); - -bool nft_set_attr_is_set(const struct nft_set *s, uint16_t attr); -void nft_set_attr_unset(struct nft_set *s, uint16_t attr); -void nft_set_attr_set(struct nft_set *s, uint16_t attr, const void *data); -void nft_set_attr_set_u32(struct nft_set *s, uint16_t attr, uint32_t val); -void nft_set_attr_set_str(struct nft_set *s, uint16_t attr, const char *str); - -const void *nft_set_attr_get(struct nft_set *s, uint16_t attr); -const char *nft_set_attr_get_str(struct nft_set *s, uint16_t attr); -uint32_t nft_set_attr_get_u32(struct nft_set *s, uint16_t attr); - -struct nlmsghdr; - -#define nft_set_nlmsg_build_hdr nft_nlmsg_build_hdr -void nft_set_nlmsg_build_payload(struct nlmsghdr *nlh, struct nft_set *s); -int nft_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_set *s); -int nft_set_elems_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_set *s); - -int nft_set_snprintf(char *buf, size_t size, struct nft_set *s, uint32_t type, uint32_t flags); -int nft_set_fprintf(FILE *fp, struct nft_set *s, uint32_t type, uint32_t flags); - -struct nft_set_list; - -struct nft_set_list *nft_set_list_alloc(void); -void nft_set_list_free(struct nft_set_list *list); -int nft_set_list_is_empty(struct nft_set_list *list); -void nft_set_list_add(struct nft_set *s, struct nft_set_list *list); -void nft_set_list_add_tail(struct nft_set *s, struct nft_set_list *list); -void nft_set_list_del(struct nft_set *s); -int nft_set_list_foreach(struct nft_set_list *set_list, int (*cb)(struct nft_set *t, void *data), void *data); - -struct nft_set_list_iter; -struct nft_set_list_iter *nft_set_list_iter_create(struct nft_set_list *l); -struct nft_set *nft_set_list_iter_cur(struct nft_set_list_iter *iter); -struct nft_set *nft_set_list_iter_next(struct nft_set_list_iter *iter); -void nft_set_list_iter_destroy(struct nft_set_list_iter *iter); - -int nft_set_parse(struct nft_set *s, enum nft_parse_type type, - const char *data, struct nft_parse_err *err); -int nft_set_parse_file(struct nft_set *s, enum nft_parse_type type, - FILE *fp, struct nft_parse_err *err); - -/* - * Set elements - */ - -enum { - NFT_SET_ELEM_ATTR_FLAGS, - NFT_SET_ELEM_ATTR_KEY, - NFT_SET_ELEM_ATTR_VERDICT, - NFT_SET_ELEM_ATTR_CHAIN, - NFT_SET_ELEM_ATTR_DATA, -}; - -struct nft_set_elem; - -struct nft_set_elem *nft_set_elem_alloc(void); -void nft_set_elem_free(struct nft_set_elem *s); - -void nft_set_elem_add(struct nft_set *s, struct nft_set_elem *elem); - -void nft_set_elem_attr_unset(struct nft_set_elem *s, uint16_t attr); -void nft_set_elem_attr_set(struct nft_set_elem *s, uint16_t attr, const void *data, uint32_t data_len); -void nft_set_elem_attr_set_u32(struct nft_set_elem *s, uint16_t attr, uint32_t val); -void nft_set_elem_attr_set_str(struct nft_set_elem *s, uint16_t attr, const char *str); - -const void *nft_set_elem_attr_get(struct nft_set_elem *s, uint16_t attr, uint32_t *data_len); -const char *nft_set_elem_attr_get_str(struct nft_set_elem *s, uint16_t attr); -uint32_t nft_set_elem_attr_get_u32(struct nft_set_elem *s, uint16_t attr); - -bool nft_set_elem_attr_is_set(const struct nft_set_elem *s, uint16_t attr); - -#define nft_set_elem_nlmsg_build_hdr nft_nlmsg_build_hdr -void nft_set_elems_nlmsg_build_payload(struct nlmsghdr *nlh, struct nft_set *s); -void nft_set_elem_nlmsg_build_payload(struct nlmsghdr *nlh, struct nft_set_elem *e); - -int nft_set_elem_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_set_elem *s); - -int nft_set_elem_parse(struct nft_set_elem *e, enum nft_parse_type type, - const char *data, struct nft_parse_err *err); -int nft_set_elem_parse_file(struct nft_set_elem *e, enum nft_parse_type type, - FILE *fp, struct nft_parse_err *err); -int nft_set_elem_snprintf(char *buf, size_t size, struct nft_set_elem *s, uint32_t type, uint32_t flags); -int nft_set_elem_fprintf(FILE *fp, struct nft_set_elem *se, uint32_t type, uint32_t flags); - -int nft_set_elem_foreach(struct nft_set *s, int (*cb)(struct nft_set_elem *e, void *data), void *data); - -struct nft_set_elems_iter; -struct nft_set_elems_iter *nft_set_elems_iter_create(struct nft_set *s); -struct nft_set_elem *nft_set_elems_iter_cur(struct nft_set_elems_iter *iter); -struct nft_set_elem *nft_set_elems_iter_next(struct nft_set_elems_iter *iter); -void nft_set_elems_iter_destroy(struct nft_set_elems_iter *iter); - -#endif /* _LIBNFTABLES_SET_H_ */ diff --git a/include/libnftables/table.h b/include/libnftables/table.h deleted file mode 100644 index 64fbf88..0000000 --- a/include/libnftables/table.h +++ /dev/null @@ -1,73 +0,0 @@ -#ifndef _LIBNFTABLES_TABLE_H_ -#define _LIBNFTABLES_TABLE_H_ - -#include -#include -#include -#include - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -struct nft_table; - -struct nft_table *nft_table_alloc(void); -void nft_table_free(struct nft_table *); - -enum { - NFT_TABLE_ATTR_NAME = 0, - NFT_TABLE_ATTR_FAMILY, - NFT_TABLE_ATTR_FLAGS, -}; - -bool nft_table_attr_is_set(const struct nft_table *t, uint16_t attr); -void nft_table_attr_unset(struct nft_table *t, uint16_t attr); -void nft_table_attr_set(struct nft_table *t, uint16_t attr, const void *data); -const void *nft_table_attr_get(struct nft_table *t, uint16_t attr); - -void nft_table_attr_set_u8(struct nft_table *t, uint16_t attr, uint8_t data); -void nft_table_attr_set_u32(struct nft_table *t, uint16_t attr, uint32_t data); -void nft_table_attr_set_str(struct nft_table *t, uint16_t attr, const char *str); -uint8_t nft_table_attr_get_u8(struct nft_table *t, uint16_t attr); -uint32_t nft_table_attr_get_u32(struct nft_table *t, uint16_t attr); -const char *nft_table_attr_get_str(struct nft_table *t, uint16_t attr); - -struct nlmsghdr; - -void nft_table_nlmsg_build_payload(struct nlmsghdr *nlh, const struct nft_table *t); - -int nft_table_parse(struct nft_table *t, enum nft_parse_type type, - const char *data, struct nft_parse_err *err); -int nft_table_parse_file(struct nft_table *t, enum nft_parse_type type, - FILE *fp, struct nft_parse_err *err); -int nft_table_snprintf(char *buf, size_t size, struct nft_table *t, uint32_t type, uint32_t flags); -int nft_table_fprintf(FILE *fp, struct nft_table *t, uint32_t type, uint32_t flags); - -#define nft_table_nlmsg_build_hdr nft_nlmsg_build_hdr -int nft_table_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_table *t); - -struct nft_table_list; - -struct nft_table_list *nft_table_list_alloc(void); -void nft_table_list_free(struct nft_table_list *list); -int nft_table_list_is_empty(struct nft_table_list *list); -int nft_table_list_foreach(struct nft_table_list *table_list, int (*cb)(struct nft_table *t, void *data), void *data); - -void nft_table_list_add(struct nft_table *r, struct nft_table_list *list); -void nft_table_list_add_tail(struct nft_table *r, struct nft_table_list *list); -void nft_table_list_del(struct nft_table *r); - -struct nft_table_list_iter; - -struct nft_table_list_iter *nft_table_list_iter_create(struct nft_table_list *l); -struct nft_table *nft_table_list_iter_next(struct nft_table_list_iter *iter); -void nft_table_list_iter_destroy(struct nft_table_list_iter *iter); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* _LIBNFTABLES_TABLE_H_ */ diff --git a/include/libnftnl/Makefile.am b/include/libnftnl/Makefile.am new file mode 100644 index 0000000..a0841d2 --- /dev/null +++ b/include/libnftnl/Makefile.am @@ -0,0 +1,7 @@ +pkginclude_HEADERS = table.h \ + chain.h \ + rule.h \ + expr.h \ + set.h \ + ruleset.h \ + common.h diff --git a/include/libnftnl/chain.h b/include/libnftnl/chain.h new file mode 100644 index 0000000..66626d8 --- /dev/null +++ b/include/libnftnl/chain.h @@ -0,0 +1,85 @@ +#ifndef _LIBNFTNL_CHAIN_H_ +#define _LIBNFTNL_CHAIN_H_ + +#include +#include +#include +#include + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +struct nft_chain; + +struct nft_chain *nft_chain_alloc(void); +void nft_chain_free(struct nft_chain *); + +enum { + NFT_CHAIN_ATTR_NAME = 0, + NFT_CHAIN_ATTR_FAMILY, + NFT_CHAIN_ATTR_TABLE, + NFT_CHAIN_ATTR_HOOKNUM, + NFT_CHAIN_ATTR_PRIO = 4, + NFT_CHAIN_ATTR_POLICY, + NFT_CHAIN_ATTR_USE, + NFT_CHAIN_ATTR_BYTES, + NFT_CHAIN_ATTR_PACKETS = 8, + NFT_CHAIN_ATTR_HANDLE, + NFT_CHAIN_ATTR_TYPE, +}; + +bool nft_chain_attr_is_set(const struct nft_chain *c, uint16_t attr); +void nft_chain_attr_unset(struct nft_chain *c, uint16_t attr); +void nft_chain_attr_set(struct nft_chain *t, uint16_t attr, const void *data); +void nft_chain_attr_set_u8(struct nft_chain *t, uint16_t attr, uint8_t data); +void nft_chain_attr_set_u32(struct nft_chain *t, uint16_t attr, uint32_t data); +void nft_chain_attr_set_s32(struct nft_chain *t, uint16_t attr, int32_t data); +void nft_chain_attr_set_u64(struct nft_chain *t, uint16_t attr, uint64_t data); +void nft_chain_attr_set_str(struct nft_chain *t, uint16_t attr, const char *str); + +const void *nft_chain_attr_get(struct nft_chain *c, uint16_t attr); +const char *nft_chain_attr_get_str(struct nft_chain *c, uint16_t attr); +uint8_t nft_chain_attr_get_u8(struct nft_chain *c, uint16_t attr); +uint32_t nft_chain_attr_get_u32(struct nft_chain *c, uint16_t attr); +int32_t nft_chain_attr_get_s32(struct nft_chain *c, uint16_t attr); +uint64_t nft_chain_attr_get_u64(struct nft_chain *c, uint16_t attr); + +struct nlmsghdr; + +void nft_chain_nlmsg_build_payload(struct nlmsghdr *nlh, const struct nft_chain *t); + +int nft_chain_parse(struct nft_chain *c, enum nft_parse_type type, + const char *data, struct nft_parse_err *err); +int nft_chain_parse_file(struct nft_chain *c, enum nft_parse_type type, + FILE *fp, struct nft_parse_err *err); +int nft_chain_snprintf(char *buf, size_t size, struct nft_chain *t, uint32_t type, uint32_t flags); +int nft_chain_fprintf(FILE *fp, struct nft_chain *c, uint32_t type, uint32_t flags); + +#define nft_chain_nlmsg_build_hdr nft_nlmsg_build_hdr +int nft_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_chain *t); + +struct nft_chain_list; + +struct nft_chain_list *nft_chain_list_alloc(void); +void nft_chain_list_free(struct nft_chain_list *list); +int nft_chain_list_is_empty(struct nft_chain_list *list); +int nft_chain_list_foreach(struct nft_chain_list *chain_list, int (*cb)(struct nft_chain *t, void *data), void *data); + +void nft_chain_list_add(struct nft_chain *r, struct nft_chain_list *list); +void nft_chain_list_add_tail(struct nft_chain *r, struct nft_chain_list *list); +void nft_chain_list_del(struct nft_chain *c); + +struct nft_chain_list_iter; + +struct nft_chain_list_iter *nft_chain_list_iter_create(struct nft_chain_list *l); +struct nft_chain *nft_chain_list_iter_next(struct nft_chain_list_iter *iter); +void nft_chain_list_iter_destroy(struct nft_chain_list_iter *iter); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* _LIBNFTNL_CHAIN_H_ */ diff --git a/include/libnftnl/common.h b/include/libnftnl/common.h new file mode 100644 index 0000000..9d18b2b --- /dev/null +++ b/include/libnftnl/common.h @@ -0,0 +1,31 @@ +#ifndef _LIBNFTNL_COMMON_H_ +#define _LIBNFTNL_COMMON_H_ + +enum { + NFT_PARSE_EBADINPUT = 0, + NFT_PARSE_EMISSINGNODE, + NFT_PARSE_EBADTYPE, +}; + +enum nft_output_type { + NFT_OUTPUT_DEFAULT = 0, + NFT_OUTPUT_XML, + NFT_OUTPUT_JSON, +}; + +enum nft_parse_type { + NFT_PARSE_NONE = 0, + NFT_PARSE_XML, + NFT_PARSE_JSON, + NFT_PARSE_MAX, +}; + +struct nft_parse_err; + +struct nlmsghdr *nft_nlmsg_build_hdr(char *buf, uint16_t cmd, uint16_t family, + uint16_t type, uint32_t seq); + +struct nft_parse_err *nft_parse_err_alloc(void); +void nft_parse_err_free(struct nft_parse_err *); +int nft_parse_perror(const char *str, struct nft_parse_err *err); +#endif diff --git a/include/libnftnl/expr.h b/include/libnftnl/expr.h new file mode 100644 index 0000000..a2f44df --- /dev/null +++ b/include/libnftnl/expr.h @@ -0,0 +1,150 @@ +#ifndef _LIBNFTNL_RULE_EXPR_H_ +#define _LIBNFTNL_RULE_EXPR_H_ + +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +struct nft_rule_expr; + +enum { + NFT_RULE_EXPR_ATTR_NAME = 0, + NFT_RULE_EXPR_ATTR_BASE, +}; + +struct nft_rule_expr *nft_rule_expr_alloc(const char *name); +void nft_rule_expr_free(struct nft_rule_expr *expr); + +bool nft_rule_expr_is_set(const struct nft_rule_expr *expr, uint16_t type); +void nft_rule_expr_set(struct nft_rule_expr *expr, uint16_t type, const void *data, uint32_t data_len); +void nft_rule_expr_set_u8(struct nft_rule_expr *expr, uint16_t type, uint8_t data); +void nft_rule_expr_set_u16(struct nft_rule_expr *expr, uint16_t type, uint16_t data); +void nft_rule_expr_set_u32(struct nft_rule_expr *expr, uint16_t type, uint32_t data); +void nft_rule_expr_set_u64(struct nft_rule_expr *expr, uint16_t type, uint64_t data); +void nft_rule_expr_set_str(struct nft_rule_expr *expr, uint16_t type, const char *str); + +const void *nft_rule_expr_get(const struct nft_rule_expr *expr, uint16_t type, uint32_t *data_len); +uint8_t nft_rule_expr_get_u8(const struct nft_rule_expr *expr, uint16_t type); +uint16_t nft_rule_expr_get_u16(const struct nft_rule_expr *expr, uint16_t type); +uint32_t nft_rule_expr_get_u32(const struct nft_rule_expr *expr, uint16_t type); +uint64_t nft_rule_expr_get_u64(const struct nft_rule_expr *expr, uint16_t type); +const char *nft_rule_expr_get_str(const struct nft_rule_expr *expr, uint16_t type); + +struct nlmsghdr; + +void nft_rule_expr_build_payload(struct nlmsghdr *nlh, struct nft_rule_expr *expr); + +int nft_rule_expr_snprintf(char *buf, size_t buflen, struct nft_rule_expr *expr, uint32_t type, uint32_t flags); + +enum { + NFT_EXPR_PAYLOAD_DREG = NFT_RULE_EXPR_ATTR_BASE, + NFT_EXPR_PAYLOAD_BASE, + NFT_EXPR_PAYLOAD_OFFSET, + NFT_EXPR_PAYLOAD_LEN, +}; + +enum { + NFT_EXPR_META_KEY = NFT_RULE_EXPR_ATTR_BASE, + NFT_EXPR_META_DREG, +}; + +enum { + NFT_EXPR_CMP_SREG = NFT_RULE_EXPR_ATTR_BASE, + NFT_EXPR_CMP_OP, + NFT_EXPR_CMP_DATA, +}; + +enum { + NFT_EXPR_IMM_DREG = NFT_RULE_EXPR_ATTR_BASE, + NFT_EXPR_IMM_DATA, + NFT_EXPR_IMM_VERDICT, + NFT_EXPR_IMM_CHAIN, +}; + +enum { + NFT_EXPR_CTR_PACKETS = NFT_RULE_EXPR_ATTR_BASE, + NFT_EXPR_CTR_BYTES, +}; + +enum { + NFT_EXPR_BITWISE_SREG = NFT_RULE_EXPR_ATTR_BASE, + NFT_EXPR_BITWISE_DREG, + NFT_EXPR_BITWISE_LEN, + NFT_EXPR_BITWISE_MASK, + NFT_EXPR_BITWISE_XOR, +}; + +enum { + NFT_EXPR_TG_NAME = NFT_RULE_EXPR_ATTR_BASE, + NFT_EXPR_TG_REV, + NFT_EXPR_TG_INFO, +}; + +enum { + NFT_EXPR_MT_NAME = NFT_RULE_EXPR_ATTR_BASE, + NFT_EXPR_MT_REV, + NFT_EXPR_MT_INFO, +}; + +enum { + NFT_EXPR_NAT_TYPE = NFT_RULE_EXPR_ATTR_BASE, + NFT_EXPR_NAT_FAMILY, + NFT_EXPR_NAT_REG_ADDR_MIN, + NFT_EXPR_NAT_REG_ADDR_MAX, + NFT_EXPR_NAT_REG_PROTO_MIN, + NFT_EXPR_NAT_REG_PROTO_MAX, +}; + +enum { + NFT_EXPR_LOOKUP_SREG = NFT_RULE_EXPR_ATTR_BASE, + NFT_EXPR_LOOKUP_DREG, + NFT_EXPR_LOOKUP_SET, +}; + +enum { + NFT_EXPR_LOG_PREFIX = NFT_RULE_EXPR_ATTR_BASE, + NFT_EXPR_LOG_GROUP, + NFT_EXPR_LOG_SNAPLEN, + NFT_EXPR_LOG_QTHRESHOLD, +}; + +enum { + NFT_EXPR_EXTHDR_DREG = NFT_RULE_EXPR_ATTR_BASE, + NFT_EXPR_EXTHDR_TYPE, + NFT_EXPR_EXTHDR_OFFSET, + NFT_EXPR_EXTHDR_LEN, +}; + +enum { + NFT_EXPR_CT_DREG = NFT_RULE_EXPR_ATTR_BASE, + NFT_EXPR_CT_KEY, + NFT_EXPR_CT_DIR, +}; + +enum { + NFT_EXPR_BYTEORDER_DREG = NFT_RULE_EXPR_ATTR_BASE, + NFT_EXPR_BYTEORDER_SREG, + NFT_EXPR_BYTEORDER_OP, + NFT_EXPR_BYTEORDER_LEN, + NFT_EXPR_BYTEORDER_SIZE, +}; + +enum { + NFT_EXPR_LIMIT_RATE = NFT_RULE_EXPR_ATTR_BASE, + NFT_EXPR_LIMIT_UNIT, +}; + +enum { + NFT_EXPR_REJECT_TYPE = NFT_RULE_EXPR_ATTR_BASE, + NFT_EXPR_REJECT_CODE, +}; + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* _LIBNFTNL_RULE_EXPR_H_ */ diff --git a/include/libnftnl/rule.h b/include/libnftnl/rule.h new file mode 100644 index 0000000..4033d3c --- /dev/null +++ b/include/libnftnl/rule.h @@ -0,0 +1,91 @@ +#ifndef _LIBNFTNL_RULE_H_ +#define _LIBNFTNL_RULE_H_ + +#include +#include +#include +#include + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +struct nft_rule; +struct nft_rule_expr; + +struct nft_rule *nft_rule_alloc(void); +void nft_rule_free(struct nft_rule *); + +enum { + NFT_RULE_ATTR_FAMILY = 0, + NFT_RULE_ATTR_TABLE, + NFT_RULE_ATTR_CHAIN, + NFT_RULE_ATTR_HANDLE, + NFT_RULE_ATTR_COMPAT_PROTO, + NFT_RULE_ATTR_COMPAT_FLAGS, + NFT_RULE_ATTR_POSITION, +}; + +void nft_rule_attr_unset(struct nft_rule *r, uint16_t attr); +bool nft_rule_attr_is_set(const struct nft_rule *r, uint16_t attr); +void nft_rule_attr_set(struct nft_rule *r, uint16_t attr, const void *data); +void nft_rule_attr_set_u32(struct nft_rule *r, uint16_t attr, uint32_t val); +void nft_rule_attr_set_u64(struct nft_rule *r, uint16_t attr, uint64_t val); +void nft_rule_attr_set_str(struct nft_rule *r, uint16_t attr, const char *str); + +const void *nft_rule_attr_get(const struct nft_rule *r, uint16_t attr); +const char *nft_rule_attr_get_str(const struct nft_rule *r, uint16_t attr); +uint8_t nft_rule_attr_get_u8(const struct nft_rule *r, uint16_t attr); +uint32_t nft_rule_attr_get_u32(const struct nft_rule *r, uint16_t attr); +uint64_t nft_rule_attr_get_u64(const struct nft_rule *r, uint16_t attr); + +void nft_rule_add_expr(struct nft_rule *r, struct nft_rule_expr *expr); + +struct nlmsghdr; + +void nft_rule_nlmsg_build_payload(struct nlmsghdr *nlh, struct nft_rule *t); + +int nft_rule_parse(struct nft_rule *r, enum nft_parse_type type, + const char *data, struct nft_parse_err *err); +int nft_rule_parse_file(struct nft_rule *r, enum nft_parse_type type, + FILE *fp, struct nft_parse_err *err); +int nft_rule_snprintf(char *buf, size_t size, struct nft_rule *t, uint32_t type, uint32_t flags); +int nft_rule_fprintf(FILE *fp, struct nft_rule *r, uint32_t type, uint32_t flags); + +#define nft_rule_nlmsg_build_hdr nft_nlmsg_build_hdr +int nft_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_rule *t); + +int nft_rule_expr_foreach(struct nft_rule *r, + int (*cb)(struct nft_rule_expr *e, void *data), + void *data); + +struct nft_rule_expr_iter; + +struct nft_rule_expr_iter *nft_rule_expr_iter_create(struct nft_rule *r); +struct nft_rule_expr *nft_rule_expr_iter_next(struct nft_rule_expr_iter *iter); +void nft_rule_expr_iter_destroy(struct nft_rule_expr_iter *iter); + +struct nft_rule_list; + +struct nft_rule_list *nft_rule_list_alloc(void); +void nft_rule_list_free(struct nft_rule_list *list); +int nft_rule_list_is_empty(struct nft_rule_list *list); +void nft_rule_list_add(struct nft_rule *r, struct nft_rule_list *list); +void nft_rule_list_add_tail(struct nft_rule *r, struct nft_rule_list *list); +void nft_rule_list_del(struct nft_rule *r); +int nft_rule_list_foreach(struct nft_rule_list *rule_list, int (*cb)(struct nft_rule *t, void *data), void *data); + +struct nft_rule_list_iter; + +struct nft_rule_list_iter *nft_rule_list_iter_create(struct nft_rule_list *l); +struct nft_rule *nft_rule_list_iter_cur(struct nft_rule_list_iter *iter); +struct nft_rule *nft_rule_list_iter_next(struct nft_rule_list_iter *iter); +void nft_rule_list_iter_destroy(struct nft_rule_list_iter *iter); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* _LIBNFTNL_RULE_H_ */ diff --git a/include/libnftnl/ruleset.h b/include/libnftnl/ruleset.h new file mode 100644 index 0000000..6f89110 --- /dev/null +++ b/include/libnftnl/ruleset.h @@ -0,0 +1,44 @@ +#ifndef _LIBNFTNL_RULESET_H_ +#define _LIBNFTNL_RULESET_H_ + +#include + +#include +#include +#include + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +struct nft_ruleset; + +struct nft_ruleset *nft_ruleset_alloc(void); +void nft_ruleset_free(struct nft_ruleset *r); + +enum { + NFT_RULESET_ATTR_TABLELIST = 0, + NFT_RULESET_ATTR_CHAINLIST, + NFT_RULESET_ATTR_SETLIST, + NFT_RULESET_ATTR_RULELIST, +}; + +bool nft_ruleset_attr_is_set(const struct nft_ruleset *r, uint16_t attr); +void nft_ruleset_attr_unset(struct nft_ruleset *r, uint16_t attr); +void nft_ruleset_attr_set(struct nft_ruleset *r, uint16_t attr, void *data); +const void *nft_ruleset_attr_get(const struct nft_ruleset *r, uint16_t attr); + +int nft_ruleset_parse(struct nft_ruleset *rs, enum nft_parse_type type, + const char *data, struct nft_parse_err *err); +int nft_ruleset_parse_file(struct nft_ruleset *rs, enum nft_parse_type type, + FILE *fp, struct nft_parse_err *err); +int nft_ruleset_snprintf(char *buf, size_t size, const struct nft_ruleset *rs, uint32_t type, uint32_t flags); +int nft_ruleset_fprintf(FILE *fp, const struct nft_ruleset *rs, uint32_t type, uint32_t flags); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* _LIBNFTNL_RULESET_H_ */ diff --git a/include/libnftnl/set.h b/include/libnftnl/set.h new file mode 100644 index 0000000..7fa9fb2 --- /dev/null +++ b/include/libnftnl/set.h @@ -0,0 +1,119 @@ +#ifndef _LIBNFTNL_SET_H_ +#define _LIBNFTNL_SET_H_ + +#include +#include +#include +#include + +#include + +enum { + NFT_SET_ATTR_TABLE, + NFT_SET_ATTR_NAME, + NFT_SET_ATTR_FLAGS, + NFT_SET_ATTR_KEY_TYPE, + NFT_SET_ATTR_KEY_LEN, + NFT_SET_ATTR_DATA_TYPE, + NFT_SET_ATTR_DATA_LEN, + NFT_SET_ATTR_FAMILY, +}; + +struct nft_set; + +struct nft_set *nft_set_alloc(void); +void nft_set_free(struct nft_set *s); + +bool nft_set_attr_is_set(const struct nft_set *s, uint16_t attr); +void nft_set_attr_unset(struct nft_set *s, uint16_t attr); +void nft_set_attr_set(struct nft_set *s, uint16_t attr, const void *data); +void nft_set_attr_set_u32(struct nft_set *s, uint16_t attr, uint32_t val); +void nft_set_attr_set_str(struct nft_set *s, uint16_t attr, const char *str); + +const void *nft_set_attr_get(struct nft_set *s, uint16_t attr); +const char *nft_set_attr_get_str(struct nft_set *s, uint16_t attr); +uint32_t nft_set_attr_get_u32(struct nft_set *s, uint16_t attr); + +struct nlmsghdr; + +#define nft_set_nlmsg_build_hdr nft_nlmsg_build_hdr +void nft_set_nlmsg_build_payload(struct nlmsghdr *nlh, struct nft_set *s); +int nft_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_set *s); +int nft_set_elems_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_set *s); + +int nft_set_snprintf(char *buf, size_t size, struct nft_set *s, uint32_t type, uint32_t flags); +int nft_set_fprintf(FILE *fp, struct nft_set *s, uint32_t type, uint32_t flags); + +struct nft_set_list; + +struct nft_set_list *nft_set_list_alloc(void); +void nft_set_list_free(struct nft_set_list *list); +int nft_set_list_is_empty(struct nft_set_list *list); +void nft_set_list_add(struct nft_set *s, struct nft_set_list *list); +void nft_set_list_add_tail(struct nft_set *s, struct nft_set_list *list); +void nft_set_list_del(struct nft_set *s); +int nft_set_list_foreach(struct nft_set_list *set_list, int (*cb)(struct nft_set *t, void *data), void *data); + +struct nft_set_list_iter; +struct nft_set_list_iter *nft_set_list_iter_create(struct nft_set_list *l); +struct nft_set *nft_set_list_iter_cur(struct nft_set_list_iter *iter); +struct nft_set *nft_set_list_iter_next(struct nft_set_list_iter *iter); +void nft_set_list_iter_destroy(struct nft_set_list_iter *iter); + +int nft_set_parse(struct nft_set *s, enum nft_parse_type type, + const char *data, struct nft_parse_err *err); +int nft_set_parse_file(struct nft_set *s, enum nft_parse_type type, + FILE *fp, struct nft_parse_err *err); + +/* + * Set elements + */ + +enum { + NFT_SET_ELEM_ATTR_FLAGS, + NFT_SET_ELEM_ATTR_KEY, + NFT_SET_ELEM_ATTR_VERDICT, + NFT_SET_ELEM_ATTR_CHAIN, + NFT_SET_ELEM_ATTR_DATA, +}; + +struct nft_set_elem; + +struct nft_set_elem *nft_set_elem_alloc(void); +void nft_set_elem_free(struct nft_set_elem *s); + +void nft_set_elem_add(struct nft_set *s, struct nft_set_elem *elem); + +void nft_set_elem_attr_unset(struct nft_set_elem *s, uint16_t attr); +void nft_set_elem_attr_set(struct nft_set_elem *s, uint16_t attr, const void *data, uint32_t data_len); +void nft_set_elem_attr_set_u32(struct nft_set_elem *s, uint16_t attr, uint32_t val); +void nft_set_elem_attr_set_str(struct nft_set_elem *s, uint16_t attr, const char *str); + +const void *nft_set_elem_attr_get(struct nft_set_elem *s, uint16_t attr, uint32_t *data_len); +const char *nft_set_elem_attr_get_str(struct nft_set_elem *s, uint16_t attr); +uint32_t nft_set_elem_attr_get_u32(struct nft_set_elem *s, uint16_t attr); + +bool nft_set_elem_attr_is_set(const struct nft_set_elem *s, uint16_t attr); + +#define nft_set_elem_nlmsg_build_hdr nft_nlmsg_build_hdr +void nft_set_elems_nlmsg_build_payload(struct nlmsghdr *nlh, struct nft_set *s); +void nft_set_elem_nlmsg_build_payload(struct nlmsghdr *nlh, struct nft_set_elem *e); + +int nft_set_elem_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_set_elem *s); + +int nft_set_elem_parse(struct nft_set_elem *e, enum nft_parse_type type, + const char *data, struct nft_parse_err *err); +int nft_set_elem_parse_file(struct nft_set_elem *e, enum nft_parse_type type, + FILE *fp, struct nft_parse_err *err); +int nft_set_elem_snprintf(char *buf, size_t size, struct nft_set_elem *s, uint32_t type, uint32_t flags); +int nft_set_elem_fprintf(FILE *fp, struct nft_set_elem *se, uint32_t type, uint32_t flags); + +int nft_set_elem_foreach(struct nft_set *s, int (*cb)(struct nft_set_elem *e, void *data), void *data); + +struct nft_set_elems_iter; +struct nft_set_elems_iter *nft_set_elems_iter_create(struct nft_set *s); +struct nft_set_elem *nft_set_elems_iter_cur(struct nft_set_elems_iter *iter); +struct nft_set_elem *nft_set_elems_iter_next(struct nft_set_elems_iter *iter); +void nft_set_elems_iter_destroy(struct nft_set_elems_iter *iter); + +#endif /* _LIBNFTNL_SET_H_ */ diff --git a/include/libnftnl/table.h b/include/libnftnl/table.h new file mode 100644 index 0000000..22a8c1b --- /dev/null +++ b/include/libnftnl/table.h @@ -0,0 +1,73 @@ +#ifndef _LIBNFTNL_TABLE_H_ +#define _LIBNFTNL_TABLE_H_ + +#include +#include +#include +#include + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +struct nft_table; + +struct nft_table *nft_table_alloc(void); +void nft_table_free(struct nft_table *); + +enum { + NFT_TABLE_ATTR_NAME = 0, + NFT_TABLE_ATTR_FAMILY, + NFT_TABLE_ATTR_FLAGS, +}; + +bool nft_table_attr_is_set(const struct nft_table *t, uint16_t attr); +void nft_table_attr_unset(struct nft_table *t, uint16_t attr); +void nft_table_attr_set(struct nft_table *t, uint16_t attr, const void *data); +const void *nft_table_attr_get(struct nft_table *t, uint16_t attr); + +void nft_table_attr_set_u8(struct nft_table *t, uint16_t attr, uint8_t data); +void nft_table_attr_set_u32(struct nft_table *t, uint16_t attr, uint32_t data); +void nft_table_attr_set_str(struct nft_table *t, uint16_t attr, const char *str); +uint8_t nft_table_attr_get_u8(struct nft_table *t, uint16_t attr); +uint32_t nft_table_attr_get_u32(struct nft_table *t, uint16_t attr); +const char *nft_table_attr_get_str(struct nft_table *t, uint16_t attr); + +struct nlmsghdr; + +void nft_table_nlmsg_build_payload(struct nlmsghdr *nlh, const struct nft_table *t); + +int nft_table_parse(struct nft_table *t, enum nft_parse_type type, + const char *data, struct nft_parse_err *err); +int nft_table_parse_file(struct nft_table *t, enum nft_parse_type type, + FILE *fp, struct nft_parse_err *err); +int nft_table_snprintf(char *buf, size_t size, struct nft_table *t, uint32_t type, uint32_t flags); +int nft_table_fprintf(FILE *fp, struct nft_table *t, uint32_t type, uint32_t flags); + +#define nft_table_nlmsg_build_hdr nft_nlmsg_build_hdr +int nft_table_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_table *t); + +struct nft_table_list; + +struct nft_table_list *nft_table_list_alloc(void); +void nft_table_list_free(struct nft_table_list *list); +int nft_table_list_is_empty(struct nft_table_list *list); +int nft_table_list_foreach(struct nft_table_list *table_list, int (*cb)(struct nft_table *t, void *data), void *data); + +void nft_table_list_add(struct nft_table *r, struct nft_table_list *list); +void nft_table_list_add_tail(struct nft_table *r, struct nft_table_list *list); +void nft_table_list_del(struct nft_table *r); + +struct nft_table_list_iter; + +struct nft_table_list_iter *nft_table_list_iter_create(struct nft_table_list *l); +struct nft_table *nft_table_list_iter_next(struct nft_table_list_iter *iter); +void nft_table_list_iter_destroy(struct nft_table_list_iter *iter); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* _LIBNFTNL_TABLE_H_ */ diff --git a/libnftables.pc.in b/libnftables.pc.in deleted file mode 100644 index 0c6d57e..0000000 --- a/libnftables.pc.in +++ /dev/null @@ -1,15 +0,0 @@ -# libnftables pkg-config file - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: libnftables -Description: Netfilter nf_tables infrastructure library -URL: http://netfilter.org/projects/libnftables/ -Version: @VERSION@ -Requires: -Conflicts: -Libs: -L${libdir} -lnftables -Cflags: -I${includedir} diff --git a/libnftnl.pc.in b/libnftnl.pc.in new file mode 100644 index 0000000..0c6d57e --- /dev/null +++ b/libnftnl.pc.in @@ -0,0 +1,15 @@ +# libnftables pkg-config file + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: libnftables +Description: Netfilter nf_tables infrastructure library +URL: http://netfilter.org/projects/libnftables/ +Version: @VERSION@ +Requires: +Conflicts: +Libs: -L${libdir} -lnftables +Cflags: -I${includedir} diff --git a/src/Makefile.am b/src/Makefile.am index fc13e46..450279f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,40 +1,40 @@ include $(top_srcdir)/Make_global.am -lib_LTLIBRARIES = libnftables.la +lib_LTLIBRARIES = libnftnl.la -libnftables_la_LIBADD = ${LIBMNL_LIBS} ${LIBXML_LIBS} ${LIBJSON_LIBS} -libnftables_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnftables.map \ - -version-info $(LIBVERSION) +libnftnl_la_LIBADD = ${LIBMNL_LIBS} ${LIBXML_LIBS} ${LIBJSON_LIBS} +libnftnl_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnftnl.map \ + -version-info $(LIBVERSION) -libnftables_la_SOURCES = utils.c \ - common.c \ - table.c \ - chain.c \ - rule.c \ - set.c \ - set_elem.c \ - ruleset.c \ - mxml.c \ - jansson.c \ - expr.c \ - expr_ops.c \ - expr/bitwise.c \ - expr/byteorder.c \ - expr/cmp.c \ - expr/counter.c \ - expr/ct.c \ - expr/data_reg.c \ - expr/exthdr.c \ - expr/limit.c \ - expr/log.c \ - expr/lookup.c \ - expr/immediate.c \ - expr/match.c \ - expr/meta.c \ - expr/nat.c \ - expr/payload.c \ - expr/reject.c \ - expr/target.c \ - expr/data_reg.h \ - libnftables.map \ - expr_ops.h \ - internal.h +libnftnl_la_SOURCES = utils.c \ + common.c \ + table.c \ + chain.c \ + rule.c \ + set.c \ + set_elem.c \ + ruleset.c \ + mxml.c \ + jansson.c \ + expr.c \ + expr_ops.c \ + expr/bitwise.c \ + expr/byteorder.c \ + expr/cmp.c \ + expr/counter.c \ + expr/ct.c \ + expr/data_reg.c \ + expr/exthdr.c \ + expr/limit.c \ + expr/log.c \ + expr/lookup.c \ + expr/immediate.c \ + expr/match.c \ + expr/meta.c \ + expr/nat.c \ + expr/payload.c \ + expr/reject.c \ + expr/target.c \ + expr/data_reg.h \ + libnftnl.map \ + expr_ops.h \ + internal.h diff --git a/src/chain.c b/src/chain.c index 37515bb..e26200d 100644 --- a/src/chain.c +++ b/src/chain.c @@ -26,7 +26,7 @@ #include #include -#include +#include struct nft_chain { struct list_head head; diff --git a/src/common.c b/src/common.c index 5c6ddbf..b9598bf 100644 --- a/src/common.c +++ b/src/common.c @@ -11,7 +11,7 @@ #include #include -#include +#include #include "internal.h" #include diff --git a/src/expr.c b/src/expr.c index aeb717e..55557da 100644 --- a/src/expr.c +++ b/src/expr.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include "linux_list.h" diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c index e57c244..c8fd0ec 100644 --- a/src/expr/bitwise.c +++ b/src/expr/bitwise.c @@ -18,8 +18,8 @@ #include #include #include -#include -#include +#include +#include #include "data_reg.h" #include "expr_ops.h" diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c index 49ae38f..4889e80 100644 --- a/src/expr/byteorder.c +++ b/src/expr/byteorder.c @@ -18,8 +18,8 @@ #include #include #include -#include -#include +#include +#include #include "data_reg.h" #include "expr_ops.h" diff --git a/src/expr/cmp.c b/src/expr/cmp.c index ebd3e5c..63250f3 100644 --- a/src/expr/cmp.c +++ b/src/expr/cmp.c @@ -19,8 +19,8 @@ #include #include -#include -#include +#include +#include #include "expr_ops.h" #include "data_reg.h" diff --git a/src/expr/counter.c b/src/expr/counter.c index 11afb83..4bb7f1b 100644 --- a/src/expr/counter.c +++ b/src/expr/counter.c @@ -19,8 +19,8 @@ #include "internal.h" #include -#include -#include +#include +#include #include "expr_ops.h" struct nft_expr_counter { diff --git a/src/expr/ct.c b/src/expr/ct.c index 584f7a6..051a1c5 100644 --- a/src/expr/ct.c +++ b/src/expr/ct.c @@ -18,8 +18,8 @@ #include "internal.h" #include -#include -#include +#include +#include #include "expr_ops.h" struct nft_expr_ct { diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c index a755948..0523cb7 100644 --- a/src/expr/data_reg.c +++ b/src/expr/data_reg.c @@ -20,8 +20,8 @@ #include #include #include -#include -#include +#include +#include #include "expr_ops.h" #include "data_reg.h" #include "internal.h" diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c index 0bf1de3..66a6cf5 100644 --- a/src/expr/exthdr.c +++ b/src/expr/exthdr.c @@ -21,8 +21,8 @@ #include -#include -#include +#include +#include #include "expr_ops.h" diff --git a/src/expr/immediate.c b/src/expr/immediate.c index db7b958..b3c52b8 100644 --- a/src/expr/immediate.c +++ b/src/expr/immediate.c @@ -17,8 +17,8 @@ #include "internal.h" #include #include -#include -#include +#include +#include #include "expr_ops.h" #include "data_reg.h" diff --git a/src/expr/limit.c b/src/expr/limit.c index e6b0492..7d10340 100644 --- a/src/expr/limit.c +++ b/src/expr/limit.c @@ -19,8 +19,8 @@ #include "internal.h" #include -#include -#include +#include +#include #include "expr_ops.h" struct nft_expr_limit { diff --git a/src/expr/log.c b/src/expr/log.c index c62a8b4..5119c20 100644 --- a/src/expr/log.c +++ b/src/expr/log.c @@ -18,8 +18,8 @@ #include "internal.h" #include -#include -#include +#include +#include #include "expr_ops.h" struct nft_expr_log { diff --git a/src/expr/lookup.c b/src/expr/lookup.c index 0e53f58..5e0bf75 100644 --- a/src/expr/lookup.c +++ b/src/expr/lookup.c @@ -18,8 +18,8 @@ #include #include #include -#include -#include +#include +#include #include "data_reg.h" #include "expr_ops.h" diff --git a/src/expr/match.c b/src/expr/match.c index 5487050..9f2fa03 100644 --- a/src/expr/match.c +++ b/src/expr/match.c @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include #include "expr_ops.h" diff --git a/src/expr/meta.c b/src/expr/meta.c index 6c3e20e..e2a198a 100644 --- a/src/expr/meta.c +++ b/src/expr/meta.c @@ -18,8 +18,8 @@ #include "internal.h" #include -#include -#include +#include +#include #include "expr_ops.h" #ifndef NFT_META_MAX diff --git a/src/expr/nat.c b/src/expr/nat.c index 65b35ea..42f2b49 100644 --- a/src/expr/nat.c +++ b/src/expr/nat.c @@ -20,8 +20,8 @@ #include #include #include -#include -#include +#include +#include #include "expr_ops.h" struct nft_expr_nat { diff --git a/src/expr/payload.c b/src/expr/payload.c index d64b097..ad82015 100644 --- a/src/expr/payload.c +++ b/src/expr/payload.c @@ -21,8 +21,8 @@ #include -#include -#include +#include +#include #include "expr_ops.h" diff --git a/src/expr/reject.c b/src/expr/reject.c index c06b070..62346e9 100644 --- a/src/expr/reject.c +++ b/src/expr/reject.c @@ -18,8 +18,8 @@ #include "internal.h" #include -#include -#include +#include +#include #include "expr_ops.h" struct nft_expr_reject { diff --git a/src/expr/target.c b/src/expr/target.c index 071fb07..36e37de 100644 --- a/src/expr/target.c +++ b/src/expr/target.c @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include #include "expr_ops.h" diff --git a/src/internal.h b/src/internal.h index 256dd3d..a3fc46f 100644 --- a/src/internal.h +++ b/src/internal.h @@ -13,7 +13,7 @@ #include #include -#include +#include #define BASE_DEC 10 #define BASE_HEX 16 diff --git a/src/jansson.c b/src/jansson.c index 26bd700..5107eb5 100644 --- a/src/jansson.c +++ b/src/jansson.c @@ -16,9 +16,9 @@ #include #include #include "expr_ops.h" -#include +#include -#include +#include #include #ifdef JSON_PARSING diff --git a/src/libnftables.map b/src/libnftables.map deleted file mode 100644 index faf0913..0000000 --- a/src/libnftables.map +++ /dev/null @@ -1,198 +0,0 @@ -LIBNFTABLES_1.0 { -global: - nft_table_alloc; - nft_table_free; - nft_table_attr_is_set; - nft_table_attr_unset; - nft_table_attr_set; - nft_table_attr_get; - nft_table_attr_set_u8; - nft_table_attr_set_u32; - nft_table_attr_set_str; - nft_table_attr_get_u8; - nft_table_attr_get_u32; - nft_table_attr_get_str; - nft_table_parse; - nft_table_parse_file; - nft_table_snprintf; - nft_table_fprintf; - nft_table_nlmsg_build_payload; - nft_table_nlmsg_parse; - nft_table_list_alloc; - nft_table_list_free; - nft_table_list_is_empty; - nft_table_list_foreach; - nft_table_list_add; - nft_table_list_add_tail; - nft_table_list_del; - nft_table_list_iter_create; - nft_table_list_iter_next; - nft_table_list_iter_destroy; - - nft_chain_alloc; - nft_chain_free; - nft_chain_attr_is_set; - nft_chain_attr_unset; - nft_chain_attr_set; - nft_chain_attr_set_u8; - nft_chain_attr_set_u32; - nft_chain_attr_set_s32; - nft_chain_attr_set_u64; - nft_chain_attr_set_str; - nft_chain_attr_get; - nft_chain_attr_get_u8; - nft_chain_attr_get_u32; - nft_chain_attr_get_s32; - nft_chain_attr_get_u64; - nft_chain_attr_get_str; - nft_chain_parse; - nft_chain_parse_file; - nft_chain_snprintf; - nft_chain_fprintf; - nft_chain_nlmsg_build_payload; - nft_chain_nlmsg_parse; - nft_chain_list_alloc; - nft_chain_list_free; - nft_chain_list_is_empty; - nft_chain_list_add; - nft_chain_list_add_tail; - nft_chain_list_del; - nft_chain_list_foreach; - nft_chain_list_iter_create; - nft_chain_list_iter_next; - nft_chain_list_iter_destroy; - - nft_rule_alloc; - nft_rule_free; - nft_rule_attr_is_set; - nft_rule_attr_unset; - nft_rule_attr_set; - nft_rule_attr_set_u32; - nft_rule_attr_set_u64; - nft_rule_attr_set_str; - nft_rule_attr_get; - nft_rule_attr_get_u8; - nft_rule_attr_get_u32; - nft_rule_attr_get_u64; - nft_rule_attr_get_str; - nft_rule_parse; - nft_rule_parse_file; - nft_rule_snprintf; - nft_rule_fprintf; - nft_rule_nlmsg_build_payload; - nft_rule_nlmsg_parse; - nft_rule_add_expr; - - nft_rule_expr_foreach; - nft_rule_expr_iter_create; - nft_rule_expr_iter_next; - nft_rule_expr_iter_destroy; - - nft_rule_expr_alloc; - nft_rule_expr_is_set; - nft_rule_expr_set; - nft_rule_expr_set_u8; - nft_rule_expr_set_u16; - nft_rule_expr_set_u32; - nft_rule_expr_set_u64; - nft_rule_expr_set_str; - nft_rule_expr_get; - nft_rule_expr_get_u8; - nft_rule_expr_get_u16; - nft_rule_expr_get_u32; - nft_rule_expr_get_u64; - nft_rule_expr_get_str; - nft_rule_expr_build_payload; - nft_rule_expr_snprintf; - nft_rule_expr_free; - - nft_rule_list_alloc; - nft_rule_list_free; - nft_rule_list_is_empty; - nft_rule_list_add; - nft_rule_list_add_tail; - nft_rule_list_del; - nft_rule_list_foreach; - nft_rule_list_iter_create; - nft_rule_list_iter_cur; - nft_rule_list_iter_next; - nft_rule_list_iter_destroy; - - nft_set_alloc; - nft_set_free; - nft_set_attr_unset; - nft_set_attr_is_set; - nft_set_attr_set; - nft_set_attr_set_u32; - nft_set_attr_set_str; - nft_set_attr_get; - nft_set_attr_get_str; - nft_set_attr_get_u32; - nft_set_nlmsg_build_payload; - nft_set_nlmsg_parse; - nft_set_parse; - nft_set_parse_file; - nft_set_snprintf; - nft_set_fprintf; - - nft_set_list_alloc; - nft_set_list_free; - nft_set_list_add; - nft_set_list_add_tail; - nft_set_list_del; - nft_set_list_is_empty; - nft_set_list_foreach; - - nft_set_list_iter_create; - nft_set_list_iter_cur; - nft_set_list_iter_next; - nft_set_list_iter_destroy; - - nft_set_elem_alloc; - nft_set_elem_free; - nft_set_elem_add; - nft_set_elem_foreach; - nft_set_elem_attr_is_set; - nft_set_elem_attr_unset; - nft_set_elem_attr_set; - nft_set_elem_attr_set_u32; - nft_set_elem_attr_set_str; - nft_set_elem_attr_get; - nft_set_elem_attr_get_str; - nft_set_elem_attr_get_u32; - nft_set_elem_nlmsg_build_payload; - nft_set_elem_nlmsg_parse; - nft_set_elem_parse; - nft_set_elem_parse_file; - nft_set_elem_snprintf; - nft_set_elem_fprinf; - - nft_set_elems_nlmsg_build_payload; - nft_set_elems_nlmsg_parse; - - nft_set_elems_foreach; - - nft_set_elems_iter_create; - nft_set_elems_iter_cur; - nft_set_elems_iter_next; - nft_set_elems_iter_destroy; - - nft_ruleset_alloc; - nft_ruleset_free; - nft_ruleset_attr_is_set; - nft_ruleset_attr_unset; - nft_ruleset_attr_set; - nft_ruleset_attr_get; - nft_ruleset_parse; - nft_ruleset_parse_file; - nft_ruleset_snprintf; - nft_ruleset_fprintf; - - nft_nlmsg_build_hdr; - - nft_parse_err_alloc; - nft_parse_err_free; - nft_parse_perror; - -local: *; -}; diff --git a/src/libnftnl.map b/src/libnftnl.map new file mode 100644 index 0000000..43378ed --- /dev/null +++ b/src/libnftnl.map @@ -0,0 +1,198 @@ +LIBNFTNL_1.0 { +global: + nft_table_alloc; + nft_table_free; + nft_table_attr_is_set; + nft_table_attr_unset; + nft_table_attr_set; + nft_table_attr_get; + nft_table_attr_set_u8; + nft_table_attr_set_u32; + nft_table_attr_set_str; + nft_table_attr_get_u8; + nft_table_attr_get_u32; + nft_table_attr_get_str; + nft_table_parse; + nft_table_parse_file; + nft_table_snprintf; + nft_table_fprintf; + nft_table_nlmsg_build_payload; + nft_table_nlmsg_parse; + nft_table_list_alloc; + nft_table_list_free; + nft_table_list_is_empty; + nft_table_list_foreach; + nft_table_list_add; + nft_table_list_add_tail; + nft_table_list_del; + nft_table_list_iter_create; + nft_table_list_iter_next; + nft_table_list_iter_destroy; + + nft_chain_alloc; + nft_chain_free; + nft_chain_attr_is_set; + nft_chain_attr_unset; + nft_chain_attr_set; + nft_chain_attr_set_u8; + nft_chain_attr_set_u32; + nft_chain_attr_set_s32; + nft_chain_attr_set_u64; + nft_chain_attr_set_str; + nft_chain_attr_get; + nft_chain_attr_get_u8; + nft_chain_attr_get_u32; + nft_chain_attr_get_s32; + nft_chain_attr_get_u64; + nft_chain_attr_get_str; + nft_chain_parse; + nft_chain_parse_file; + nft_chain_snprintf; + nft_chain_fprintf; + nft_chain_nlmsg_build_payload; + nft_chain_nlmsg_parse; + nft_chain_list_alloc; + nft_chain_list_free; + nft_chain_list_is_empty; + nft_chain_list_add; + nft_chain_list_add_tail; + nft_chain_list_del; + nft_chain_list_foreach; + nft_chain_list_iter_create; + nft_chain_list_iter_next; + nft_chain_list_iter_destroy; + + nft_rule_alloc; + nft_rule_free; + nft_rule_attr_is_set; + nft_rule_attr_unset; + nft_rule_attr_set; + nft_rule_attr_set_u32; + nft_rule_attr_set_u64; + nft_rule_attr_set_str; + nft_rule_attr_get; + nft_rule_attr_get_u8; + nft_rule_attr_get_u32; + nft_rule_attr_get_u64; + nft_rule_attr_get_str; + nft_rule_parse; + nft_rule_parse_file; + nft_rule_snprintf; + nft_rule_fprintf; + nft_rule_nlmsg_build_payload; + nft_rule_nlmsg_parse; + nft_rule_add_expr; + + nft_rule_expr_foreach; + nft_rule_expr_iter_create; + nft_rule_expr_iter_next; + nft_rule_expr_iter_destroy; + + nft_rule_expr_alloc; + nft_rule_expr_is_set; + nft_rule_expr_set; + nft_rule_expr_set_u8; + nft_rule_expr_set_u16; + nft_rule_expr_set_u32; + nft_rule_expr_set_u64; + nft_rule_expr_set_str; + nft_rule_expr_get; + nft_rule_expr_get_u8; + nft_rule_expr_get_u16; + nft_rule_expr_get_u32; + nft_rule_expr_get_u64; + nft_rule_expr_get_str; + nft_rule_expr_build_payload; + nft_rule_expr_snprintf; + nft_rule_expr_free; + + nft_rule_list_alloc; + nft_rule_list_free; + nft_rule_list_is_empty; + nft_rule_list_add; + nft_rule_list_add_tail; + nft_rule_list_del; + nft_rule_list_foreach; + nft_rule_list_iter_create; + nft_rule_list_iter_cur; + nft_rule_list_iter_next; + nft_rule_list_iter_destroy; + + nft_set_alloc; + nft_set_free; + nft_set_attr_unset; + nft_set_attr_is_set; + nft_set_attr_set; + nft_set_attr_set_u32; + nft_set_attr_set_str; + nft_set_attr_get; + nft_set_attr_get_str; + nft_set_attr_get_u32; + nft_set_nlmsg_build_payload; + nft_set_nlmsg_parse; + nft_set_parse; + nft_set_parse_file; + nft_set_snprintf; + nft_set_fprintf; + + nft_set_list_alloc; + nft_set_list_free; + nft_set_list_add; + nft_set_list_add_tail; + nft_set_list_del; + nft_set_list_is_empty; + nft_set_list_foreach; + + nft_set_list_iter_create; + nft_set_list_iter_cur; + nft_set_list_iter_next; + nft_set_list_iter_destroy; + + nft_set_elem_alloc; + nft_set_elem_free; + nft_set_elem_add; + nft_set_elem_foreach; + nft_set_elem_attr_is_set; + nft_set_elem_attr_unset; + nft_set_elem_attr_set; + nft_set_elem_attr_set_u32; + nft_set_elem_attr_set_str; + nft_set_elem_attr_get; + nft_set_elem_attr_get_str; + nft_set_elem_attr_get_u32; + nft_set_elem_nlmsg_build_payload; + nft_set_elem_nlmsg_parse; + nft_set_elem_parse; + nft_set_elem_parse_file; + nft_set_elem_snprintf; + nft_set_elem_fprinf; + + nft_set_elems_nlmsg_build_payload; + nft_set_elems_nlmsg_parse; + + nft_set_elems_foreach; + + nft_set_elems_iter_create; + nft_set_elems_iter_cur; + nft_set_elems_iter_next; + nft_set_elems_iter_destroy; + + nft_ruleset_alloc; + nft_ruleset_free; + nft_ruleset_attr_is_set; + nft_ruleset_attr_unset; + nft_ruleset_attr_set; + nft_ruleset_attr_get; + nft_ruleset_parse; + nft_ruleset_parse_file; + nft_ruleset_snprintf; + nft_ruleset_fprintf; + + nft_nlmsg_build_hdr; + + nft_parse_err_alloc; + nft_parse_err_free; + nft_parse_perror; + +local: *; +}; diff --git a/src/mxml.c b/src/mxml.c index 4988502..b2cb95e 100644 --- a/src/mxml.c +++ b/src/mxml.c @@ -15,11 +15,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #ifdef XML_PARSING mxml_node_t *nft_mxml_build_tree(const void *data, const char *treename, diff --git a/src/rule.c b/src/rule.c index 9b4b01f..53d2ebf 100644 --- a/src/rule.c +++ b/src/rule.c @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include #include "linux_list.h" #include "expr_ops.h" diff --git a/src/ruleset.c b/src/ruleset.c index f5e1157..3cbec09 100644 --- a/src/ruleset.c +++ b/src/ruleset.c @@ -17,11 +17,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include struct nft_ruleset { struct nft_table_list *table_list; diff --git a/src/set.c b/src/set.c index bee9540..c3a7fae 100644 --- a/src/set.c +++ b/src/set.c @@ -23,7 +23,7 @@ #include #include -#include +#include #include "linux_list.h" #include "expr/data_reg.h" diff --git a/src/set_elem.c b/src/set_elem.c index 26c11d0..79fc641 100644 --- a/src/set_elem.c +++ b/src/set_elem.c @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include #include "linux_list.h" #include "expr/data_reg.h" diff --git a/src/table.c b/src/table.c index ad3570f..f50a968 100644 --- a/src/table.c +++ b/src/table.c @@ -23,7 +23,7 @@ #include #include -#include +#include struct nft_table { struct list_head head; diff --git a/tests/Makefile.am b/tests/Makefile.am index 362eeac..e82ebf4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -23,64 +23,64 @@ check_PROGRAMS = nft-parsing-test \ nft-expr_target-test nft_parsing_test_SOURCES = nft-parsing-test.c -nft_parsing_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} ${LIBXML_LIBS} ${LIBJSON_LIBS} +nft_parsing_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} ${LIBXML_LIBS} ${LIBJSON_LIBS} nft_table_test_SOURCES = nft-table-test.c -nft_table_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_table_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_chain_test_SOURCES = nft-chain-test.c -nft_chain_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_chain_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_rule_test_SOURCES = nft-rule-test.c -nft_rule_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_rule_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_set_test_SOURCES = nft-set-test.c -nft_set_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_set_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_expr_bitwise_test_SOURCES = nft-expr_bitwise-test.c -nft_expr_bitwise_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_expr_bitwise_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_expr_byteorder_test_SOURCES = nft-expr_byteorder-test.c -nft_expr_byteorder_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_expr_byteorder_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_expr_cmp_test_SOURCES = nft-expr_cmp-test.c -nft_expr_cmp_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_expr_cmp_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_expr_counter_test_SOURCES = nft-expr_counter-test.c -nft_expr_counter_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_expr_counter_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_expr_exthdr_test_SOURCES = nft-expr_exthdr-test.c -nft_expr_exthdr_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_expr_exthdr_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_expr_ct_test_SOURCES = nft-expr_ct-test.c -nft_expr_ct_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_expr_ct_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_expr_immediate_test_SOURCES = nft-expr_counter-test.c -nft_expr_immediate_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_expr_immediate_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_expr_limit_test_SOURCES = nft-expr_limit-test.c -nft_expr_limit_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_expr_limit_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_expr_lookup_test_SOURCES = nft-expr_limit-test.c -nft_expr_lookup_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_expr_lookup_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_expr_log_test_SOURCES = nft-expr_log-test.c -nft_expr_log_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_expr_log_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_expr_match_test_SOURCES = nft-expr_match-test.c -nft_expr_match_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_expr_match_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_expr_meta_test_SOURCES = nft-expr_meta-test.c -nft_expr_meta_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_expr_meta_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_expr_nat_test_SOURCES = nft-expr_nat-test.c -nft_expr_nat_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_expr_nat_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_expr_payload_test_SOURCES = nft-expr_payload-test.c -nft_expr_payload_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_expr_payload_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_expr_reject_test_SOURCES = nft-expr_reject-test.c -nft_expr_reject_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_expr_reject_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_expr_target_test_SOURCES = nft-expr_target-test.c -nft_expr_target_test_LDADD = ../src/libnftables.la ${LIBMNL_LIBS} +nft_expr_target_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} diff --git a/tests/nft-chain-test.c b/tests/nft-chain-test.c index 80c1981..125562a 100644 --- a/tests/nft-chain-test.c +++ b/tests/nft-chain-test.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include static int test_ok = 1; diff --git a/tests/nft-expr_bitwise-test.c b/tests/nft-expr_bitwise-test.c index d755c75..0fe5329 100644 --- a/tests/nft-expr_bitwise-test.c +++ b/tests/nft-expr_bitwise-test.c @@ -16,8 +16,8 @@ #include #include #include -#include -#include +#include +#include static int test_ok = 1; diff --git a/tests/nft-expr_byteorder-test.c b/tests/nft-expr_byteorder-test.c index 5e50da1..456d508 100644 --- a/tests/nft-expr_byteorder-test.c +++ b/tests/nft-expr_byteorder-test.c @@ -16,8 +16,8 @@ #include #include #include -#include -#include +#include +#include static int test_ok = 1; diff --git a/tests/nft-expr_cmp-test.c b/tests/nft-expr_cmp-test.c index f435bbe..f411770 100644 --- a/tests/nft-expr_cmp-test.c +++ b/tests/nft-expr_cmp-test.c @@ -16,8 +16,8 @@ #include #include #include -#include -#include +#include +#include static int test_ok = 1; diff --git a/tests/nft-expr_counter-test.c b/tests/nft-expr_counter-test.c index 70cac2b..e27d20a 100644 --- a/tests/nft-expr_counter-test.c +++ b/tests/nft-expr_counter-test.c @@ -16,8 +16,8 @@ #include #include #include -#include -#include +#include +#include static int test_ok = 1; diff --git a/tests/nft-expr_ct-test.c b/tests/nft-expr_ct-test.c index f8bd13d..341d9e6 100644 --- a/tests/nft-expr_ct-test.c +++ b/tests/nft-expr_ct-test.c @@ -16,8 +16,8 @@ #include #include -#include -#include +#include +#include static int test_ok = 1; static void print_err(const char *msg) diff --git a/tests/nft-expr_exthdr-test.c b/tests/nft-expr_exthdr-test.c index 64c364c..a712903 100644 --- a/tests/nft-expr_exthdr-test.c +++ b/tests/nft-expr_exthdr-test.c @@ -16,8 +16,8 @@ #include #include #include -#include -#include +#include +#include static int test_ok = 1; diff --git a/tests/nft-expr_immediate-test.c b/tests/nft-expr_immediate-test.c index 91e8a3d..c45cefa 100644 --- a/tests/nft-expr_immediate-test.c +++ b/tests/nft-expr_immediate-test.c @@ -16,8 +16,8 @@ #include #include -#include -#include +#include +#include static int test_ok = 1; diff --git a/tests/nft-expr_limit-test.c b/tests/nft-expr_limit-test.c index c5730cc..38c3e5b 100644 --- a/tests/nft-expr_limit-test.c +++ b/tests/nft-expr_limit-test.c @@ -17,8 +17,8 @@ #include #include -#include -#include +#include +#include static int test_ok = 1; diff --git a/tests/nft-expr_log-test.c b/tests/nft-expr_log-test.c index 7590548..7e257ab 100644 --- a/tests/nft-expr_log-test.c +++ b/tests/nft-expr_log-test.c @@ -16,8 +16,8 @@ #include #include -#include -#include +#include +#include static int test_ok = 1; diff --git a/tests/nft-expr_lookup-test.c b/tests/nft-expr_lookup-test.c index 760e69c..38a2a46 100644 --- a/tests/nft-expr_lookup-test.c +++ b/tests/nft-expr_lookup-test.c @@ -16,8 +16,8 @@ #include #include #include -#include -#include +#include +#include static int test_ok = 1; diff --git a/tests/nft-expr_match-test.c b/tests/nft-expr_match-test.c index dcb9f74..96b063a 100644 --- a/tests/nft-expr_match-test.c +++ b/tests/nft-expr_match-test.c @@ -18,8 +18,8 @@ #include #include #include -#include -#include +#include +#include static int test_ok = 1; diff --git a/tests/nft-expr_meta-test.c b/tests/nft-expr_meta-test.c index 879f2e7..9196f9c 100644 --- a/tests/nft-expr_meta-test.c +++ b/tests/nft-expr_meta-test.c @@ -16,8 +16,8 @@ #include #include -#include -#include +#include +#include static int test_ok = 1; diff --git a/tests/nft-expr_nat-test.c b/tests/nft-expr_nat-test.c index 35b6479..64966b2 100644 --- a/tests/nft-expr_nat-test.c +++ b/tests/nft-expr_nat-test.c @@ -17,8 +17,8 @@ #include #include #include -#include -#include +#include +#include static int test_ok = 1; diff --git a/tests/nft-expr_payload-test.c b/tests/nft-expr_payload-test.c index d6f4e05..3ce59f9 100644 --- a/tests/nft-expr_payload-test.c +++ b/tests/nft-expr_payload-test.c @@ -17,8 +17,8 @@ #include #include #include -#include -#include +#include +#include static int test_ok = 1; diff --git a/tests/nft-expr_reject-test.c b/tests/nft-expr_reject-test.c index 23784e9..0678081 100644 --- a/tests/nft-expr_reject-test.c +++ b/tests/nft-expr_reject-test.c @@ -17,8 +17,8 @@ #include #include #include -#include -#include +#include +#include static int test_ok = 1; diff --git a/tests/nft-expr_target-test.c b/tests/nft-expr_target-test.c index 7bde348..9387779 100644 --- a/tests/nft-expr_target-test.c +++ b/tests/nft-expr_target-test.c @@ -18,8 +18,8 @@ #include #include #include -#include -#include +#include +#include static int test_ok = 1; diff --git a/tests/nft-parsing-test.c b/tests/nft-parsing-test.c index df981ad..1786cb6 100644 --- a/tests/nft-parsing-test.c +++ b/tests/nft-parsing-test.c @@ -6,11 +6,11 @@ #include #include /*nlmsghdr*/ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include enum { TEST_XML_RULESET, diff --git a/tests/nft-rule-test.c b/tests/nft-rule-test.c index 5b99003..80338d0 100644 --- a/tests/nft-rule-test.c +++ b/tests/nft-rule-test.c @@ -14,7 +14,7 @@ #include #include -#include +#include static int test_ok = 1; diff --git a/tests/nft-set-test.c b/tests/nft-set-test.c index 5930af3..141dfd3 100644 --- a/tests/nft-set-test.c +++ b/tests/nft-set-test.c @@ -14,7 +14,7 @@ #include #include -#include +#include static int test_ok = 1; diff --git a/tests/nft-table-test.c b/tests/nft-table-test.c index fd85f42..051163b 100644 --- a/tests/nft-table-test.c +++ b/tests/nft-table-test.c @@ -14,7 +14,7 @@ #include #include -#include +#include static int test_ok = 1; -- cgit v1.2.3