tunnel: rework options
PATCH v3 1/2 tunnel: rework options
From: Pablo Neira Ayuso <[email protected]>
Only vxlan gbp can work before this patch because NFTNL_OBJ_TUNNEL_ERSPAN_V2_DIR is off by one in the internal object flags.
Replace them by NFTNL_OBJ_TUNNEL_OPTS and add two new opaque nftnl_tunnel_opts and nftnl_tunnel_opt structs to represent tunnel options.
- nftnl_tunnel_opt_alloc() allocates one tunnel option.
- nftnl_tunnel_opt_set() to sets it up.
- nftnl_tunnel_opt_get() to get the option attribute.
Then, to manage the list of options:
- nftnl_tunnel_opts_alloc() allocates a list of tunnel options.
- nftnl_tunnel_opts_add() adds a option to the list.
Although vxlan and erspan support for a single tunnel option at this stage, this API prepares for supporting gevene which allows for more tunnel options.
Joint work with Fernando.
--- include/libnftnl/object.h | 51 +++- include/obj.h | 16 +- src/libnftnl.map | 16 ++ src/obj/tunnel.c | 492 +++++++++++++++++++++++++++++++------- src/object.c | 4 + 5 files changed, 478 insertions(+), 101 deletions(-)
include/libnftnl/object.h +46 -5
@@ -112,14 +112,52 @@ enum {NFTNL_OBJ_TUNNEL_FLAGS ,NFTNL_OBJ_TUNNEL_TOS ,NFTNL_OBJ_TUNNEL_TTL , -NFTNL_OBJ_TUNNEL_VXLAN_GBP , -NFTNL_OBJ_TUNNEL_ERSPAN_VERSION , -NFTNL_OBJ_TUNNEL_ERSPAN_V1_INDEX , -NFTNL_OBJ_TUNNEL_ERSPAN_V2_HWID , -NFTNL_OBJ_TUNNEL_ERSPAN_V2_DIR , +NFTNL_OBJ_TUNNEL_OPTS , __NFTNL_OBJ_TUNNEL_MAX, }; +#define NFTNL_TUNNEL_TYPE 0 +#define NFTNL_TUNNEL_BASE 4 + +enum nftnl_tunnel_type { +NFTNL_TUNNEL_TYPE_VXLAN , +NFTNL_TUNNEL_TYPE_ERSPAN , +}; + +enum { +NFTNL_TUNNEL_VXLAN_GBP =NFTNL_TUNNEL_BASE , + __NFTNL_TUNNEL_VXLAN_MAX, +}; + +enum { +NFTNL_TUNNEL_ERSPAN_VERSION =NFTNL_TUNNEL_BASE , +NFTNL_TUNNEL_ERSPAN_V1_INDEX , +NFTNL_TUNNEL_ERSPAN_V2_HWID , +NFTNL_TUNNEL_ERSPAN_V2_DIR , + __NFTNL_TUNNEL_ERSPAN_MAX, +}; + +struct nftnl_tunnel_opt ; +struct nftnl_tunnel_opts ; + +struct nftnl_tunnel_opts *nftnl_tunnel_opts_alloc (enum nftnl_tunnel_type type); +int nftnl_tunnel_opts_add (struct nftnl_tunnel_opts *opts, +struct nftnl_tunnel_opt *opt); +void nftnl_tunnel_opts_free (struct nftnl_tunnel_opts *opts); + +struct nftnl_tunnel_opt *nftnl_tunnel_opt_alloc (enum nftnl_tunnel_type type); +int nftnl_tunnel_opt_set (struct nftnl_tunnel_opt *opt,uint16_t type, +const void *data,uint32_t data_len); +const void *nftnl_tunnel_opt_get (const struct nftnl_tunnel_opt *ne,uint16_t attr); +const void *nftnl_tunnel_opt_get_data (const struct nftnl_tunnel_opt *ne, +uint16_t attr, +uint32_t *data_len); +uint8_t nftnl_tunnel_opt_get_u8 (const struct nftnl_tunnel_opt *ne,uint16_t attr); +uint16_t nftnl_tunnel_opt_get_u16 (const struct nftnl_tunnel_opt *ne,uint16_t attr); +uint32_t nftnl_tunnel_opt_get_u32 (const struct nftnl_tunnel_opt *ne,uint16_t attr); +enum nftnl_tunnel_type nftnl_tunnel_opt_get_type (const struct nftnl_tunnel_opt *ne); +uint32_t nftnl_tunnel_opt_get_flags (const struct nftnl_tunnel_opt *ne); +enum {NFTNL_OBJ_SECMARK_CTX =NFTNL_OBJ_BASE , __NFTNL_OBJ_SECMARK_MAX,
@@ -148,6 +186,9 @@ uint16_t nftnl_obj_get_u16(const struct nftnl_obj *obj, uint16_t attr);uint32_t nftnl_obj_get_u32 (const struct nftnl_obj *ne,uint16_t attr);uint64_t nftnl_obj_get_u64 (const struct nftnl_obj *obj,uint16_t attr);const char *nftnl_obj_get_str (const struct nftnl_obj *ne,uint16_t attr); +int nftnl_obj_tunnel_opts_foreach (const struct nftnl_obj *ne, +int (*cb)(struct nftnl_tunnel_opt *ne,void *data), +void *data);void nftnl_obj_nlmsg_build_payload (struct nlmsghdr *nlh,const struct nftnl_obj *ne);
include/obj.h +1 -15
@@ -78,21 +78,7 @@ struct nftnl_obj {uint32_t tun_flags;uint8_t tun_tos;uint8_t tun_ttl; -union { -struct { -uint32_t gbp; - } tun_vxlan; -struct { -uint32_t version; -union { -uint32_t v1_index; -struct { -uint8_t hwid; -uint8_t dir; - } v2; - } u; - } tun_erspan; - } u; +struct nftnl_tunnel_opts *tun_opts; } tunnel;struct nftnl_obj_secmark {char ctx[NFT_SECMARK_CTX_MAXLEN ];
src/libnftnl.map +16 -0
@@ -383,3 +383,19 @@ LIBNFTNL_16 { LIBNFTNL_17 { nftnl_set_elem_nlmsg_build; } LIBNFTNL_16; + +LIBNFTNL_18 { +nftnl_tunnel_opt_get; +nftnl_tunnel_opt_get_data; +nftnl_tunnel_opt_get_u8; +nftnl_tunnel_opt_get_u16; +nftnl_tunnel_opt_get_u32; +nftnl_tunnel_opt_set; +nftnl_tunnel_opt_alloc; +nftnl_tunnel_opt_get_type; +nftnl_tunnel_opt_get_flags; +nftnl_tunnel_opts_alloc; +nftnl_obj_tunnel_opts_foreach; +nftnl_tunnel_opts_add; +nftnl_tunnel_opts_free; +} LIBNFTNL_17;
src/obj/tunnel.c +411 -81
598 lines not on this page · raw message
src/object.c +4 -0
@@ -55,6 +55,10 @@ void nftnl_obj_free(const struct nftnl_obj *obj)xfree (obj->name);if (obj->flags & (1 <<NFTNL_OBJ_USERDATA ))xfree (obj->user.data); +if (obj->flags & (1 <<NFTNL_OBJ_TUNNEL_OPTS )) { +nftnl_tunnel_opts_free (obj->data.tunnel.tun_opts); +xfree (obj->data.tunnel.tun_opts); + }xfree (obj); }
Signature · 1 line
2.50.1
PATCH v3 2/2 tunnel: add support to geneve options
In addition, modifies the netlink parsing to loop through the nested array of NFTA_TUNNEL_KEY_OPTS.
--- include/libnftnl/object.h | 9 +++ src/obj/tunnel.c | 166 +++++++++++++++++++++++++++++++++----- 2 files changed, 156 insertions(+), 19 deletions(-)
include/libnftnl/object.h +9 -0
@@ -119,9 +119,12 @@ enum {#define NFTNL_TUNNEL_TYPE 0#define NFTNL_TUNNEL_BASE 4 +#define NFTNL_TUNNEL_GENEVE_DATA_MAXLEN 127 +enum nftnl_tunnel_type {NFTNL_TUNNEL_TYPE_VXLAN ,NFTNL_TUNNEL_TYPE_ERSPAN , +NFTNL_TUNNEL_TYPE_GENEVE , };enum {
@@ -137,6 +140,12 @@ enum { __NFTNL_TUNNEL_ERSPAN_MAX, }; +enum { +NFTNL_TUNNEL_GENEVE_CLASS =NFTNL_TUNNEL_BASE , +NFTNL_TUNNEL_GENEVE_TYPE , +NFTNL_TUNNEL_GENEVE_DATA , +}; +struct nftnl_tunnel_opt ;struct nftnl_tunnel_opts ;
src/obj/tunnel.c +147 -19
262 lines not on this page · raw message
Signature · 1 line
2.50.1
Pablo Neira Ayuso
maintainerHi Fernando,
I have pushed out this series to the 'tunnel' branch under libnftnl.
There are one issue pending in nftables userspace, let me change email thread and report it there.