aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/netfilter/nf_conntrack_extend.h
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2012-02-01 16:18:31 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2012-06-16 15:08:49 +0200
commit3cf4c7e381d9a98a44fd86207b950bd8fef55d20 (patch)
treebc7edfd5d84a7bf32aabbdd8352da0a9bed931a3 /include/net/netfilter/nf_conntrack_extend.h
parentnetfilter: nf_ct_helper: allocate 16 bytes for the helper and policy names (diff)
downloadlinux-dev-3cf4c7e381d9a98a44fd86207b950bd8fef55d20.tar.xz
linux-dev-3cf4c7e381d9a98a44fd86207b950bd8fef55d20.zip
netfilter: nf_ct_ext: support variable length extensions
We can now define conntrack extensions of variable size. This patch is useful to get rid of these unions: union nf_conntrack_help union nf_conntrack_proto union nf_conntrack_nat_help Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/net/netfilter/nf_conntrack_extend.h')
-rw-r--r--include/net/netfilter/nf_conntrack_extend.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/include/net/netfilter/nf_conntrack_extend.h b/include/net/netfilter/nf_conntrack_extend.h
index 96755c3798a5..8b4d1fc29096 100644
--- a/include/net/netfilter/nf_conntrack_extend.h
+++ b/include/net/netfilter/nf_conntrack_extend.h
@@ -80,10 +80,13 @@ static inline void nf_ct_ext_free(struct nf_conn *ct)
}
/* Add this type, returns pointer to data or NULL. */
-void *
-__nf_ct_ext_add(struct nf_conn *ct, enum nf_ct_ext_id id, gfp_t gfp);
+void *__nf_ct_ext_add_length(struct nf_conn *ct, enum nf_ct_ext_id id,
+ size_t var_alloc_len, gfp_t gfp);
+
#define nf_ct_ext_add(ct, id, gfp) \
- ((id##_TYPE *)__nf_ct_ext_add((ct), (id), (gfp)))
+ ((id##_TYPE *)__nf_ct_ext_add_length((ct), (id), 0, (gfp)))
+#define nf_ct_ext_add_length(ct, id, len, gfp) \
+ ((id##_TYPE *)__nf_ct_ext_add_length((ct), (id), (len), (gfp)))
#define NF_CT_EXT_F_PREALLOC 0x0001