* [PATCH nf-next] netfilter: nf_tables: fix nf_log_trace based tracing
@ 2015-12-09 15:31 Florian Westphal
2015-12-10 17:22 ` Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: Florian Westphal @ 2015-12-09 15:31 UTC (permalink / raw)
To: netfilter-devel; +Cc: Florian Westphal
nf_log_trace() outputs bogus 'TRACE:' strings because I forgot to update
the comments array.
Fixes: 33d5a7b14bfd0 ("netfilter: nf_tables: extend tracing infrastructure")
Signed-off-by: Florian Westphal <fw@strlen.de>
---
diff --git a/net/netfilter/nf_tables_core.c b/net/netfilter/nf_tables_core.c
index 67fa41d..e9f8dff 100644
--- a/net/netfilter/nf_tables_core.c
+++ b/net/netfilter/nf_tables_core.c
@@ -23,16 +23,10 @@
#include <net/netfilter/nf_tables.h>
#include <net/netfilter/nf_log.h>
-enum nft_trace {
- NFT_TRACE_RULE,
- NFT_TRACE_RETURN,
- NFT_TRACE_POLICY,
-};
-
-static const char *const comments[] = {
- [NFT_TRACE_RULE] = "rule",
- [NFT_TRACE_RETURN] = "return",
- [NFT_TRACE_POLICY] = "policy",
+static const char *const comments[__NFT_TRACETYPE_MAX] = {
+ [NFT_TRACETYPE_POLICY] = "policy",
+ [NFT_TRACETYPE_RETURN] = "return",
+ [NFT_TRACETYPE_RULE] = "rule",
};
static struct nf_loginfo trace_loginfo = {
@@ -47,7 +41,7 @@ static struct nf_loginfo trace_loginfo = {
static noinline void __nft_trace_packet(struct nft_traceinfo *info,
const struct nft_chain *chain,
- int rulenum, enum nft_trace type)
+ int rulenum, enum nft_trace_types type)
{
const struct nft_pktinfo *pkt = info->pkt;
--
2.4.10
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH nf-next] netfilter: nf_tables: fix nf_log_trace based tracing
2015-12-09 15:31 [PATCH nf-next] netfilter: nf_tables: fix nf_log_trace based tracing Florian Westphal
@ 2015-12-10 17:22 ` Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2015-12-10 17:22 UTC (permalink / raw)
To: Florian Westphal; +Cc: netfilter-devel
On Wed, Dec 09, 2015 at 04:31:21PM +0100, Florian Westphal wrote:
> nf_log_trace() outputs bogus 'TRACE:' strings because I forgot to update
> the comments array.
>
> Fixes: 33d5a7b14bfd0 ("netfilter: nf_tables: extend tracing infrastructure")
Applied to nf-next, thanks Florian.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-12-10 17:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-09 15:31 [PATCH nf-next] netfilter: nf_tables: fix nf_log_trace based tracing Florian Westphal
2015-12-10 17:22 ` Pablo Neira Ayuso
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).