Commit f330a7fdbe1611104622faff7e614a246a7d20f0 (netfilter: conntrack: get rid of conntrack timer) replaces timer_list with an u32, use helper from commit c8607e020014cf11a61601a0005270bad81cabdf (netfilter: nft_ct: fix expiration getter).
Signed-off-by: Ralph Sennhauser <[email protected]> --- extensions/xt_LOGMARK.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/extensions/xt_LOGMARK.c b/extensions/xt_LOGMARK.c index 271931b..7616962 100644 --- a/extensions/xt_LOGMARK.c +++ b/extensions/xt_LOGMARK.c @@ -58,8 +58,12 @@ static void logmark_ct(const struct nf_conn *ct, enum ip_conntrack_info ctinfo) printk("%s""ASSURED", prev++ ? "," : ""); if (ct->status & IPS_CONFIRMED) printk("%s""CONFIRMED", prev++ ? "," : ""); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0) + printk(" lifetime=%lus", nf_ct_expires(ct) / HZ); +#else printk(" lifetime=%lus", (jiffies - ct->timeout.expires) / HZ); +#endif } static unsigned int -- 2.7.3 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
