summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArturo Borrero <arturo.borrero.glez@gmail.com>2013-11-28 12:30:10 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2013-11-30 22:15:38 +0100
commit9f9a271267b9ce97cf6fd30016a56441c889cb87 (patch)
treeb808430b8d9593edeefdea170158d86f51ee44df
parentc4aa230b728c1e09526f0a49caf57e7ce4e33a87 (diff)
tests: expr-target: fix deprecation warning
This fixes the following warning: In file included from nft-expr_target-test.c:19:0: /usr/include/linux/netfilter_ipv4/ipt_LOG.h:4:2: warning: #warning "Please update iptables, this file will be removed soon!" [-Wcpp] Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--include/linux/netfilter/Makefile.am2
-rw-r--r--include/linux/netfilter/xt_LOG.h19
-rw-r--r--tests/nft-expr_target-test.c6
3 files changed, 23 insertions, 4 deletions
diff --git a/include/linux/netfilter/Makefile.am b/include/linux/netfilter/Makefile.am
index 442463c..a349b91 100644
--- a/include/linux/netfilter/Makefile.am
+++ b/include/linux/netfilter/Makefile.am
@@ -1 +1 @@
-noinst_HEADERS = nfnetlink.h nf_tables.h nf_tables_compat.h
+noinst_HEADERS = nfnetlink.h nf_tables.h nf_tables_compat.h xt_LOG.h
diff --git a/include/linux/netfilter/xt_LOG.h b/include/linux/netfilter/xt_LOG.h
new file mode 100644
index 0000000..cac0790
--- /dev/null
+++ b/include/linux/netfilter/xt_LOG.h
@@ -0,0 +1,19 @@
+#ifndef _XT_LOG_H
+#define _XT_LOG_H
+
+/* make sure not to change this without changing nf_log.h:NF_LOG_* (!) */
+#define XT_LOG_TCPSEQ 0x01 /* Log TCP sequence numbers */
+#define XT_LOG_TCPOPT 0x02 /* Log TCP options */
+#define XT_LOG_IPOPT 0x04 /* Log IP options */
+#define XT_LOG_UID 0x08 /* Log UID owning local socket */
+#define XT_LOG_NFLOG 0x10 /* Unsupported, don't reuse */
+#define XT_LOG_MACDECODE 0x20 /* Decode MAC header */
+#define XT_LOG_MASK 0x2f
+
+struct xt_log_info {
+ unsigned char level;
+ unsigned char logflags;
+ char prefix[30];
+};
+
+#endif /* _XT_LOG_H */
diff --git a/tests/nft-expr_target-test.c b/tests/nft-expr_target-test.c
index 3d0368f..7bde348 100644
--- a/tests/nft-expr_target-test.c
+++ b/tests/nft-expr_target-test.c
@@ -16,7 +16,7 @@
#include <netinet/ip.h>
#include <linux/netfilter/nf_tables.h>
#include <linux/netfilter/xt_iprange.h>
-#include <linux/netfilter_ipv4/ipt_LOG.h>
+#include <linux/netfilter/xt_LOG.h>
#include <libmnl/libmnl.h>
#include <libnftables/rule.h>
#include <libnftables/expr.h>
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
struct nft_rule *a, *b;
struct nft_rule_expr *ex;
struct nlmsghdr *nlh;
- struct ipt_log_info *info;
+ struct xt_log_info *info;
char buf[4096];
struct nft_rule_expr_iter *iter_a, *iter_b;
struct nft_rule_expr *rule_a, *rule_b;
@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
nft_rule_expr_set(ex, NFT_EXPR_TG_NAME, "test", strlen("test"));
nft_rule_expr_set_u32(ex, NFT_EXPR_TG_REV, 0x12345678);
- info = calloc(1, sizeof(struct ipt_log_info));
+ info = calloc(1, sizeof(struct xt_log_info));
if (info == NULL)
print_err("OOM");
sprintf(info->prefix, "test: ");