From patchwork Sat Apr 13 23:17:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Flavio Leitner X-Patchwork-Id: 1085236 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44hVzT5BhTz9s5c for ; Sun, 14 Apr 2019 09:17:41 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727242AbfDMXRh (ORCPT ); Sat, 13 Apr 2019 19:17:37 -0400 Received: from mail-qt1-f193.google.com ([209.85.160.193]:42930 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727229AbfDMXRg (ORCPT ); Sat, 13 Apr 2019 19:17:36 -0400 Received: by mail-qt1-f193.google.com with SMTP id p20so15317655qtc.9 for ; Sat, 13 Apr 2019 16:17:35 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=7mA+5BJOLfNmgJPuQEwHEEHp7pw0wpbgIJ+UzEsTweU=; b=nVJKfu23VhjapT/8FPMRR2mRetC8OHWQ8Do4JszyRuw9H4sUl8O2YcPQZ/iuO4QWO8 lG82XI4+NjiC6jev3UvD/Lj9ZXMKcjoK48CdFzgPpECkUZP4C2TNq7Zjle2zoeJF8Jer 61jJv8+sqEwvRWVD8aXJRomcBpLBEk9m7lP2ryNxv+iNy2kl0MQzf7F7h3hiyrCwKd+t ZVfLpBtEUssmLk2L2fgkqvNkZTFugI66OJBoeLLGtY/TfFaVJoFiB4ScM7P1GBS5UwlM jkW2OY7AWec4P9VhF/+t76akZJXt517HahzRrGHowUgT1uX6CTT0dSICrEi3vEi8+7OK 7DxA== X-Gm-Message-State: APjAAAVyqKsSCbUcKgovfVrYEkAerHCseivIc/nu5x/5oRpwtqz9jES9 IsJC8tO3y9POnuNL4aD617GaiB+dAwk= X-Google-Smtp-Source: APXvYqxdfu0OvVSLrHNqD1DMxJgybXeoDOhd6PNzk3cJKnMHI8aecE7RKiZwD3rvPSTTyfv2rAvg3Q== X-Received: by 2002:ac8:17f4:: with SMTP id r49mr51660017qtk.213.1555197455240; Sat, 13 Apr 2019 16:17:35 -0700 (PDT) Received: from localhost ([177.183.215.126]) by smtp.gmail.com with ESMTPSA id h29sm29246259qtk.32.2019.04.13.16.17.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 13 Apr 2019 16:17:34 -0700 (PDT) From: Flavio Leitner To: netdev@vger.kernel.org Cc: Joe Stringer , Pravin B Shelar , dev@openvswitch.org, netfilter-devel@vger.kernel.org, Pablo Neira Ayuso Subject: [PATCH net-next v2 3/8] netfilter: nf_nat: register amanda NAT helper. Date: Sat, 13 Apr 2019 20:17:11 -0300 Message-Id: <20190413231716.28711-4-fbl@redhat.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190413231716.28711-1-fbl@redhat.com> References: <20190413231716.28711-1-fbl@redhat.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Flavio Leitner --- net/netfilter/nf_nat_amanda.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) V2 - defined NAT_HELPER_NAME for consistency. - C99 static change. - renamed the variables to be nat_helper.* diff --git a/net/netfilter/nf_nat_amanda.c b/net/netfilter/nf_nat_amanda.c index 6b729a897c5f..4e59416ea709 100644 --- a/net/netfilter/nf_nat_amanda.c +++ b/net/netfilter/nf_nat_amanda.c @@ -19,10 +19,15 @@ #include #include +#define NAT_HELPER_NAME "amanda" + MODULE_AUTHOR("Brian J. Murrell "); MODULE_DESCRIPTION("Amanda NAT helper"); MODULE_LICENSE("GPL"); -MODULE_ALIAS_NF_NAT_HELPER("amanda"); +MODULE_ALIAS_NF_NAT_HELPER(NAT_HELPER_NAME); + +static struct nf_conntrack_nat_helper nat_helper_amanda = + NF_CT_NAT_HELPER_INIT(NAT_HELPER_NAME); static unsigned int help(struct sk_buff *skb, enum ip_conntrack_info ctinfo, @@ -74,6 +79,7 @@ static unsigned int help(struct sk_buff *skb, static void __exit nf_nat_amanda_fini(void) { + nf_nat_helper_unregister(&nat_helper_amanda); RCU_INIT_POINTER(nf_nat_amanda_hook, NULL); synchronize_rcu(); } @@ -81,6 +87,7 @@ static void __exit nf_nat_amanda_fini(void) static int __init nf_nat_amanda_init(void) { BUG_ON(nf_nat_amanda_hook != NULL); + nf_nat_helper_register(&nat_helper_amanda); RCU_INIT_POINTER(nf_nat_amanda_hook, help); return 0; }