From patchwork Tue Mar 26 20:57:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Flavio Leitner X-Patchwork-Id: 1066087 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="AsUT3jtU"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44TNkt0JnBz9sV0 for ; Wed, 27 Mar 2019 07:58:13 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732861AbfCZU6M (ORCPT ); Tue, 26 Mar 2019 16:58:12 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21090 "EHLO sender-of-o51.zoho.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732716AbfCZU6M (ORCPT ); Tue, 26 Mar 2019 16:58:12 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1553633875; cv=none; d=zoho.com; s=zohoarc; b=h5GNb6PJpRr7g2FRN5tRcZh7VFBopn7H9VLGZJJQpE48G9q0BekBT8sLKTGQvZsCbG493Aw+pHWvs6oFXnm5E1Mbf90TSTpmE7ELVzq9cNWjJ3WbM+GGsVpIZ42+wf8wgja6nHsGRMfm+BgE/S873uXilejHqzYl4KzBN4zFo3s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1553633875; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To:ARC-Authentication-Results; bh=ih8YfcFgGDhETgyWDDz6NzCR2DlozE6kgWZ8CcCFebI=; b=UdAhmYPQdrsOok3tddl4QOEabXIsyZpce9144T0sbAFFJPc1D6ENAPfcXS7wKYuZL2i29D4UwKHAujCstZK5T3yWLm2S1nJYQrcPAOnXwEiuguE4RwO7CFCXR1uNE3sluRvHa7DvBMtYfz7YHdA2LTVyPUwsywKrkk5ehdg8QAU= 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=1553633875; 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=1284; bh=ih8YfcFgGDhETgyWDDz6NzCR2DlozE6kgWZ8CcCFebI=; b=AsUT3jtUqULOUqIp4i+viSDizgq60ap1rz/1Wyq/iqYwa6R2lXuK1zHW6kIkh09l zm0ApVTYCBIHbIZKTb+fcwRIUzAAqA0+g+eRs94efspSnFaJeY27nTXVomBDBER9Prc dIFFjcU3f++eN8LzpQLtuCUPiRZh5ioAnzQzOV+g= Received: from localhost (177.183.215.126 [177.183.215.126]) by mx.zohomail.com with SMTPS id 1553633875378775.6491236271501; Tue, 26 Mar 2019 13:57:55 -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-8-fbl@sysclose.org> Subject: [PATCH net-next 7/8] netfilter: nf_nat: register tftp NAT helper. Date: Tue, 26 Mar 2019 17:57:14 -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_tftp.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/netfilter/nf_nat_tftp.c b/net/netfilter/nf_nat_tftp.c index 51673aa6e1dc..5a7af30e3e02 100644 --- a/net/netfilter/nf_nat_tftp.c +++ b/net/netfilter/nf_nat_tftp.c @@ -18,6 +18,8 @@ MODULE_DESCRIPTION("TFTP NAT helper"); MODULE_LICENSE("GPL"); MODULE_ALIAS_NFCT_HELPER_NAT("tftp"); +static struct nf_conntrack_helper_nat helper_nat_tftp; + static unsigned int help(struct sk_buff *skb, enum ip_conntrack_info ctinfo, struct nf_conntrack_expect *exp) @@ -37,6 +39,7 @@ static unsigned int help(struct sk_buff *skb, static void __exit nf_nat_tftp_fini(void) { + nf_conntrack_helper_nat_unregister(&helper_nat_tftp); RCU_INIT_POINTER(nf_nat_tftp_hook, NULL); synchronize_rcu(); } @@ -44,6 +47,9 @@ static void __exit nf_nat_tftp_fini(void) static int __init nf_nat_tftp_init(void) { BUG_ON(nf_nat_tftp_hook != NULL); + nf_ct_helper_nat_init(&helper_nat_tftp, + NF_CT_NAT_HELPER_MOD_NAME("tftp"), THIS_MODULE); + nf_conntrack_helper_nat_register(&helper_nat_tftp); RCU_INIT_POINTER(nf_nat_tftp_hook, help); return 0; }