add backend support to define ct helpers
Florian Westphal
maintainercover add backend support to define ct helpers
This adds libnftnl support to define connection tracking helpers. Frontend (nft) support will follow soon.
include/libnftnl/object.h | 10 + include/linux/netfilter/nf_tables.h | 12 +- include/obj.h | 6 + src/Makefile.am | 1 src/libnftnl.map | 4 src/obj/ct_helper.c | 210 ++++++++++++++++++++++++++++++++++++ src/object.c | 29 ++++ 7 files changed, 270 insertions(+), 2 deletions(-)
Florian Westphal
maintainerPATCH 1/2 object: extend set/get api for u8/u16 types
Signed-off-by Florian Westphal <[email protected]>
--- include/libnftnl/object.h | 4 ++++ src/libnftnl.map | 4 ++++ src/object.c | 26 ++++++++++++++++++++++++++ 3 files changed, 34 insertions(+)
include/libnftnl/object.h +4 -0
@@ -44,12 +44,16 @@ void nftnl_obj_unset(struct nftnl_obj *ne, uint16_t attr);void nftnl_obj_set_data (struct nftnl_obj *ne,uint16_t attr,const void *data,uint32_t data_len);void nftnl_obj_set (struct nftnl_obj *ne,uint16_t attr,const void *data); +void nftnl_obj_set_u8 (struct nftnl_obj *ne,uint16_t attr,uint8_t val); +void nftnl_obj_set_u16 (struct nftnl_obj *ne,uint16_t attr,uint16_t val);void nftnl_obj_set_u32 (struct nftnl_obj *ne,uint16_t attr,uint32_t val);void nftnl_obj_set_u64 (struct nftnl_obj *obj,uint16_t attr,uint64_t val);void nftnl_obj_set_str (struct nftnl_obj *ne,uint16_t attr,const char *str);const void *nftnl_obj_get_data (struct nftnl_obj *ne,uint16_t attr,uint32_t *data_len);const void *nftnl_obj_get (struct nftnl_obj *ne,uint16_t attr); +uint8_t nftnl_obj_get_u8 (struct nftnl_obj *ne,uint16_t attr); +uint16_t nftnl_obj_get_u16 (struct nftnl_obj *obj,uint16_t attr);uint32_t nftnl_obj_get_u32 (struct nftnl_obj *ne,uint16_t attr);uint64_t nftnl_obj_get_u64 (struct nftnl_obj *obj,uint16_t attr);const char *nftnl_obj_get_str (struct nftnl_obj *ne,uint16_t attr);
src/libnftnl.map +4 -0
@@ -278,9 +278,13 @@ global: nftnl_obj_unset; nftnl_obj_set; nftnl_obj_get; + nftnl_obj_set_u8; + nftnl_obj_set_u16; nftnl_obj_set_u32; nftnl_obj_set_u64; nftnl_obj_set_str; + nftnl_obj_get_u8; + nftnl_obj_get_u16; nftnl_obj_get_u32; nftnl_obj_get_str; nftnl_obj_get_u64;
src/object.c +26 -0
@@ -107,6 +107,18 @@ void nftnl_obj_set(struct nftnl_obj *obj, uint16_t attr, const void *data) }EXPORT_SYMBOL (nftnl_obj_set); +void nftnl_obj_set_u8 (struct nftnl_obj *obj,uint16_t attr,uint8_t val) +{ +nftnl_obj_set_data (obj, attr, &val,sizeof (uint8_t )); +} +EXPORT_SYMBOL (nftnl_obj_set_u8); + +void nftnl_obj_set_u16 (struct nftnl_obj *obj,uint16_t attr,uint16_t val) +{ +nftnl_obj_set_data (obj, attr, &val,sizeof (uint16_t )); +} +EXPORT_SYMBOL (nftnl_obj_set_u16); +void nftnl_obj_set_u32 (struct nftnl_obj *obj,uint16_t attr,uint32_t val) {nftnl_obj_set_data (obj, attr, &val,sizeof (uint32_t ));
@@ -164,6 +176,20 @@ const void *nftnl_obj_get(struct nftnl_obj *obj, uint16_t attr) }EXPORT_SYMBOL (nftnl_obj_get); +uint8_t nftnl_obj_get_u8 (struct nftnl_obj *obj,uint16_t attr) +{ +const void *ret =nftnl_obj_get (obj, attr); +return ret ==NULL ?0 : *((uint8_t *)ret); +} +EXPORT_SYMBOL (nftnl_obj_get_u8); + +uint16_t nftnl_obj_get_u16 (struct nftnl_obj *obj,uint16_t attr) +{ +const void *ret =nftnl_obj_get (obj, attr); +return ret ==NULL ?0 : *((uint16_t *)ret); +} +EXPORT_SYMBOL (nftnl_obj_get_u16); +uint32_t nftnl_obj_get_u32 (struct nftnl_obj *obj,uint16_t attr) {const void *ret =nftnl_obj_get (obj, attr);
Signature · 1 line
2.10.2
Florian Westphal
maintainerPATCH 2/2 src: ct helper support
In reply to Florian Westphaladd support for ct helper objects, these are used to assign helpers to connections, similar to iptables -j CT --set-helper target.
Signed-off-by Florian Westphal <[email protected]>
--- include/libnftnl/object.h | 6 ++ include/linux/netfilter/nf_tables.h | 12 ++- include/obj.h | 6 ++ src/Makefile.am | 1 + src/obj/ct_helper.c | 210 ++++++++++++++++++++++++++++++++++++ src/object.c | 3 +- 6 files changed, 236 insertions(+), 2 deletions(-) create mode 100644 src/obj/ct_helper.c
include/libnftnl/object.h +6 -0
@@ -34,6 +34,12 @@ enum { NFTNL_OBJ_QUOTA_FLAGS, }; +enum { +NFTNL_OBJ_CT_HELPER_NAME =NFTNL_OBJ_BASE , +NFTNL_OBJ_CT_HELPER_L3PROTO , +NFTNL_OBJ_CT_HELPER_L4PROTO , +}; +struct nftnl_obj ;struct nftnl_obj *nftnl_obj_alloc (void );
include/linux/netfilter/nf_tables.h +11 -1
@@ -1260,10 +1260,20 @@ enum nft_fib_flags { NFTA_FIB_F_PRESENT = 1 << 5, /* check existence only */ }; +enum nft_ct_helper_attributes { +NFTA_CT_HELPER_UNSPEC , +NFTA_CT_HELPER_NAME , +NFTA_CT_HELPER_L3PROTO , +NFTA_CT_HELPER_L4PROTO , + __NFTA_CT_HELPER_MAX, +}; +#define NFTA_CT_HELPER_MAX (__NFTA_CT_HELPER_MAX - 1) +#define NFT_OBJECT_UNSPEC 0#define NFT_OBJECT_COUNTER 1#define NFT_OBJECT_QUOTA 2 -#define __NFT_OBJECT_MAX 3 +#define NFT_OBJECT_CT_HELPER 3 +#define __NFT_OBJECT_MAX 4#define NFT_OBJECT_MAX (__NFT_OBJECT_MAX - 1)/**
include/obj.h +6 -0
@@ -30,6 +30,11 @@ struct nftnl_obj {uint64_t consumed;uint32_t flags; } quota; +struct nftnl_obj_ct_helper { +uint16_t l3proto; +uint8_t l4proto; +char name[16 ]; + } ct_helper; } data; };
@@ -49,6 +54,7 @@ struct obj_ops {extern struct obj_ops obj_ops_counter;extern struct obj_ops obj_ops_quota; +extern struct obj_ops obj_ops_ct_helper;#define nftnl_obj_data (obj) (void *)&obj->data
src/Makefile.am +1 -0
@@ -53,5 +53,6 @@ libnftnl_la_SOURCES = utils.c \ expr/redir.c \ expr/hash.c \ obj/counter.c \ + obj/ct_helper.c \ obj/quota.c \ libnftnl.map
src/obj/ct_helper.c new file +210 -0
210 lines not on this page · raw message
src/object.c +2 -1
@@ -28,11 +28,12 @@static struct obj_ops *obj_ops[] = { [NFT_OBJECT_COUNTER ] = &obj_ops_counter, [NFT_OBJECT_QUOTA ] = &obj_ops_quota, + [NFT_OBJECT_CT_HELPER ] = &obj_ops_ct_helper, };static struct obj_ops *nftnl_obj_ops_lookup (uint32_t type) { -if (type >NFT_OBJECT_QUOTA ) +if (type >NFT_OBJECT_CT_HELPER )return NULL ;return obj_ops[type];
Signature · 1 line
2.10.2
Quoted 2 lines · Florian Westphal
This adds libnftnl support to define connection tracking helpers. Frontend (nft) support will follow soon.