From patchwork Sat Apr 13 23:17:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Flavio Leitner X-Patchwork-Id: 1085238 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 44hVzY5q6bz9s55 for ; Sun, 14 Apr 2019 09:17:45 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727279AbfDMXRn (ORCPT ); Sat, 13 Apr 2019 19:17:43 -0400 Received: from mail-qk1-f195.google.com ([209.85.222.195]:38086 "EHLO mail-qk1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727263AbfDMXRm (ORCPT ); Sat, 13 Apr 2019 19:17:42 -0400 Received: by mail-qk1-f195.google.com with SMTP id g1so7834972qki.5 for ; Sat, 13 Apr 2019 16:17:41 -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=htlvsUl58UfZNWzgkPeIauIOJmmQeGQkqXTt/EdnjjE=; b=srLjnU0YOBonsWKZ6odFmVB6Ux1z8tczFmN4//Q/TCeUKruiG73nJhHtQbpWS6aumw Z3E4sf+4ma46XOJCful6oohFttmbgydehvL561LbiVdaTyCVphhXmh3SiGC6jcpcwqnc PC1eQ24KEu3zbvQWaaEH6TBwvgeSj+gjJunthJsdvJdhPE8L13hSOv5Qm5tZ9BEjBYg3 rShi406geSL2Om3mOoYrJFiL/x5v8DeGDgUpMpAAlXT/YEhBDnNq68pPnvCFlKoj9JGe njm7n2GOfcMVVjZQYtDyBOUFdbqqzkAYfNJ+p14AJT1XfdIOIbJZLz/+WleTDBzU3EIX nNbg== X-Gm-Message-State: APjAAAXYypXiH9NArv9YH35nJLaRviGnbFNubq5oM+CWFhom7t7t6bKS XBMdYBjPeawxnG32JqYaacow7L+U17M= X-Google-Smtp-Source: APXvYqzpAXr0KeTyldyKJC+0VaDhf8Jh/Cpe3Vxg9V5njSlEgIl0CE3ir/LWLRCbrHEJfJOGpUelAw== X-Received: by 2002:a05:620a:11:: with SMTP id j17mr51585630qki.111.1555197461178; Sat, 13 Apr 2019 16:17:41 -0700 (PDT) Received: from localhost ([177.183.215.126]) by smtp.gmail.com with ESMTPSA id m41sm29828364qtb.58.2019.04.13.16.17.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 13 Apr 2019 16:17:40 -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 5/8] netfilter: nf_nat: register irc NAT helper. Date: Sat, 13 Apr 2019 20:17:13 -0300 Message-Id: <20190413231716.28711-6-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_irc.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_irc.c b/net/netfilter/nf_nat_irc.c index 6c06e997395f..d87cbe5e03ec 100644 --- a/net/netfilter/nf_nat_irc.c +++ b/net/netfilter/nf_nat_irc.c @@ -23,10 +23,15 @@ #include #include +#define NAT_HELPER_NAME "irc" + MODULE_AUTHOR("Harald Welte "); MODULE_DESCRIPTION("IRC (DCC) NAT helper"); MODULE_LICENSE("GPL"); -MODULE_ALIAS_NF_NAT_HELPER("irc"); +MODULE_ALIAS_NF_NAT_HELPER(NAT_HELPER_NAME); + +static struct nf_conntrack_nat_helper nat_helper_irc = + NF_CT_NAT_HELPER_INIT(NAT_HELPER_NAME); static unsigned int help(struct sk_buff *skb, enum ip_conntrack_info ctinfo, @@ -96,6 +101,7 @@ static unsigned int help(struct sk_buff *skb, static void __exit nf_nat_irc_fini(void) { + nf_nat_helper_unregister(&nat_helper_irc); RCU_INIT_POINTER(nf_nat_irc_hook, NULL); synchronize_rcu(); } @@ -103,6 +109,7 @@ static void __exit nf_nat_irc_fini(void) static int __init nf_nat_irc_init(void) { BUG_ON(nf_nat_irc_hook != NULL); + nf_nat_helper_register(&nat_helper_irc); RCU_INIT_POINTER(nf_nat_irc_hook, help); return 0; }