nft: Use new libnftnl library name against former libnftables

Adapt the current code to use the new library name libnftnl.

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/configure.ac b/configure.ac
index cbbf66dfe43a7905d2b2674f404b30cf9125a82a..ac7c9c005e1144520ebc40ffd1bce1256da418eb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -123,9 +123,9 @@ PKG_CHECK_MODULES([libmnl], [libmnl >= 1.0],
        [mnl=1], [mnl=0])
 AM_CONDITIONAL([HAVE_LIBMNL], [test "$mnl" = 1])
 
-PKG_CHECK_MODULES([libnftables], [libnftables >= 1.0],
+PKG_CHECK_MODULES([libnftnl], [libnftnl >= 1.0],
        [nftables=1], [nftables=0])
-AM_CONDITIONAL([HAVE_LIBNFTABLES], [test "$nftables" = 1])
+AM_CONDITIONAL([HAVE_LIBNFTNL], [test "$nftables" = 1])
 
 AM_PROG_LEX
 AC_PROG_YACC

diff --git a/iptables/Makefile.am b/iptables/Makefile.am
index b9a9743e5816c6805a692458df77f8eeb31a63a7..2c6a163fb99f488df1307a6a2cc6e945dc388998 100644 (file)
--- a/iptables/Makefile.am
+++ b/iptables/Makefile.am
@@ -1,7 +1,7 @@
 # -*- Makefile -*-
 
 AM_CFLAGS        = ${regular_CFLAGS}
-AM_CPPFLAGS      = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${libmnl_CFLAGS} ${libnftables_CFLAGS}
+AM_CPPFLAGS      = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${libmnl_CFLAGS} ${libnftnl_CFLAGS}
 AM_YFLAGS = -d
 
 xtables_multi_SOURCES  = xtables-multi.c iptables-xml.c
@@ -27,14 +27,14 @@ xtables_multi_LDADD   += ../libxtables/libxtables.la -lm
 
 if ENABLE_NFTABLES
 if HAVE_LIBMNL
-if HAVE_LIBNFTABLES
+if HAVE_LIBNFTNL
 xtables_multi_SOURCES += xtables-config-parser.y xtables-config-syntax.l
 xtables_multi_SOURCES += xtables-save.c xtables-restore.c \
                         xtables-standalone.c xtables.c nft.c \
                         nft-shared.c nft-ipv4.c nft-ipv6.c nft-arp.c \
                         xtables-config.c xtables-events.c \
                         xtables-arp-standalone.c xtables-arp.c
-xtables_multi_LDADD   += -lmnl -lnftables ${libmnl_LIBS} ${libnftables_LIBS}
+xtables_multi_LDADD   += ${libmnl_LIBS} ${libnftnl_LIBS}
 xtables_multi_CFLAGS  += -DENABLE_NFTABLES
 # yacc and lex generate dirty code
 xtables_multi-xtables-config-parser.o xtables_multi-xtables-config-syntax.o: AM_CFLAGS += -Wno-missing-prototypes -Wno-missing-declarations -Wno-implicit-function-declaration -Wno-nested-externs -Wno-undef -Wno-redundant-decls

diff --git a/iptables/nft-shared.c b/iptables/nft-shared.c
index 43f03b201a7927453afd3394e43a0da4455fdf2c..d0e28ba9af46179c95f72d82f4eaec55862c1dd8 100644 (file)
--- a/iptables/nft-shared.c
+++ b/iptables/nft-shared.c
@@ -22,8 +22,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 "nft-shared.h"
 #include "xshared.h"

diff --git a/iptables/nft-shared.h b/iptables/nft-shared.h
index 9df17bc316b7f20c5082ad4b91fab4a8207ab787..1d01ebad2d99d1c09a91de570c9cb2eba4b95f37 100644 (file)
--- a/iptables/nft-shared.h
+++ b/iptables/nft-shared.h
@@ -3,8 +3,8 @@
 
 #include <stdbool.h>
 
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
 
 #include "xshared.h"
 

diff --git a/iptables/nft.c b/iptables/nft.c
index 6f3fdb0b885d889dbeb31bb9af75dd78d6727413..fc9db9986d0207324ab3bb55be5beb4ee4a30258 100644 (file)
--- a/iptables/nft.c
+++ b/iptables/nft.c
@@ -38,10 +38,10 @@
 #include <linux/netfilter/nf_tables_compat.h>
 
 #include <libmnl/libmnl.h>
-#include <libnftables/table.h>
-#include <libnftables/chain.h>
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
+#include <libnftnl/table.h>
+#include <libnftnl/chain.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
 
 #include <netinet/in.h>        /* inet_ntoa */
 #include <arpa/inet.h>

diff --git a/iptables/xtables-config-parser.y b/iptables/xtables-config-parser.y
index 36dae38d6a087797842d593fc5d35be2acf5313d..2770a1b91b928c65bc5f69e6b01627a8c3e91089 100644 (file)
--- a/iptables/xtables-config-parser.y
+++ b/iptables/xtables-config-parser.y
@@ -17,8 +17,8 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <libiptc/linux_list.h>
-#include <libnftables/table.h>
-#include <libnftables/chain.h>
+#include <libnftnl/table.h>
+#include <libnftnl/chain.h>
 
 #include <netinet/in.h>
 #include <linux/netfilter.h>

diff --git a/iptables/xtables-events.c b/iptables/xtables-events.c
index 408e091fe250026ab9fc168677d07d0d73203e1a..4be8ab8cccf9b6711ffb59083bfb033c46ad716d 100644 (file)
--- a/iptables/xtables-events.c
+++ b/iptables/xtables-events.c
@@ -19,9 +19,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>
 
 #include <include/xtables.h>
 #include "iptables.h" /* for xtables_globals */

diff --git a/iptables/xtables-restore.c b/iptables/xtables-restore.c
index 06053f629e04caa9180427b0f44b02e84d46af63..9a80f1ef8b10126a10bcbd0daf254a1dab879901 100644 (file)
--- a/iptables/xtables-restore.c
+++ b/iptables/xtables-restore.c
@@ -16,7 +16,7 @@
 #include "libiptc/libiptc.h"
 #include "xtables-multi.h"
 #include "nft.h"
-#include <libnftables/chain.h>
+#include <libnftnl/chain.h>
 
 #ifdef DEBUG
 #define DEBUGP(x, args...) fprintf(stderr, x, ## args)

diff --git a/iptables/xtables-save.c b/iptables/xtables-save.c
index 990c0fe6cdd878bcfe90bd2e639d3e29dae8d636..77eab149b3a655a3c02a56105a374e6be7311165 100644 (file)
--- a/iptables/xtables-save.c
+++ b/iptables/xtables-save.c
@@ -19,7 +19,7 @@
 #include "xtables-multi.h"
 #include "nft.h"
 
-#include <libnftables/chain.h>
+#include <libnftnl/chain.h>
 
 #ifndef NO_SHARED_LIBS
 #include <dlfcn.h>