diff options
| author | Eric Leblond <eric@inl.fr> | 2009-02-18 15:29:23 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2009-02-18 15:29:23 +0100 |
| commit | 5ca431f9ae8db8c6edb9c64bebe6d6521077afd6 (patch) | |
| tree | 3458815f1b4ce2ff6961e99015b88f33571f0d38 /net | |
| parent | 4aa3b2ee1945ed082430ae1fb988d60eef64ca07 (diff) | |
| download | linux-stable-5ca431f9ae8db8c6edb9c64bebe6d6521077afd6.tar.gz linux-stable-5ca431f9ae8db8c6edb9c64bebe6d6521077afd6.tar.bz2 linux-stable-5ca431f9ae8db8c6edb9c64bebe6d6521077afd6.zip | |
netfilter: nfnetlink_log: fix per-rule qthreshold override
In NFLOG the per-rule qthreshold should overrides per-instance only
it is set. With current code, the per-rule qthreshold is 1 if not set
and it overrides the per-instance qthreshold.
This patch modifies the default xt_NFLOG threshold from 1 to
0. Thus a value of 0 means there is no per-rule setting and the instance
parameter has to apply.
Signed-off-by: Eric Leblond <eric@inl.fr>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/nfnetlink_log.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c index fa49dc7fe100..580b837e44dd 100644 --- a/net/netfilter/nfnetlink_log.c +++ b/net/netfilter/nfnetlink_log.c @@ -590,8 +590,10 @@ nfulnl_log_packet(u_int8_t pf, qthreshold = inst->qthreshold; /* per-rule qthreshold overrides per-instance */ - if (qthreshold > li->u.ulog.qthreshold) - qthreshold = li->u.ulog.qthreshold; + if (li->u.ulog.qthreshold) + if (qthreshold > li->u.ulog.qthreshold) + qthreshold = li->u.ulog.qthreshold; + switch (inst->copy_mode) { case NFULNL_COPY_META: |