From patchwork Tue Mar 26 20:57:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Flavio Leitner X-Patchwork-Id: 1066078 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=none (p=none dis=none) header.from=sysclose.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=sysclose.org header.i=fbl@sysclose.org header.b="ZH15r7Tw"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44TNkV3lHbz9sV0 for ; Wed, 27 Mar 2019 07:57:54 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732816AbfCZU5x (ORCPT ); Tue, 26 Mar 2019 16:57:53 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21049 "EHLO sender-of-o51.zoho.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732716AbfCZU5x (ORCPT ); Tue, 26 Mar 2019 16:57:53 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1553633862; cv=none; d=zoho.com; s=zohoarc; b=FLk8JtK/xCESA3ttOF+m6FYVW4F4VhaMBmyuzuhFvFHu+w5bMCO5L8xdBYmBvLN0U2CLBQTP6POXk9pRgZOocFqQcLG+UubNATudhRPqpyF+0fl5cmwS4Rp5d7ocIssembhCRN7sjHJ3PtEjuD59PTrro+V3EliO6uORbGKVXqg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1553633862; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To:ARC-Authentication-Results; bh=RdX7ooXWtC5qFGmUTdLbejQooqCsggbQuPGxptJT6+U=; b=bYjnDNhCNsQRRoTFrQah0Sc1GBa40A4kFEvYLnCedeWFpkob6vnodhBDbyYdEzmcGaExSaFOM+TRLIfepoNHWNfWI6jz537X4CYSpOcN7i81GVzmgxmcjOWWStbnaq1fpToBvaf22EAV4e+hXgCthFwRQpUKOzfrhncM44Em/kA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass header.i=sysclose.org; spf=pass smtp.mailfrom=fbl@sysclose.org; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1553633862; s=zoho; d=sysclose.org; i=fbl@sysclose.org; h=From:To:Cc:Message-ID:Subject:Date:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Content-Type; l=1323; bh=RdX7ooXWtC5qFGmUTdLbejQooqCsggbQuPGxptJT6+U=; b=ZH15r7Tw+CbgUUmHFf2KhIAFnpTEulTfn92e/gJgzjh+HXdvXKQWvc99hLLwOXOm 2gvfcBvCTfNK0ccFxgX1p8blnYTc5eSYIlhaSHc6dc9Hmfw7olCqD06NrtdMtksO0x8 HF0IjpGnaV1wD0lb9nROL+9qZeNUhS8NjA/oRo2o= Received: from localhost (177.183.215.126 [177.183.215.126]) by mx.zohomail.com with SMTPS id 155363385995557.87658927428356; Tue, 26 Mar 2019 13:57:39 -0700 (PDT) From: Flavio Leitner To: netdev@vger.kernel.org Cc: Joe Stringer , Pravin B Shelar , dev@openvswitch.org, netfilter-devel@vger.kernel.org Message-ID: <20190326205715.22288-4-fbl@sysclose.org> Subject: [PATCH net-next 3/8] netfilter: nf_nat: register amanda NAT helper. Date: Tue, 26 Mar 2019 17:57:10 -0300 X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190326205715.22288-1-fbl@sysclose.org> References: <20190326205715.22288-1-fbl@sysclose.org> MIME-Version: 1.0 X-ZohoMailClient: External 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 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/net/netfilter/nf_nat_amanda.c b/net/netfilter/nf_nat_amanda.c index e87075763f73..344096418224 100644 --- a/net/netfilter/nf_nat_amanda.c +++ b/net/netfilter/nf_nat_amanda.c @@ -24,6 +24,8 @@ MODULE_DESCRIPTION("Amanda NAT helper"); MODULE_LICENSE("GPL"); MODULE_ALIAS_NFCT_HELPER_NAT("amanda"); +static struct nf_conntrack_helper_nat helper_nat_amanda; + static unsigned int help(struct sk_buff *skb, enum ip_conntrack_info ctinfo, unsigned int protoff, @@ -74,6 +76,7 @@ static unsigned int help(struct sk_buff *skb, static void __exit nf_nat_amanda_fini(void) { + nf_conntrack_helper_nat_unregister(&helper_nat_amanda); RCU_INIT_POINTER(nf_nat_amanda_hook, NULL); synchronize_rcu(); } @@ -81,6 +84,10 @@ static void __exit nf_nat_amanda_fini(void) static int __init nf_nat_amanda_init(void) { BUG_ON(nf_nat_amanda_hook != NULL); + nf_ct_helper_nat_init(&helper_nat_amanda, + NF_CT_NAT_HELPER_MOD_NAME("amanda"), + THIS_MODULE); + nf_conntrack_helper_nat_register(&helper_nat_amanda); RCU_INIT_POINTER(nf_nat_amanda_hook, help); return 0; }