redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

[NETFILTER]: nf_conntrack: fix accounting with fixed timeouts

Browse source 
Don't skip accounting for conntracks with the FIXED_TIMEOUT bit.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy 2008-01-31 04:36:31 -08:00 committed by David S. Miller
parent 1d670fdc8c
commit 47d9504543
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
net/netfilter/nf_conntrack_core.c
View file

@ -776,10 +776,8 @@ void __nf_ct_refresh_acct(struct nf_conn *ct,
write_lock_bh(&nf_conntrack_lock); write_lock_bh(&nf_conntrack_lock);
/* Only update if this is not a fixed timeout */ /* Only update if this is not a fixed timeout */
if (test_bit(IPS_FIXED_TIMEOUT_BIT, &ct->status)) { if (test_bit(IPS_FIXED_TIMEOUT_BIT, &ct->status))
write_unlock_bh(&nf_conntrack_lock); goto acct;
return;
}
/* If not in hash table, timer will not be active yet */ /* If not in hash table, timer will not be active yet */
if (!nf_ct_is_confirmed(ct)) { if (!nf_ct_is_confirmed(ct)) {
@ -799,6 +797,7 @@ void __nf_ct_refresh_acct(struct nf_conn *ct,
} }
} }
acct:
#ifdef CONFIG_NF_CT_ACCT #ifdef CONFIG_NF_CT_ACCT
if (do_acct) { if (do_acct) {
ct->counters[CTINFO2DIR(ctinfo)].packets++; ct->counters[CTINFO2DIR(ctinfo)].packets++;