aboutsummaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorGravatar Florian Westphal <fw@strlen.de> 2020-12-10 14:43:23 +0100
committerGravatar Pablo Neira Ayuso <pablo@netfilter.org> 2020-12-12 11:44:42 +0100
commit86d21fc7474563cb5d054ff001d8ad7b69206717 (patch)
tree764484f42898dea88f33e2063f6dd23b383deaa4 /include/net
parentnetfilter: use actual socket sk for REJECT action (diff)
downloadlinux-86d21fc7474563cb5d054ff001d8ad7b69206717.tar.gz
linux-86d21fc7474563cb5d054ff001d8ad7b69206717.tar.bz2
linux-86d21fc7474563cb5d054ff001d8ad7b69206717.zip
netfilter: ctnetlink: add timeout and protoinfo to destroy events
DESTROY events do not include the remaining timeout. Add the timeout if the entry was removed explicitly. This can happen when a conntrack gets deleted prematurely, e.g. due to a tcp reset, module removal, netdev notifier (nat/masquerade device went down), ctnetlink and so on. Add the protocol state too for the destroy message to check for abnormal state on connection termination. Joint work with Pablo. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/netfilter/nf_conntrack_l4proto.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h
index 9be7320b994f..96f9cf81f46b 100644
--- a/include/net/netfilter/nf_conntrack_l4proto.h
+++ b/include/net/netfilter/nf_conntrack_l4proto.h
@@ -32,7 +32,7 @@ struct nf_conntrack_l4proto {
/* convert protoinfo to nfnetink attributes */
int (*to_nlattr)(struct sk_buff *skb, struct nlattr *nla,
- struct nf_conn *ct);
+ struct nf_conn *ct, bool destroy);
/* convert nfnetlink attributes to protoinfo */
int (*from_nlattr)(struct nlattr *tb[], struct nf_conn *ct);