summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2014-01-20 10:26:57 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2014-01-20 10:43:45 +0100
commit59e949294f4688bafe44b7def2972987224520c8 (patch)
tree0eccb41d605f64c88b9488879d34100ad9f17823
parent8460aa61e7136973ea01c40098f348b13d9af26f (diff)
rename library to libnftnllibnftnl-1.0.0
We plan to use this library name for the higher layer library. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--.gitignore2
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac6
-rw-r--r--doxygen.cfg.in2
-rw-r--r--examples/Makefile.am52
-rw-r--r--examples/nft-chain-add.c2
-rw-r--r--examples/nft-chain-del.c2
-rw-r--r--examples/nft-chain-get.c2
-rw-r--r--examples/nft-chain-json-add.c4
-rw-r--r--examples/nft-chain-xml-add.c4
-rw-r--r--examples/nft-events.c6
-rw-r--r--examples/nft-rule-add.c4
-rw-r--r--examples/nft-rule-del.c2
-rw-r--r--examples/nft-rule-get.c2
-rw-r--r--examples/nft-rule-insert.c4
-rw-r--r--examples/nft-rule-json-add.c2
-rw-r--r--examples/nft-rule-xml-add.c2
-rw-r--r--examples/nft-set-add.c4
-rw-r--r--examples/nft-set-del.c2
-rw-r--r--examples/nft-set-elem-add.c2
-rw-r--r--examples/nft-set-elem-del.c2
-rw-r--r--examples/nft-set-elem-get.c2
-rw-r--r--examples/nft-set-get.c2
-rw-r--r--examples/nft-set-json-add.c2
-rw-r--r--examples/nft-table-add.c2
-rw-r--r--examples/nft-table-del.c2
-rw-r--r--examples/nft-table-get.c2
-rw-r--r--examples/nft-table-json-add.c2
-rw-r--r--examples/nft-table-upd.c2
-rw-r--r--examples/nft-table-xml-add.c4
-rw-r--r--include/Makefile.am2
-rw-r--r--include/libnftnl/Makefile.am (renamed from include/libnftables/Makefile.am)0
-rw-r--r--include/libnftnl/chain.h (renamed from include/libnftables/chain.h)8
-rw-r--r--include/libnftnl/common.h (renamed from include/libnftables/common.h)4
-rw-r--r--include/libnftnl/expr.h (renamed from include/libnftables/expr.h)6
-rw-r--r--include/libnftnl/rule.h (renamed from include/libnftables/rule.h)8
-rw-r--r--include/libnftnl/ruleset.h (renamed from include/libnftables/ruleset.h)8
-rw-r--r--include/libnftnl/set.h (renamed from include/libnftables/set.h)8
-rw-r--r--include/libnftnl/table.h (renamed from include/libnftables/table.h)8
-rw-r--r--libnftnl.pc.in (renamed from libnftables.pc.in)0
-rw-r--r--src/Makefile.am74
-rw-r--r--src/chain.c2
-rw-r--r--src/common.c2
-rw-r--r--src/expr.c2
-rw-r--r--src/expr/bitwise.c4
-rw-r--r--src/expr/byteorder.c4
-rw-r--r--src/expr/cmp.c4
-rw-r--r--src/expr/counter.c4
-rw-r--r--src/expr/ct.c4
-rw-r--r--src/expr/data_reg.c4
-rw-r--r--src/expr/exthdr.c4
-rw-r--r--src/expr/immediate.c4
-rw-r--r--src/expr/limit.c4
-rw-r--r--src/expr/log.c4
-rw-r--r--src/expr/lookup.c4
-rw-r--r--src/expr/match.c4
-rw-r--r--src/expr/meta.c4
-rw-r--r--src/expr/nat.c4
-rw-r--r--src/expr/payload.c4
-rw-r--r--src/expr/reject.c4
-rw-r--r--src/expr/target.c4
-rw-r--r--src/internal.h2
-rw-r--r--src/jansson.c4
-rw-r--r--src/libnftnl.map (renamed from src/libnftables.map)2
-rw-r--r--src/mxml.c10
-rw-r--r--src/rule.c4
-rw-r--r--src/ruleset.c10
-rw-r--r--src/set.c2
-rw-r--r--src/set_elem.c4
-rw-r--r--src/table.c2
-rw-r--r--tests/Makefile.am42
-rw-r--r--tests/nft-chain-test.c2
-rw-r--r--tests/nft-expr_bitwise-test.c4
-rw-r--r--tests/nft-expr_byteorder-test.c4
-rw-r--r--tests/nft-expr_cmp-test.c4
-rw-r--r--tests/nft-expr_counter-test.c4
-rw-r--r--tests/nft-expr_ct-test.c4
-rw-r--r--tests/nft-expr_exthdr-test.c4
-rw-r--r--tests/nft-expr_immediate-test.c4
-rw-r--r--tests/nft-expr_limit-test.c4
-rw-r--r--tests/nft-expr_log-test.c4
-rw-r--r--tests/nft-expr_lookup-test.c4
-rw-r--r--tests/nft-expr_match-test.c4
-rw-r--r--tests/nft-expr_meta-test.c4
-rw-r--r--tests/nft-expr_nat-test.c4
-rw-r--r--tests/nft-expr_payload-test.c4
-rw-r--r--tests/nft-expr_reject-test.c4
-rw-r--r--tests/nft-expr_target-test.c4
-rw-r--r--tests/nft-parsing-test.c10
-rw-r--r--tests/nft-rule-test.c2
-rw-r--r--tests/nft-set-test.c2
-rw-r--r--tests/nft-table-test.c2
92 files changed, 247 insertions, 247 deletions
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/chain.h>
+#include <libnftnl/chain.h>
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/chain.h>
+#include <libnftnl/chain.h>
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/chain.h>
+#include <libnftnl/chain.h>
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 <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[])
{
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 <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[])
{
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/table.h>
-#include <libnftables/chain.h>
-#include <libnftables/rule.h>
+#include <libnftnl/table.h>
+#include <libnftnl/chain.h>
+#include <libnftnl/rule.h>
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/rule.h>
+#include <libnftnl/rule.h>
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/rule.h>
+#include <libnftnl/rule.h>
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
#include <linux/netfilter_ipv4/ipt_LOG.h>
#include <linux/netfilter/xt_iprange.h>
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/rule.h>
+#include <libnftnl/rule.h>
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/rule.h>
+#include <libnftnl/rule.h>
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/table.h>
-#include <libnftables/set.h>
+#include <libnftnl/table.h>
+#include <libnftnl/set.h>
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/set.h>
+#include <libnftnl/set.h>
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/set.h>
+#include <libnftnl/set.h>
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/set.h>
+#include <libnftnl/set.h>
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/set.h>
+#include <libnftnl/set.h>
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/set.h>
+#include <libnftnl/set.h>
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/set.h>
+#include <libnftnl/set.h>
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/table.h>
+#include <libnftnl/table.h>
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/table.h>
+#include <libnftnl/table.h>
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/table.h>
+#include <libnftnl/table.h>
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/table.h>
+#include <libnftnl/table.h>
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/table.h>
+#include <libnftnl/table.h>
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/table.h>
-#include <libnftables/common.h>
+#include <libnftnl/table.h>
+#include <libnftnl/common.h>
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/libnftnl/Makefile.am
index a0841d2..a0841d2 100644
--- a/include/libnftables/Makefile.am
+++ b/include/libnftnl/Makefile.am
diff --git a/include/libnftables/chain.h b/include/libnftnl/chain.h
index d213bf1..66626d8 100644
--- a/include/libnftables/chain.h
+++ b/include/libnftnl/chain.h
@@ -1,12 +1,12 @@
-#ifndef _LIBNFTABLES_CHAIN_H_
-#define _LIBNFTABLES_CHAIN_H_
+#ifndef _LIBNFTNL_CHAIN_H_
+#define _LIBNFTNL_CHAIN_H_
#include <stdio.h>
#include <stdint.h>
#include <stdbool.h>
#include <sys/types.h>
-#include <libnftables/common.h>
+#include <libnftnl/common.h>
#ifdef __cplusplus
extern "C" {
@@ -82,4 +82,4 @@ void nft_chain_list_iter_destroy(struct nft_chain_list_iter *iter);
} /* extern "C" */
#endif
-#endif /* _LIBNFTABLES_CHAIN_H_ */
+#endif /* _LIBNFTNL_CHAIN_H_ */
diff --git a/include/libnftables/common.h b/include/libnftnl/common.h
index 1ef88ba..9d18b2b 100644
--- a/include/libnftables/common.h
+++ b/include/libnftnl/common.h
@@ -1,5 +1,5 @@
-#ifndef _LIBNFTABLES_COMMON_H_
-#define _LIBNFTABLES_COMMON_H_
+#ifndef _LIBNFTNL_COMMON_H_
+#define _LIBNFTNL_COMMON_H_
enum {
NFT_PARSE_EBADINPUT = 0,
diff --git a/include/libnftables/expr.h b/include/libnftnl/expr.h
index 54de186..a2f44df 100644
--- a/include/libnftables/expr.h
+++ b/include/libnftnl/expr.h
@@ -1,5 +1,5 @@
-#ifndef _LIBNFTABLES_RULE_EXPR_H_
-#define _LIBNFTABLES_RULE_EXPR_H_
+#ifndef _LIBNFTNL_RULE_EXPR_H_
+#define _LIBNFTNL_RULE_EXPR_H_
#include <stdint.h>
#include <stdbool.h>
@@ -147,4 +147,4 @@ enum {
} /* extern "C" */
#endif
-#endif /* _LIBNFTABLES_RULE_EXPR_H_ */
+#endif /* _LIBNFTNL_RULE_EXPR_H_ */
diff --git a/include/libnftables/rule.h b/include/libnftnl/rule.h
index 48b9974..4033d3c 100644
--- a/include/libnftables/rule.h
+++ b/include/libnftnl/rule.h
@@ -1,12 +1,12 @@
-#ifndef _LIBNFTABLES_RULE_H_
-#define _LIBNFTABLES_RULE_H_
+#ifndef _LIBNFTNL_RULE_H_
+#define _LIBNFTNL_RULE_H_
#include <stdio.h>
#include <stdint.h>
#include <stdbool.h>
#include <sys/types.h>
-#include <libnftables/common.h>
+#include <libnftnl/common.h>
#ifdef __cplusplus
extern "C" {
@@ -88,4 +88,4 @@ void nft_rule_list_iter_destroy(struct nft_rule_list_iter *iter);
} /* extern "C" */
#endif
-#endif /* _LIBNFTABLES_RULE_H_ */
+#endif /* _LIBNFTNL_RULE_H_ */
diff --git a/include/libnftables/ruleset.h b/include/libnftnl/ruleset.h
index f916fba..6f89110 100644
--- a/include/libnftables/ruleset.h
+++ b/include/libnftnl/ruleset.h
@@ -1,5 +1,5 @@
-#ifndef _LIBNFTABLES_RULESET_H_
-#define _LIBNFTABLES_RULESET_H_
+#ifndef _LIBNFTNL_RULESET_H_
+#define _LIBNFTNL_RULESET_H_
#include <stdio.h>
@@ -7,7 +7,7 @@
#include <stdint.h>
#include <sys/types.h>
-#include <libnftables/common.h>
+#include <libnftnl/common.h>
#ifdef __cplusplus
extern "C" {
@@ -41,4 +41,4 @@ int nft_ruleset_fprintf(FILE *fp, const struct nft_ruleset *rs, uint32_t type, u
} /* extern "C" */
#endif
-#endif /* _LIBNFTABLES_RULESET_H_ */
+#endif /* _LIBNFTNL_RULESET_H_ */
diff --git a/include/libnftables/set.h b/include/libnftnl/set.h
index c4b1ff6..7fa9fb2 100644
--- a/include/libnftables/set.h
+++ b/include/libnftnl/set.h
@@ -1,12 +1,12 @@
-#ifndef _LIBNFTABLES_SET_H_
-#define _LIBNFTABLES_SET_H_
+#ifndef _LIBNFTNL_SET_H_
+#define _LIBNFTNL_SET_H_
#include <stdio.h>
#include <stdint.h>
#include <stdbool.h>
#include <sys/types.h>
-#include <libnftables/common.h>
+#include <libnftnl/common.h>
enum {
NFT_SET_ATTR_TABLE,
@@ -116,4 +116,4 @@ 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_ */
+#endif /* _LIBNFTNL_SET_H_ */
diff --git a/include/libnftables/table.h b/include/libnftnl/table.h
index 64fbf88..22a8c1b 100644
--- a/include/libnftables/table.h
+++ b/include/libnftnl/table.h
@@ -1,12 +1,12 @@
-#ifndef _LIBNFTABLES_TABLE_H_
-#define _LIBNFTABLES_TABLE_H_
+#ifndef _LIBNFTNL_TABLE_H_
+#define _LIBNFTNL_TABLE_H_
#include <stdio.h>
#include <stdint.h>
#include <stdbool.h>
#include <sys/types.h>
-#include <libnftables/common.h>
+#include <libnftnl/common.h>
#ifdef __cplusplus
extern "C" {
@@ -70,4 +70,4 @@ void nft_table_list_iter_destroy(struct nft_table_list_iter *iter);
} /* extern "C" */
#endif
-#endif /* _LIBNFTABLES_TABLE_H_ */
+#endif /* _LIBNFTNL_TABLE_H_ */
diff --git a/libnftables.pc.in b/libnftnl.pc.in
index 0c6d57e..0c6d57e 100644
--- a/libnftables.pc.in
+++ b/libnftnl.pc.in
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 <linux/netfilter.h>
#include <linux/netfilter_arp.h>
-#include <libnftables/chain.h>
+#include <libnftnl/chain.h>
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 <linux/netfilter/nfnetlink.h>
#include <libmnl/libmnl.h>
-#include <libnftables/common.h>
+#include <libnftnl/common.h>
#include "internal.h"
#include<stdlib.h>
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 <linux/netfilter/nfnetlink.h>
#include <linux/netfilter/nf_tables.h>
-#include <libnftables/expr.h>
+#include <libnftnl/expr.h>
#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 <errno.h>
#include <libmnl/libmnl.h>
#include <linux/netfilter/nf_tables.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
#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 <errno.h>
#include <libmnl/libmnl.h>
#include <linux/netfilter/nf_tables.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
#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 <libmnl/libmnl.h>
#include <linux/netfilter/nf_tables.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
#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 <libmnl/libmnl.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
#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 <libmnl/libmnl.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
#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 <libmnl/libmnl.h>
#include <linux/netfilter.h>
#include <linux/netfilter/nf_tables.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
#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 <linux/netfilter/nf_tables.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
#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 <libmnl/libmnl.h>
#include <linux/netfilter/nf_tables.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
#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 <libmnl/libmnl.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
#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 <libmnl/libmnl.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
#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 <errno.h>
#include <libmnl/libmnl.h>
#include <linux/netfilter/nf_tables.h>
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
#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 <linux/netfilter/nf_tables_compat.h>
#include <linux/netfilter/x_tables.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
#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 <libmnl/libmnl.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
#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 <arpa/inet.h>
#include <libmnl/libmnl.h>
#include <linux/netfilter/nf_tables.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
#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 <linux/netfilter/nf_tables.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
#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 <libmnl/libmnl.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
#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 <linux/netfilter/nf_tables_compat.h>
#include <linux/netfilter/x_tables.h>
-#include <libnftables/expr.h>
-#include <libnftables/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
#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 <stdint.h>
#include <stdbool.h>
-#include <libnftables/common.h>
+#include <libnftnl/common.h>
#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 <errno.h>
#include <string.h>
#include "expr_ops.h"
-#include <libnftables/set.h>
+#include <libnftnl/set.h>
-#include <libnftables/expr.h>
+#include <libnftnl/expr.h>
#include <linux/netfilter/nf_tables.h>
#ifdef JSON_PARSING
diff --git a/src/libnftables.map b/src/libnftnl.map
index faf0913..43378ed 100644
--- a/src/libnftables.map
+++ b/src/libnftnl.map
@@ -1,4 +1,4 @@
-LIBNFTABLES_1.0 {
+LIBNFTNL_1.0 {
global:
nft_table_alloc;
nft_table_free;
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 <limits.h>
#include <linux/netfilter/nf_tables.h>
-#include <libnftables/table.h>
-#include <libnftables/chain.h>
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
-#include <libnftables/set.h>
+#include <libnftnl/table.h>
+#include <libnftnl/chain.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/set.h>
#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 <linux/netfilter/nfnetlink.h>
#include <linux/netfilter/nf_tables.h>
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
#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 <stdlib.h>
#include <libmnl/libmnl.h>
-#include <libnftables/ruleset.h>
-#include <libnftables/table.h>
-#include <libnftables/chain.h>
-#include <libnftables/set.h>
-#include <libnftables/rule.h>
+#include <libnftnl/ruleset.h>
+#include <libnftnl/table.h>
+#include <libnftnl/chain.h>
+#include <libnftnl/set.h>
+#include <libnftnl/rule.h>
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 <linux/netfilter/nfnetlink.h>
#include <linux/netfilter/nf_tables.h>
-#include <libnftables/set.h>
+#include <libnftnl/set.h>
#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 <linux/netfilter/nfnetlink.h>
#include <linux/netfilter/nf_tables.h>
-#include <libnftables/set.h>
-#include <libnftables/rule.h>
+#include <libnftnl/set.h>
+#include <libnftnl/rule.h>
#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 <linux/netfilter/nfnetlink.h>
#include <linux/netfilter/nf_tables.h>
-#include <libnftables/table.h>
+#include <libnftnl/table.h>
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 <string.h>
#include <netinet/in.h>
#include <linux/netfilter/nf_tables.h>
-#include <libnftables/chain.h>
+#include <libnftnl/chain.h>
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 <netinet/ip.h>
#include <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
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 <netinet/ip.h>
#include <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
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 <netinet/ip.h>
#include <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
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 <netinet/ip.h>
#include <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
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 <netinet/ip.h>
#include <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
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 <netinet/ip.h>
#include <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
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 <linux/netfilter/nf_tables.h>
#include <linux/netfilter/xt_iprange.h>
#include <libmnl/libmnl.h>
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
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 <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
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 <linux/netfilter/nf_tables.h>
#include <linux/netfilter/xt_iprange.h>
#include <libmnl/libmnl.h>
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
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 <linux/netfilter/nf_tables.h>
#include <linux/netfilter/xt_iprange.h>
#include <libmnl/libmnl.h>
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
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 <linux/netfilter/nf_tables.h>
#include <linux/netfilter/xt_iprange.h>
#include <libmnl/libmnl.h>
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
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 <linux/netfilter/xt_iprange.h>
#include <linux/netfilter/xt_LOG.h>
#include <libmnl/libmnl.h>
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
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 <errno.h>
#include <libmnl/libmnl.h> /*nlmsghdr*/
-#include <libnftables/ruleset.h>
-#include <libnftables/table.h>
-#include <libnftables/chain.h>
-#include <libnftables/rule.h>
-#include <libnftables/set.h>
+#include <libnftnl/ruleset.h>
+#include <libnftnl/table.h>
+#include <libnftnl/chain.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/set.h>
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 <netinet/in.h>
#include <linux/netfilter/nf_tables.h>
-#include <libnftables/rule.h>
+#include <libnftnl/rule.h>
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 <netinet/in.h>
#include <linux/netfilter/nf_tables.h>
-#include <libnftables/set.h>
+#include <libnftnl/set.h>
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 <netinet/in.h>
#include <linux/netfilter/nf_tables.h>
-#include <libnftables/table.h>
+#include <libnftnl/table.h>
static int test_ok = 1;