ct: add parse and build userdata interface

Add support for meta userdata area.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/src/ct.c b/src/ct.c
index 9e6a8351ffb2fb90fc405f5642adc818211682b5..db1dabd319e99050ff6d9e2184f72dcbba362eaf 100644 (file)
--- a/src/ct.c
+++ b/src/ct.c
@@ -367,6 +367,60 @@ static void ct_expr_pctx_update(struct proto_ctx *ctx, const struct expr *expr)
        proto_ctx_update(ctx, left->ct.base + 1, &expr->location, desc);
 }
 
+#define NFTNL_UDATA_CT_KEY 0
+#define NFTNL_UDATA_CT_DIR 1
+#define NFTNL_UDATA_CT_MAX 2
+
+static int ct_expr_build_udata(struct nftnl_udata_buf *udbuf,
+                              const struct expr *expr)
+{
+       nftnl_udata_put_u32(udbuf, NFTNL_UDATA_CT_KEY, expr->ct.key);
+       nftnl_udata_put_u32(udbuf, NFTNL_UDATA_CT_DIR, expr->ct.direction);
+
+       return 0;
+}
+
+static int ct_parse_udata(const struct nftnl_udata *attr, void *data)
+{
+       const struct nftnl_udata **ud = data;
+       uint8_t type = nftnl_udata_type(attr);
+       uint8_t len = nftnl_udata_len(attr);
+
+       switch (type) {
+       case NFTNL_UDATA_CT_KEY:
+       case NFTNL_UDATA_CT_DIR:
+               if (len != sizeof(uint32_t))
+                       return -1;
+               break;
+       default:
+               return 0;
+       }
+
+       ud[type] = attr;
+       return 0;
+}
+
+static struct expr *ct_expr_parse_udata(const struct nftnl_udata *attr)
+{
+       const struct nftnl_udata *ud[NFTNL_UDATA_CT_MAX + 1] = {};
+       uint32_t key, dir;
+       int err;
+
+       err = nftnl_udata_parse(nftnl_udata_get(attr), nftnl_udata_len(attr),
+                               ct_parse_udata, ud);
+       if (err < 0)
+               return NULL;
+
+       if (!ud[NFTNL_UDATA_CT_KEY] ||
+           !ud[NFTNL_UDATA_CT_DIR])
+               return NULL;
+
+       key = nftnl_udata_get_u32(ud[NFTNL_UDATA_CT_KEY]);
+       dir = nftnl_udata_get_u32(ud[NFTNL_UDATA_CT_DIR]);
+
+       return ct_expr_alloc(&internal_location, key, dir);
+}
+
 const struct expr_ops ct_expr_ops = {
        .type           = EXPR_CT,
        .name           = "ct",
@@ -375,6 +429,8 @@ const struct expr_ops ct_expr_ops = {
        .cmp            = ct_expr_cmp,
        .clone          = ct_expr_clone,
        .pctx_update    = ct_expr_pctx_update,
+       .parse_udata    = ct_expr_parse_udata,
+       .build_udata    = ct_expr_build_udata,
 };
 
 struct expr *ct_expr_alloc(const struct location *loc, enum nft_ct_keys key,

diff --git a/src/expression.c b/src/expression.c
index 7d198222c90b7d8e3688b767f7f59fbfd2291c47..14bf329e25c3f11ec7f8809b634b9b7b2447a1f0 100644 (file)
--- a/src/expression.c
+++ b/src/expression.c
@@ -1231,6 +1231,7 @@ const struct expr_ops *expr_ops_by_type(enum expr_types etype)
        case EXPR_META: return &meta_expr_ops;
        case EXPR_SOCKET: return &socket_expr_ops;
        case EXPR_OSF: return &osf_expr_ops;
+       case EXPR_CT: return &ct_expr_ops;
        default:
                break;
        }