diff options
| author | Fernando Fernandez Mancera <ffmancera@riseup.net> | 2025-04-14 16:36:04 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2025-04-14 17:22:24 +0200 |
| commit | 4d4dc68fd0163fea56efb2324efcde5bd427a6c0 (patch) | |
| tree | c335eabae4f6d4678fea158351f3fbf9775cce01 | |
| parent | c59d42a90b0d279955d5051c2306733bc01522f8 (diff) | |
tunnel: add missing inner nested netlink attribute for vxlan options
The VXLAN options must be nested inside the NFTA_TUNNEL_KEY_OPTS_VXLAN
netlink attribute.
Fixes: ea63a05272f5 ("obj: add tunnel support")
Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | src/obj/tunnel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/obj/tunnel.c b/src/obj/tunnel.c index 980bffd..8941e39 100644 --- a/src/obj/tunnel.c +++ b/src/obj/tunnel.c @@ -175,7 +175,7 @@ static void nftnl_obj_tunnel_build(struct nlmsghdr *nlh, const struct nftnl_obj *e) { struct nftnl_obj_tunnel *tun = nftnl_obj_data(e); - struct nlattr *nest; + struct nlattr *nest, *nest_inner; if (e->flags & (1 << NFTNL_OBJ_TUNNEL_ID)) mnl_attr_put_u32(nlh, NFTA_TUNNEL_KEY_ID, htonl(tun->id)); @@ -214,16 +214,16 @@ nftnl_obj_tunnel_build(struct nlmsghdr *nlh, const struct nftnl_obj *e) mnl_attr_put_u32(nlh, NFTA_TUNNEL_KEY_FLAGS, htonl(tun->tun_flags)); if (e->flags & (1 << NFTNL_OBJ_TUNNEL_VXLAN_GBP)) { nest = mnl_attr_nest_start(nlh, NFTA_TUNNEL_KEY_OPTS); + nest_inner = mnl_attr_nest_start(nlh, NFTA_TUNNEL_KEY_OPTS_VXLAN); mnl_attr_put_u32(nlh, NFTA_TUNNEL_KEY_VXLAN_GBP, htonl(tun->u.tun_vxlan.gbp)); + mnl_attr_nest_end(nlh, nest_inner); mnl_attr_nest_end(nlh, nest); } if (e->flags & (1 << NFTNL_OBJ_TUNNEL_ERSPAN_VERSION) && (e->flags & (1 << NFTNL_OBJ_TUNNEL_ERSPAN_V1_INDEX) || (e->flags & (1 << NFTNL_OBJ_TUNNEL_ERSPAN_V2_HWID) && e->flags & (1u << NFTNL_OBJ_TUNNEL_ERSPAN_V2_DIR)))) { - struct nlattr *nest_inner; - nest = mnl_attr_nest_start(nlh, NFTA_TUNNEL_KEY_OPTS); nest_inner = mnl_attr_nest_start(nlh, NFTA_TUNNEL_KEY_OPTS_ERSPAN); mnl_attr_put_u32(nlh, NFTA_TUNNEL_KEY_ERSPAN_VERSION, |