From: Vadim Kochan <vadim4j@gmail.com>
To: netfilter-devel@vger.kernel.org
Cc: Vadim Kochan <vadim4j@gmail.com>
Subject: [PATCH] Allow to compile for < 3.17 kernel version
Date: Thu, 25 Sep 2014 03:57:04 +0300 [thread overview]
Message-ID: <1411606624-8411-1-git-send-email-vadim4j@gmail.com> (raw)
Added declaration checking for NFT_EXPR_LOG_LEVEL enum
which was added for 3.17 kernel version.
Signed-off-by: Vadim Kochan <vadim4j@gmail.com>
---
configure.ac | 2 ++
src/netlink_delinearize.c | 2 ++
src/netlink_linearize.c | 2 ++
3 files changed, 6 insertions(+)
diff --git a/configure.ac b/configure.ac
index 3a7647f..d3971c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,6 +99,8 @@ AC_TYPE_UINT16_T
AC_TYPE_UINT32_T
AC_TYPE_UINT64_T
+AC_CHECK_DECLS([NFT_EXPR_LOG_LEVEL],[],[],[[#include <libnftnl/expr.h>]])
+
# Checks for library functions.
AC_CHECK_FUNCS([memmove memset strchr strdup strerror strtoull])
diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c
index 796b632..cf2ec00 100644
--- a/src/netlink_delinearize.c
+++ b/src/netlink_delinearize.c
@@ -447,11 +447,13 @@ static void netlink_parse_log(struct netlink_parse_ctx *ctx,
nft_rule_expr_get_u16(nle, NFT_EXPR_LOG_QTHRESHOLD);
stmt->log.flags |= STMT_LOG_QTHRESHOLD;
}
+#if HAVE_DECL_NFT_EXPR_LOG_LEVEL
if (nft_rule_expr_is_set(nle, NFT_EXPR_LOG_LEVEL)) {
stmt->log.level =
nft_rule_expr_get_u32(nle, NFT_EXPR_LOG_LEVEL);
stmt->log.flags |= STMT_LOG_LEVEL;
}
+#endif
list_add_tail(&stmt->list, &ctx->rule->stmts);
}
diff --git a/src/netlink_linearize.c b/src/netlink_linearize.c
index c46b6d4..2b116f9 100644
--- a/src/netlink_linearize.c
+++ b/src/netlink_linearize.c
@@ -586,10 +586,12 @@ static void netlink_gen_log_stmt(struct netlink_linearize_ctx *ctx,
nft_rule_expr_set_u16(nle, NFT_EXPR_LOG_QTHRESHOLD,
stmt->log.qthreshold);
} else {
+#if HAVE_DECL_NFT_EXPR_LOG_LEVEL
if (stmt->log.flags & STMT_LOG_LEVEL) {
nft_rule_expr_set_u32(nle, NFT_EXPR_LOG_LEVEL,
stmt->log.level);
}
+#endif
}
nft_rule_add_expr(ctx->nlr, nle);
}
--
2.1.0
next reply other threads:[~2014-09-25 1:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-25 0:57 Vadim Kochan [this message]
2014-09-25 17:12 ` [PATCH] Allow to compile for < 3.17 kernel version Pablo Neira Ayuso
2014-09-25 17:16 ` Pablo Neira Ayuso
2014-09-25 17:33 ` Vadim Kochan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1411606624-8411-1-git-send-email-vadim4j@gmail.com \
--to=vadim4j@gmail.com \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).