netfilter: restore rule tracing via nfnetlink_log

Browse source

Since fab4085 ("netfilter: log: nf_log_packet() as real unified
interface"), the loginfo structure that is passed to nf_log_packet() is
used to explicitly indicate the logger type you want to use.

This is a problem for people tracing rules through nfnetlink_log since
packets are always routed to the NF_LOG_TYPE logger after the
aforementioned patch.

We can fix this by removing the trace loginfo structures, but that still
changes the log level from 4 to 5 for tracing messages and there may be
someone relying on this outthere. So let's just introduce a new
nf_log_trace() function that restores the former behaviour.

Reported-by: Markus Kötter <koetter@rrzn.uni-hannover.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

...

This commit is contained in:

Pablo Neira Ayuso 2015-03-02 01:10:28 +01:00

parent d6b6cb1d3e

commit 4017a7ee69

5 changed files with 44 additions and 10 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

include/net/netfilter/nf_log.h

View file

6

net/ipv4/netfilter/ip_tables.c

View file

6

net/ipv6/netfilter/ip6_tables.c

View file

24

net/netfilter/nf_log.c

View file

8

net/netfilter/nf_tables_core.c

View file