From: Gao feng <gaofeng@cn.fujitsu.com>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [PATCH 3/3] netfilter: {ipt,ebt}_ULOG: rise warning on deprecation
Date: Thu, 23 May 2013 16:59:12 +0800 [thread overview]
Message-ID: <519DDA60.9050505@cn.fujitsu.com> (raw)
In-Reply-To: <1369298557-5351-3-git-send-email-pablo@netfilter.org>
On 05/23/2013 04:42 PM, Pablo Neira Ayuso wrote:
> This target has been superseded by NFLOG. Spot a warning
> so we prepare removal in a couple of years.
>
> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
> ---
> include/net/netns/x_tables.h | 6 ++++++
> net/bridge/netfilter/ebt_ulog.c | 6 ++++++
> net/ipv4/netfilter/Kconfig | 2 +-
> net/ipv4/netfilter/ipt_ULOG.c | 6 ++++++
> 4 files changed, 19 insertions(+), 1 deletion(-)
>
> diff --git a/include/net/netns/x_tables.h b/include/net/netns/x_tables.h
> index c24060e..02fe40f 100644
> --- a/include/net/netns/x_tables.h
> +++ b/include/net/netns/x_tables.h
> @@ -15,5 +15,11 @@ struct netns_xt {
> struct ebt_table *frame_filter;
> struct ebt_table *frame_nat;
> #endif
> +#if IS_ENABLED(CONFIG_IP_NF_TARGET_ULOG)
> + bool ulog_warn_deprecated;
> +#endif
> +#if IS_ENABLED(CONFIG_BRIDGE_EBT_ULOG)
> + bool ebt_ulog_warn_deprecated;
> +#endif
> };
> #endif
> diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c
> index fc1905c..bfc40c7 100644
> --- a/net/bridge/netfilter/ebt_ulog.c
> +++ b/net/bridge/netfilter/ebt_ulog.c
> @@ -267,6 +267,12 @@ static int ebt_ulog_tg_check(const struct xt_tgchk_param *par)
> {
> struct ebt_ulog_info *uloginfo = par->targinfo;
>
> + if (!par->net->nf.ebt_ulog_warn_deprecated) {
par->net->xt.ebt_ulog_warn_deprecated?
anyway
Acked-by: Gao feng <gaofeng@cn.fujitsu.com>
> + pr_info("ebt_ulog is deprecated and it will be removed soon, "
> + "use ebt_nflog instead\n");
> + par->net->nf.ebt_ulog_warn_deprecated = true;
> + }
> +
> if (uloginfo->nlgroup > 31)
> return -EINVAL;
>
> diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
> index e7916c1..4e90280 100644
> --- a/net/ipv4/netfilter/Kconfig
> +++ b/net/ipv4/netfilter/Kconfig
> @@ -111,7 +111,7 @@ config IP_NF_TARGET_REJECT
> To compile it as a module, choose M here. If unsure, say N.
>
> config IP_NF_TARGET_ULOG
> - tristate "ULOG target support"
> + tristate "ULOG target support (obsolete)"
> default m if NETFILTER_ADVANCED=n
> ---help---
>
> diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c
> index f8a222cb..c1953d0 100644
> --- a/net/ipv4/netfilter/ipt_ULOG.c
> +++ b/net/ipv4/netfilter/ipt_ULOG.c
> @@ -325,6 +325,12 @@ static int ulog_tg_check(const struct xt_tgchk_param *par)
> {
> const struct ipt_ulog_info *loginfo = par->targinfo;
>
> + if (!par->net->xt.ulog_warn_deprecated) {
> + pr_info("ULOG is deprecated and it will be removed soon, "
> + "use NFLOG instead\n");
> + par->net->xt.ulog_warn_deprecated = true;
> + }
> +
> if (loginfo->prefix[sizeof(loginfo->prefix) - 1] != '\0') {
> pr_debug("prefix not null-terminated\n");
> return -EINVAL;
>
next prev parent reply other threads:[~2013-05-23 8:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-23 8:42 [PATCH 1/3] netfilter: ctnetlink: attach expectations to unconfirmed conntracks Pablo Neira Ayuso
2013-05-23 8:42 ` [PATCH 2/3] netfilter: don't panic on error while walking through the init path Pablo Neira Ayuso
2013-05-23 8:50 ` Gao feng
2013-05-23 11:09 ` Pablo Neira Ayuso
2013-05-23 8:42 ` [PATCH 3/3] netfilter: {ipt,ebt}_ULOG: rise warning on deprecation Pablo Neira Ayuso
2013-05-23 8:59 ` Gao feng [this message]
2013-05-23 11:09 ` Pablo Neira Ayuso
2013-05-23 9:34 ` [PATCH 1/3] netfilter: ctnetlink: attach expectations to unconfirmed conntracks Gao feng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=519DDA60.9050505@cn.fujitsu.com \
--to=gaofeng@cn.fujitsu.com \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).