From patchwork Sat Apr 13 23:17:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Flavio Leitner X-Patchwork-Id: 1085242 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 44hVzg4g4Yz9s55 for ; Sun, 14 Apr 2019 09:17:51 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727263AbfDMXRt (ORCPT ); Sat, 13 Apr 2019 19:17:49 -0400 Received: from mail-qt1-f193.google.com ([209.85.160.193]:45973 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727286AbfDMXRr (ORCPT ); Sat, 13 Apr 2019 19:17:47 -0400 Received: by mail-qt1-f193.google.com with SMTP id v20so15299327qtv.12 for ; Sat, 13 Apr 2019 16:17:47 -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=irbwC3lTivW5B2mREALIDAkZHTP4aRfG1KgtR00sTg4=; b=Kh8egbreD2/UUV5l/R65bVynIgch9gycp+MNZYTwmpHzON4vDsX9cvFVmPrVVgP8HJ dXDUELHMJCTi3/FL27ciis2mGgKLIC3uGFHXWkF7zA4D9Nv67TtoeAOkofSm5i3bNLYG vVcg1k1VsyobP+srhaIplA5qvox7Rts6HfSKPK5utJro+fOAxKo0TYY/XFTbNjmX5eh9 +xrQ2G6+cdJ/QXJiO1w2jkITEvgWeX+spbFiBl+gHuPbsNmk6zOze6xVjHKSEY26LPGu oKE4yd20FS/wVG1P8E7Rd1VOZqm6faOORppqCCdLoiPbbuT8tXgS0s4d1lZlJ9yE7p9L FUDg== X-Gm-Message-State: APjAAAVmc2hz2MTuvLkcOw6jHnzpefCkK+dhGT5hni8KU0oVwn4AS6sT oORLOetvcmAbpY1yyY3+kYbsdy7MzOo= X-Google-Smtp-Source: APXvYqy1kiGUq86FAxFGq5uoclmikTJxuueQowyM/sNyrbt7jUWwgpJI8HLUXv+fvZHUWfzmUtuvcw== X-Received: by 2002:ac8:26e7:: with SMTP id 36mr54189752qtp.37.1555197466951; Sat, 13 Apr 2019 16:17:46 -0700 (PDT) Received: from localhost ([177.183.215.126]) by smtp.gmail.com with ESMTPSA id d34sm32905749qta.18.2019.04.13.16.17.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 13 Apr 2019 16:17:46 -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 7/8] netfilter: nf_nat: register tftp NAT helper. Date: Sat, 13 Apr 2019 20:17:15 -0300 Message-Id: <20190413231716.28711-8-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_tftp.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_tftp.c b/net/netfilter/nf_nat_tftp.c index dd3a835c111d..e633b3863e33 100644 --- a/net/netfilter/nf_nat_tftp.c +++ b/net/netfilter/nf_nat_tftp.c @@ -13,10 +13,15 @@ #include #include +#define NAT_HELPER_NAME "tftp" + MODULE_AUTHOR("Magnus Boden "); MODULE_DESCRIPTION("TFTP NAT helper"); MODULE_LICENSE("GPL"); -MODULE_ALIAS_NF_NAT_HELPER("tftp"); +MODULE_ALIAS_NF_NAT_HELPER(NAT_HELPER_NAME); + +static struct nf_conntrack_nat_helper nat_helper_tftp = + NF_CT_NAT_HELPER_INIT(NAT_HELPER_NAME); static unsigned int help(struct sk_buff *skb, enum ip_conntrack_info ctinfo, @@ -37,6 +42,7 @@ static unsigned int help(struct sk_buff *skb, static void __exit nf_nat_tftp_fini(void) { + nf_nat_helper_unregister(&nat_helper_tftp); RCU_INIT_POINTER(nf_nat_tftp_hook, NULL); synchronize_rcu(); } @@ -44,6 +50,7 @@ static void __exit nf_nat_tftp_fini(void) static int __init nf_nat_tftp_init(void) { BUG_ON(nf_nat_tftp_hook != NULL); + nf_nat_helper_register(&nat_helper_tftp); RCU_INIT_POINTER(nf_nat_tftp_hook, help); return 0; }