From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Liping Zhang <zlpnobody@163.com>
Cc: netfilter-devel@vger.kernel.org,
Liping Zhang <liping.zhang@spreadtrum.com>
Subject: Re: [PATCH nf-next 1/4] netfilter: nf_log: handle NFPROTO_INET properly in nf_logger_[find_get|put]
Date: Thu, 23 Jun 2016 13:22:05 +0200 [thread overview]
Message-ID: <20160623112205.GA2873@salvia> (raw)
In-Reply-To: <1465389800-27842-2-git-send-email-zlpnobody@163.com>
On Wed, Jun 08, 2016 at 08:43:17PM +0800, Liping Zhang wrote:
> From: Liping Zhang <liping.zhang@spreadtrum.com>
>
> When we request NFPROTO_INET, it means both NFPROTO_IPV4 and NFPROTO_IPV6.
>
> Signed-off-by: Liping Zhang <liping.zhang@spreadtrum.com>
> ---
> net/netfilter/nf_log.c | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
>
> diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
> index a5d41df..73b845d 100644
> --- a/net/netfilter/nf_log.c
> +++ b/net/netfilter/nf_log.c
> @@ -159,6 +159,20 @@ int nf_logger_find_get(int pf, enum nf_log_type type)
> struct nf_logger *logger;
> int ret = -ENOENT;
>
> + if (pf == NFPROTO_INET) {
> + ret = nf_logger_find_get(NFPROTO_IPV4, type);
> + if (ret < 0)
> + return ret;
> +
> + ret = nf_logger_find_get(NFPROTO_IPV6, type);
> + if (ret < 0) {
> + nf_logger_put(NFPROTO_IPV4, type);
> + return ret;
> + }
> +
> + return 0;
This is already done from nft_log_init().
Are you observing any problem there?
next prev parent reply other threads:[~2016-06-23 11:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-08 12:43 [PATCH nf-next 0/4] netfilter: request related nf_log module when we add TRACE rule Liping Zhang
2016-06-08 12:43 ` [PATCH nf-next 1/4] netfilter: nf_log: handle NFPROTO_INET properly in nf_logger_[find_get|put] Liping Zhang
2016-06-23 11:22 ` Pablo Neira Ayuso [this message]
2016-06-23 11:23 ` Pablo Neira Ayuso
2016-06-08 12:43 ` [PATCH nf-next 2/4] netfilter: nft_log: no need to deal with NFPROTO_INET family Liping Zhang
2016-06-08 12:43 ` [PATCH nf-next 3/4] netfilter: xt_TRACE: add explicitly nf_logger_find_get call Liping Zhang
2016-06-08 13:00 ` Florian Westphal
2016-06-23 17:26 ` Pablo Neira Ayuso
2016-06-08 12:43 ` [PATCH nf-next 4/4] netfilter: nft_meta: " Liping Zhang
2016-06-08 12:59 ` Florian Westphal
2016-06-14 12:35 ` Liping Zhang
2016-06-23 17:33 ` Pablo Neira Ayuso
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=20160623112205.GA2873@salvia \
--to=pablo@netfilter.org \
--cc=liping.zhang@spreadtrum.com \
--cc=netfilter-devel@vger.kernel.org \
--cc=zlpnobody@163.com \
/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).