diff options
author | Patrick McHardy <kaber@trash.net> | 2006-09-20 12:11:30 -0700 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-22 15:20:20 -0700 |
commit | 4c5de695cf7f71c85ad8cfff509f6475b8bd4d27 (patch) | |
tree | 5175e20ab9244b4a0961ae98d85c8823956aad77 /include | |
parent | fd5e3befa405ea64d4db6b393b821644bf963c57 (diff) | |
download | op-kernel-dev-4c5de695cf7f71c85ad8cfff509f6475b8bd4d27.zip op-kernel-dev-4c5de695cf7f71c85ad8cfff509f6475b8bd4d27.tar.gz |
[NETFILTER]: PPTP conntrack: fix another GRE keymap leak
When the master PPTP connection times out while still having unfullfilled
expectations (and a GRE keymap entry) associated with it, the keymap entry
is not destroyed.
Add a destroy callback to struct ip_conntrack_helper and use it to destroy
PPTP siblings when the master is destroyed.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/netfilter_ipv4/ip_conntrack_helper.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/netfilter_ipv4/ip_conntrack_helper.h b/include/linux/netfilter_ipv4/ip_conntrack_helper.h index 8d69279..77fe868 100644 --- a/include/linux/netfilter_ipv4/ip_conntrack_helper.h +++ b/include/linux/netfilter_ipv4/ip_conntrack_helper.h @@ -25,6 +25,8 @@ struct ip_conntrack_helper struct ip_conntrack *ct, enum ip_conntrack_info conntrackinfo); + void (*destroy)(struct ip_conntrack *ct); + int (*to_nfattr)(struct sk_buff *skb, const struct ip_conntrack *ct); }; |