diff options
author | Patrick McHardy <kaber@trash.net> | 2013-07-28 16:54:07 -0400 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-07-31 10:37:27 -0400 |
commit | 6704af53fc3c5d4113d67d5ff40943d420966cd8 (patch) | |
tree | d25803b8e3093523cb592bb0c3ccc55dd9357261 /include/net | |
parent | 5774c94aceade9eadc311957fe31322cc3ad2016 (diff) |
netfilter: nf_conntrack: remove net_ratelimit() for LOG_INVALID()
Logging of invalid packets has to be explicitly enabled. Rate-limiting these
messages is inconsistent with other netfilter logging features and makes
debugging harder.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/netfilter/nf_conntrack_l4proto.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h index 914d8d900798..b411d7b17dec 100644 --- a/include/net/netfilter/nf_conntrack_l4proto.h +++ b/include/net/netfilter/nf_conntrack_l4proto.h | |||
@@ -148,17 +148,10 @@ extern int nf_ct_port_nlattr_tuple_size(void); | |||
148 | extern const struct nla_policy nf_ct_port_nla_policy[]; | 148 | extern const struct nla_policy nf_ct_port_nla_policy[]; |
149 | 149 | ||
150 | #ifdef CONFIG_SYSCTL | 150 | #ifdef CONFIG_SYSCTL |
151 | #ifdef DEBUG_INVALID_PACKETS | ||
152 | #define LOG_INVALID(net, proto) \ | 151 | #define LOG_INVALID(net, proto) \ |
153 | ((net)->ct.sysctl_log_invalid == (proto) || \ | 152 | ((net)->ct.sysctl_log_invalid == (proto) || \ |
154 | (net)->ct.sysctl_log_invalid == IPPROTO_RAW) | 153 | (net)->ct.sysctl_log_invalid == IPPROTO_RAW) |
155 | #else | 154 | #else |
156 | #define LOG_INVALID(net, proto) \ | ||
157 | (((net)->ct.sysctl_log_invalid == (proto) || \ | ||
158 | (net)->ct.sysctl_log_invalid == IPPROTO_RAW) \ | ||
159 | && net_ratelimit()) | ||
160 | #endif | ||
161 | #else | ||
162 | static inline int LOG_INVALID(struct net *net, int proto) { return 0; } | 155 | static inline int LOG_INVALID(struct net *net, int proto) { return 0; } |
163 | #endif /* CONFIG_SYSCTL */ | 156 | #endif /* CONFIG_SYSCTL */ |
164 | 157 | ||