From patchwork Thu Jan 4 17:50:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 855755 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zCFhw28rPz9s7c for ; Fri, 5 Jan 2018 04:51:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752550AbeADRvL (ORCPT ); Thu, 4 Jan 2018 12:51:11 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:58325 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752546AbeADRvL (ORCPT ); Thu, 4 Jan 2018 12:51:11 -0500 Received: from mail-qk0-f197.google.com ([209.85.220.197]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1eX9fa-0005vx-76 for netfilter-devel@vger.kernel.org; Thu, 04 Jan 2018 17:51:10 +0000 Received: by mail-qk0-f197.google.com with SMTP id y12so1506430qka.11 for ; Thu, 04 Jan 2018 09:51:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fTMUUpSKbujKshOXySCtVHHQS4ef4TRl04vvI00nEBU=; b=tsatA4uDu0mgl4dnkp7An1JOkQRSlQcfSRjhD1fmXrDidOdwjljjeDB8vYkJImZt8p BaihFgNoJ69Og1TqFuEsZU7jsFKt4T9fLd9I9Pu1cifm7OVyMlBR/6lh58qv7uxMzpBX Wc1W3X2ngWUincvSTfGaUNqNyhToZ/6RHTW1YYSZuOMMfWSXrT3bFgPGwNj10D7M9Nwz 5kqy32uELTF+NWbdwNXSw09A16vFltyAMGxQeHfAYd9fvxJxs16b2LmhLglxEgds5wZi q5mQkEro1PbxrWw4665wBUuYsM6BhapvzW52STxiZdXPs4+Ybj0O+BB99VfzI7ZjoEv9 KSzA== X-Gm-Message-State: AKwxytf9S7qegq67StstSP7Tcf5ZPXzACP11Z+EiNvEIa2lJU1Dp+nnZ 8SOlH+iP47OqPI0kvZ+l+LhS2CTL1LX3Nkm6Q13kLb+CPnF6CIwsfbgEGPRVHGV40izQjbWMRgb 4i1wgOmVKAZxNQajIVsGNWfEUrty8hXdvwBqvCU4ftx0n X-Received: by 10.55.78.143 with SMTP id c137mr525576qkb.122.1515088268993; Thu, 04 Jan 2018 09:51:08 -0800 (PST) X-Google-Smtp-Source: ACJfBovRGjTu+olOiF9OkA1e7SgOr1BSNPAjhheSVSYu83FAIGBTdTK3UN3zDOT/H33CRWf7QuW+qA== X-Received: by 10.55.78.143 with SMTP id c137mr525557qkb.122.1515088268782; Thu, 04 Jan 2018 09:51:08 -0800 (PST) Received: from localhost.localdomain (189-19-122-16.dsl.telesp.net.br. [189.19.122.16]) by smtp.gmail.com with ESMTPSA id g9sm2369432qtg.2.2018.01.04.09.51.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Jan 2018 09:51:07 -0800 (PST) From: Marcelo Henrique Cerri To: netfilter-devel@vger.kernel.org Cc: jengelh@inai.de, Marcelo Henrique Cerri , Seth Forshee Subject: [xtables-addons][PATCH 1/2] build: support for Linux 4.14 Date: Thu, 4 Jan 2018 15:50:49 -0200 Message-Id: <1515088250-32295-2-git-send-email-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515088250-32295-1-git-send-email-marcelo.cerri@canonical.com> References: <1515088250-32295-1-git-send-email-marcelo.cerri@canonical.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Seth Forshee Signed-off-by: Seth Forshee --- extensions/compat_xtables.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h index d8882ac7670a..354884e15e1a 100644 --- a/extensions/compat_xtables.h +++ b/extensions/compat_xtables.h @@ -93,4 +93,8 @@ static inline struct net *par_net(const struct xt_action_param *par) #endif } +#ifndef NF_CT_ASSERT +# define NF_CT_ASSERT(x) WARN_ON(!(x)) +#endif + #endif /* _XTABLES_COMPAT_H */ From patchwork Thu Jan 4 17:50:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 855756 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zCFhy5d75z9s7c for ; Fri, 5 Jan 2018 04:51:14 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752553AbeADRvO (ORCPT ); Thu, 4 Jan 2018 12:51:14 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:58328 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752546AbeADRvN (ORCPT ); Thu, 4 Jan 2018 12:51:13 -0500 Received: from mail-qt0-f200.google.com ([209.85.216.200]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1eX9fc-0005wC-RY for netfilter-devel@vger.kernel.org; Thu, 04 Jan 2018 17:51:12 +0000 Received: by mail-qt0-f200.google.com with SMTP id z37so1533817qtz.16 for ; Thu, 04 Jan 2018 09:51:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WuyxNwcsAdokXSh5ohduaCaSk1dLC6+oWUQd0hHPuCY=; b=KN383gwZg+gSg4YsrZnFGOJ5+ar31kxEUjzoh+AEtLoCKNvRfxRa1NlqDSyoHCtrbv UELSCfEBh90Czu/xB6JrXoZxI35yg5NYofe62u5NlcAyZhsY2lTKyOmi8zHzNOYTwJZ2 XvFtkDYcbL8rCQtErBDiQTjR0Ei0K4sQHcEyQjk9JwWsGMjTxXQmFwHtEsAvZV0/Bsg1 iKvvENS4qbcjsR31Rs8pJfE2cWt9m3kU4n3cwM3rLglkm6wKoj3HwcykTWcCnWzj5U/M glt3n5WTALy+nAwpxpK1YhKbU9d3ex6inPQMheA8qdQml5lNLi6cWBjT5FLn0WObEI4+ 2s5Q== X-Gm-Message-State: AKwxytdMwmvi+P3cyE/DOgCm6RQrgdB08UjMcv30gfWyjfc215mAl4i3 Uz3uBtOig5MEOpuojPh2UBEuR2Q6UVeNlr0lmpQy25R65oB0AZRE8oVO7dvfImrN5b9+ZtPPaL6 vl6HMW1NjQzNUBEAfGGMemkECDibI6nuDKUqWa2dKwlgn X-Received: by 10.200.34.19 with SMTP id o19mr548237qto.52.1515088271640; Thu, 04 Jan 2018 09:51:11 -0800 (PST) X-Google-Smtp-Source: ACJfBou2ohUjk68qtodtHfphxoRzhrRG7t1sdIEZJBZwI1NSmZZPRXGAOPtdnn8f38MouDdFK3KBcQ== X-Received: by 10.200.34.19 with SMTP id o19mr548217qto.52.1515088271449; Thu, 04 Jan 2018 09:51:11 -0800 (PST) Received: from localhost.localdomain (189-19-122-16.dsl.telesp.net.br. [189.19.122.16]) by smtp.gmail.com with ESMTPSA id g9sm2369432qtg.2.2018.01.04.09.51.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Jan 2018 09:51:10 -0800 (PST) From: Marcelo Henrique Cerri To: netfilter-devel@vger.kernel.org Cc: jengelh@inai.de, Marcelo Henrique Cerri Subject: [xtables-addons][PATCH 2/2] build: support for Linux 4.15 Date: Thu, 4 Jan 2018 15:50:50 -0200 Message-Id: <1515088250-32295-3-git-send-email-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515088250-32295-1-git-send-email-marcelo.cerri@canonical.com> References: <1515088250-32295-1-git-send-email-marcelo.cerri@canonical.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Signed-off-by: Marcelo Henrique Cerri --- extensions/pknock/xt_pknock.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/extensions/pknock/xt_pknock.c b/extensions/pknock/xt_pknock.c index 6fbdea43321c..31d4bc8c9584 100644 --- a/extensions/pknock/xt_pknock.c +++ b/extensions/pknock/xt_pknock.c @@ -358,10 +358,20 @@ has_logged_during_this_minute(const struct peer *peer) * @r: rule */ static void -peer_gc(unsigned long r) +peer_gc( +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) + struct timer_list *tl +#else + unsigned long r +#endif +) { unsigned int i; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) + struct xt_pknock_rule *rule = from_timer(rule, tl, timer); +#else struct xt_pknock_rule *rule = (struct xt_pknock_rule *)r; +#endif struct peer *peer; struct list_head *pos, *n; @@ -469,9 +479,13 @@ add_rule(struct xt_pknock_mtinfo *info) if (rule->peer_head == NULL) goto out; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) + timer_setup(&rule->timer, peer_gc, 0); +#else init_timer(&rule->timer); rule->timer.function = peer_gc; rule->timer.data = (unsigned long)rule; +#endif rule->status_proc = proc_create_data(info->rule_name, 0, pde, &pknock_proc_ops, rule);