From patchwork Sat Apr 13 23:17:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Flavio Leitner X-Patchwork-Id: 1085249 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 44hW1l3zsnz9s55 for ; Sun, 14 Apr 2019 09:19:39 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id C30D4C74; Sat, 13 Apr 2019 23:17:40 +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 7BCC9C6C for ; Sat, 13 Apr 2019 23:17:39 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 194FF25A for ; Sat, 13 Apr 2019 23:17:39 +0000 (UTC) Received: by mail-qk1-f195.google.com with SMTP id w20so7829865qka.7 for ; Sat, 13 Apr 2019 16:17:38 -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=4YqoQA1UkymIHs2QggQQy8mZKppILjPtX7G37rkzWK4=; b=jhNXrpiWilA+JIAnUshkBpBzQUAVzAib+V7c5U6kJEp8V7Be/KeU4iuVcbfQs0JgJf OFBOOBROfC4YRmjGZvFmKDwm3N5D2ktTw2jgQKPtSinbyPg/yhkTvVtlh+TAKpmbTbnM teDTAlxr+bYr9ZnjN4ErAEzIG6Xn41xbcgzJsmaJdhCYKcgZauC3b9ZXa+GvKJCCgg2g lcag9I5rjcu7tLZiXHi03rlQWYppmJ2W4wWRsx7R+jzzXc8/t4JlCfppqUCiibNLf6Tn pvxJ3BQYE/kL3fJfMLu6Md/Mrh5zOww+w6K5ELY1GPzgQ/UJeLqiZCQVA9aemKG11m05 56FA== X-Gm-Message-State: APjAAAW8h0a0XQsaKsEO08SXsV/CynCu7/AD1w5j7qs80J0qDxF9KWNl wL+rOqfJjY5DjJo8jl5GnHJCyQ== X-Google-Smtp-Source: APXvYqxCUVTjj3MyqQQ+CsbrfurrUr5+cM+YgM2LfjgSV4sjewVmd4GgES1y5rxSz3tqpd5c7GzKAA== X-Received: by 2002:a05:620a:1646:: with SMTP id c6mr52799759qko.69.1555197458214; Sat, 13 Apr 2019 16:17:38 -0700 (PDT) Received: from localhost ([177.183.215.126]) by smtp.gmail.com with ESMTPSA id t69sm25084650qke.38.2019.04.13.16.17.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 13 Apr 2019 16:17:37 -0700 (PDT) From: Flavio Leitner To: netdev@vger.kernel.org Date: Sat, 13 Apr 2019 20:17:12 -0300 Message-Id: <20190413231716.28711-5-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 4/8] netfilter: nf_nat: register ftp 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_ftp.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_ftp.c b/net/netfilter/nf_nat_ftp.c index 0e93b1f19432..0ea6b1bc52de 100644 --- a/net/netfilter/nf_nat_ftp.c +++ b/net/netfilter/nf_nat_ftp.c @@ -21,13 +21,18 @@ #include #include +#define NAT_HELPER_NAME "ftp" + MODULE_LICENSE("GPL"); MODULE_AUTHOR("Rusty Russell "); MODULE_DESCRIPTION("ftp NAT helper"); -MODULE_ALIAS_NF_NAT_HELPER("ftp"); +MODULE_ALIAS_NF_NAT_HELPER(NAT_HELPER_NAME); /* FIXME: Time out? --RR */ +static struct nf_conntrack_nat_helper nat_helper_ftp = + NF_CT_NAT_HELPER_INIT(NAT_HELPER_NAME); + static int nf_nat_ftp_fmt_cmd(struct nf_conn *ct, enum nf_ct_ftp_type type, char *buffer, size_t buflen, union nf_inet_addr *addr, u16 port) @@ -124,6 +129,7 @@ static unsigned int nf_nat_ftp(struct sk_buff *skb, static void __exit nf_nat_ftp_fini(void) { + nf_nat_helper_unregister(&nat_helper_ftp); RCU_INIT_POINTER(nf_nat_ftp_hook, NULL); synchronize_rcu(); } @@ -131,6 +137,7 @@ static void __exit nf_nat_ftp_fini(void) static int __init nf_nat_ftp_init(void) { BUG_ON(nf_nat_ftp_hook != NULL); + nf_nat_helper_register(&nat_helper_ftp); RCU_INIT_POINTER(nf_nat_ftp_hook, nf_nat_ftp); return 0; }