From ee8da2b1acd53404cc20a6b5620e72664f711b44 Mon Sep 17 00:00:00 2001 From: Ralph Sennhauser Date: Sun, 14 May 2017 18:16:11 +0200 Subject: [PATCH] build: support for Linux 4.12 As a result of commit cc41c84b7e7f ("netfilter: kill the fake untracked conntrack objects") the helper nf_ct_is_untracked always returns false and commit ab8bc7ed864b ("netfilter: remove nf_ct_is_untracked") removes it all together. Signed-off-by: Ralph Sennhauser --- configure.ac | 2 +- extensions/xt_LOGMARK.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 4df956f..5add822 100644 --- a/configure.ac +++ b/configure.ac @@ -57,7 +57,7 @@ if test -n "$kbuilddir"; then echo "WARNING: Version detection did not succeed. Continue at own luck."; else echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir"; - if test "$kmajor" -gt 4 -o "$kmajor" -eq 4 -a "$kminor" -gt 10; then + if test "$kmajor" -gt 4 -o "$kmajor" -eq 4 -a "$kminor" -gt 12; then echo "WARNING: That kernel version is not officially supported yet. Continue at own luck."; elif test "$kmajor" -eq 4 -a "$kminor" -le 10; then :; diff --git a/extensions/xt_LOGMARK.c b/extensions/xt_LOGMARK.c index ed14604..6c00d1d 100644 --- a/extensions/xt_LOGMARK.c +++ b/extensions/xt_LOGMARK.c @@ -87,8 +87,10 @@ logmark_tg(struct sk_buff *skb, const struct xt_action_param *par) printk(" ctdir=%s", dir_names[ctinfo >= IP_CT_IS_REPLY]); if (ct == NULL) printk(" ct=NULL ctmark=NULL ctstate=INVALID ctstatus=NONE"); +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) else if (nf_ct_is_untracked(ct)) printk(" ct=UNTRACKED ctmark=NULL ctstate=UNTRACKED ctstatus=NONE"); +#endif else logmark_ct(ct, ctinfo);