From patchwork Tue Mar 26 20:57:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Flavio Leitner X-Patchwork-Id: 1066094 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=none (p=none dis=none) header.from=sysclose.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sysclose.org header.i=fbl@sysclose.org header.b="Qsg8oikb"; dkim-atps=neutral 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 44TNms3nfGz9sV0 for ; Wed, 27 Mar 2019 07:59:57 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 15413E9A; Tue, 26 Mar 2019 20:58:00 +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 2EF61E71 for ; Tue, 26 Mar 2019 20:57:58 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from sender-of-o51.zoho.com (sender-of-o51.zoho.com [135.84.80.216]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id CCB3595E for ; Tue, 26 Mar 2019 20:57:57 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; t=1553633865; cv=none; d=zoho.com; s=zohoarc; b=FdcQ3LEkkS40NRDrFE5KfVRS4trKS0Xl49Vvsdzn+W+JkLX26uQ6p+3H8fa8HQYaFTa1+HLBefVJv6nLyB2GkrW8w5zKzJ3ZZKHtgybvroBEcEOclJbhQBipvzT0XpLWtQnRq0f3MrcxAN4VndhRlJb/srnuJNDyVVZ3Xjq0T1M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1553633865; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To:ARC-Authentication-Results; bh=J6R9zZ05Q66AkfnJKfT/JAzkD7QhX0GqMJjcriAtjqc=; b=mykDU3oN9tUWS1d+iU6H7oQTA9ANNpCq2ju+I5SzcE5JjvPeQPEJzvtXWfZFwD6QwaJlHalvhlSiekXOPAGI+dCvgfLIJbEwlbo4vuqqOt3AMDc9kxHTJAnLgBHhsP/3kVtjYy2b+nVe3hK1fE5cWD+ad3382KyqLgvYL7+ANb8= 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=1553633865; 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=1286; bh=J6R9zZ05Q66AkfnJKfT/JAzkD7QhX0GqMJjcriAtjqc=; b=Qsg8oikbhMgyYLtXxOcNBprsgMhwfPUZNkMKNcclcum2/BSxz0Nq+jwHsZC4ENer tOXcR7rfnb9CaqUaICbPan8l10z4iqb2mXGpbO16PmpOX7F7r8IpuPNVN8PODjAwHun 2PQFxSOUAq2qlnf5JK6WhLblEJ/FtpR201S7RN/I= Received: from localhost (177.183.215.126 [177.183.215.126]) by mx.zohomail.com with SMTPS id 1553633863691345.20847182481066; Tue, 26 Mar 2019 13:57:43 -0700 (PDT) From: Flavio Leitner To: netdev@vger.kernel.org Message-ID: <20190326205715.22288-5-fbl@sysclose.org> Date: Tue, 26 Mar 2019 17:57:11 -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 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, 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 Subject: [ovs-dev] [PATCH net-next 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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/netfilter/nf_nat_ftp.c b/net/netfilter/nf_nat_ftp.c index 19f5739fd5e2..70fddcddad54 100644 --- a/net/netfilter/nf_nat_ftp.c +++ b/net/netfilter/nf_nat_ftp.c @@ -28,6 +28,8 @@ MODULE_ALIAS_NFCT_HELPER_NAT("ftp"); /* FIXME: Time out? --RR */ +static struct nf_conntrack_helper_nat helper_nat_ftp; + 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 +126,7 @@ static unsigned int nf_nat_ftp(struct sk_buff *skb, static void __exit nf_nat_ftp_fini(void) { + nf_conntrack_helper_nat_unregister(&helper_nat_ftp); RCU_INIT_POINTER(nf_nat_ftp_hook, NULL); synchronize_rcu(); } @@ -131,6 +134,9 @@ static void __exit nf_nat_ftp_fini(void) static int __init nf_nat_ftp_init(void) { BUG_ON(nf_nat_ftp_hook != NULL); + nf_ct_helper_nat_init(&helper_nat_ftp, + NF_CT_NAT_HELPER_MOD_NAME("ftp"), THIS_MODULE); + nf_conntrack_helper_nat_register(&helper_nat_ftp); RCU_INIT_POINTER(nf_nat_ftp_hook, nf_nat_ftp); return 0; }