[NETFILTER]: Restore {ipt,ip6t,ebt}_LOG compatibility
The nfnetlink_log infrastructure changes broke compatiblity of the LOG targets. They currently use whatever log backend was registered first, which means that if ipt_ULOG was loaded first, no messages will be printed to the ring buffer anymore. Restore compatiblity by using the old log functions by default and only use the nf_log backend if the user explicitly said so. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
45fe4dc08c
commit
bafac2a512
6 changed files with 23 additions and 5 deletions
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
#define EBT_LOG_IP 0x01 /* if the frame is made by ip, log the ip information */
|
||||
#define EBT_LOG_ARP 0x02
|
||||
#define EBT_LOG_NFLOG 0x04
|
||||
#define EBT_LOG_MASK (EBT_LOG_IP | EBT_LOG_ARP)
|
||||
#define EBT_LOG_PREFIX_SIZE 30
|
||||
#define EBT_LOG_WATCHER "log"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,8 @@
|
|||
#define IPT_LOG_TCPOPT 0x02 /* Log TCP options */
|
||||
#define IPT_LOG_IPOPT 0x04 /* Log IP options */
|
||||
#define IPT_LOG_UID 0x08 /* Log UID owning local socket */
|
||||
#define IPT_LOG_MASK 0x0f
|
||||
#define IPT_LOG_NFLOG 0x10 /* Log using nf_log backend */
|
||||
#define IPT_LOG_MASK 0x1f
|
||||
|
||||
struct ipt_log_info {
|
||||
unsigned char level;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,8 @@
|
|||
#define IP6T_LOG_TCPOPT 0x02 /* Log TCP options */
|
||||
#define IP6T_LOG_IPOPT 0x04 /* Log IP options */
|
||||
#define IP6T_LOG_UID 0x08 /* Log UID owning local socket */
|
||||
#define IP6T_LOG_MASK 0x0f
|
||||
#define IP6T_LOG_NFLOG 0x10 /* Log using nf_log backend */
|
||||
#define IP6T_LOG_MASK 0x1f
|
||||
|
||||
struct ip6t_log_info {
|
||||
unsigned char level;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue