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: 1085252 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44hW301Pfjz9s55 for ; Sun, 14 Apr 2019 09:20:44 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 943CCCA0; Sat, 13 Apr 2019 23:17:49 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 3A7F6B8A for ; Sat, 13 Apr 2019 23:17:48 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id D009425A for ; Sat, 13 Apr 2019 23:17:47 +0000 (UTC) Received: by mail-qt1-f193.google.com with SMTP id k14so15396238qtb.0 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=e7yFwpDiBdq1oJh+qOTgJxZsLloITRAUpRX55b3NJ13HPjKmWA8H+gSZ000321EWh1 ZiCXIG1AFfO3yk4xQxkM9vZNhb1qJUBULaS/WUa6Y9TuC6hOiABZp9gh2b6oHxA+lXj/ h8l2SckuPKn1JSOgZ4LQL/gaH/5aUixR/lesdaiDn47jVfNqmfL4TiUhqqORWAI7iNaO 8ZdLwHveNOYU1Jom9h84cvzA+ow6V+PX2QhzmFf5dFm26zymovZMu7E305jDZ5OIe06w 4L5w8ArVziXckVVi+QvB7TJP7374QvlTBt8z5QA58wvMLNMDoYUid97/FFPgGaYWZc/0 SNDQ== X-Gm-Message-State: APjAAAVId8ybf8GT+JunvYbAs+VdLhFCOZUA/Gi0wSR864SU8ostqZ21 NzA0NGjXhdiWTlkOSVluAQkpzA== 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 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 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: dev@openvswitch.org, netfilter-devel@vger.kernel.org, Pablo Neira Ayuso Subject: [ovs-dev] [PATCH net-next v2 7/8] netfilter: nf_nat: register tftp NAT helper. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.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; }