[PATCH 0/3] libnfnl: support for new set features

[PATCH 0/3] libnfnl: support for new set features

[Patrick McHardy]

These patches add the remaining support for the new set features in
net-next, namely

- comments attached to set elements
- the dynset expression

Additionally the set timeout debugging information is slightly enhanded.


Patrick McHardy (3):
  set: print set elem timeout information
  set_elem: add support for userdata
  expr: add support for the dynset expr

 include/buffer.h                    |   3 +
 include/libnftnl/expr.h             |   9 +
 include/libnftnl/set.h              |   1 +
 include/linux/netfilter/nf_tables.h |  29 ++++
 include/set_elem.h                  |   4 +
 src/Makefile.am                     |   1 +
 src/expr/dynset.c                   | 317 ++++++++++++++++++++++++++++++++++++
 src/expr_ops.c                      |   2 +
 src/set.c                           |  13 ++
 src/set_elem.c                      |  47 ++++++
 10 files changed, 426 insertions(+)
 create mode 100644 src/expr/dynset.c

-- 
2.1.0

[PATCH 1/3] set: print set elem timeout information

[Patrick McHardy]

Signed-off-by: Patrick McHardy <kaber@trash.net>
---
 src/set.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/set.c b/src/set.c
index d58c9e1..b07c4d9 100644
--- a/src/set.c
+++ b/src/set.c
@@ -15,6 +15,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <inttypes.h>
 #include <netinet/in.h>
 #include <limits.h>
 #include <errno.h>
@@ -870,6 +871,18 @@ static int nft_set_snprintf_default(char *buf, size_t size, struct nft_set *s,
 			s->name, s->table, s->set_flags);
 	SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
+	if (s->flags & (1 << NFT_SET_ATTR_TIMEOUT)) {
+		ret = snprintf(buf + offset, len, " timeout %"PRIu64"ms",
+			       s->timeout);
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	}
+
+	if (s->flags & (1 << NFT_SET_ATTR_GC_INTERVAL)) {
+		ret = snprintf(buf + offset, len, " gc_interval %ums",
+			       s->gc_interval);
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	}
+
 	if (s->flags & (1 << NFT_SET_ATTR_POLICY)) {
 		ret = snprintf(buf + offset, len, " policy %u", s->policy);
 		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
-- 
2.1.0

[PATCH 2/3] set_elem: add support for userdata

[Patrick McHardy]

Signed-off-by: Patrick McHardy <kaber@trash.net>
---
 include/libnftnl/set.h              |  1 +
 include/linux/netfilter/nf_tables.h |  2 ++
 include/set_elem.h                  |  4 ++++
 src/set_elem.c                      | 47 +++++++++++++++++++++++++++++++++++++
 4 files changed, 54 insertions(+)

diff --git a/include/libnftnl/set.h b/include/libnftnl/set.h
index db38d6b..9621853 100644
--- a/include/libnftnl/set.h
+++ b/include/libnftnl/set.h
@@ -92,6 +92,7 @@ enum {
 	NFT_SET_ELEM_ATTR_DATA,
 	NFT_SET_ELEM_ATTR_TIMEOUT,
 	NFT_SET_ELEM_ATTR_EXPIRATION,
+	NFT_SET_ELEM_ATTR_USERDATA,
 };
 
 struct nft_set_elem;
diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h
index 6894ba3..334b389 100644
--- a/include/linux/netfilter/nf_tables.h
+++ b/include/linux/netfilter/nf_tables.h
@@ -291,6 +291,7 @@ enum nft_set_elem_flags {
  * @NFTA_SET_ELEM_FLAGS: bitmask of nft_set_elem_flags (NLA_U32)
  * @NFTA_SET_ELEM_TIMEOUT: timeout value (NLA_U64)
  * @NFTA_SET_ELEM_EXPIRATION: expiration time (NLA_U64)
+ * @NFTA_SET_ELEM_USERDATA: user data (NLA_BINARY)
  */
 enum nft_set_elem_attributes {
 	NFTA_SET_ELEM_UNSPEC,
@@ -299,6 +300,7 @@ enum nft_set_elem_attributes {
 	NFTA_SET_ELEM_FLAGS,
 	NFTA_SET_ELEM_TIMEOUT,
 	NFTA_SET_ELEM_EXPIRATION,
+	NFTA_SET_ELEM_USERDATA,
 	__NFTA_SET_ELEM_MAX
 };
 #define NFTA_SET_ELEM_MAX	(__NFTA_SET_ELEM_MAX - 1)
diff --git a/include/set_elem.h b/include/set_elem.h
index de864db..5aaad20 100644
--- a/include/set_elem.h
+++ b/include/set_elem.h
@@ -11,6 +11,10 @@ struct nft_set_elem {
 	uint32_t		flags;
 	uint64_t		timeout;
 	uint64_t		expiration;
+	struct {
+		void		*data;
+		uint32_t	len;
+	} user;
 };
 
 #endif
diff --git a/src/set_elem.c b/src/set_elem.c
index 5760902..2cf6528 100644
--- a/src/set_elem.c
+++ b/src/set_elem.c
@@ -17,6 +17,7 @@
 #include <string.h>
 #include <netinet/in.h>
 #include <errno.h>
+#include <ctype.h>
 
 #include <libmnl/libmnl.h>
 #include <linux/netfilter/nfnetlink.h>
@@ -72,6 +73,7 @@ void nft_set_elem_attr_unset(struct nft_set_elem *s, uint16_t attr)
 	case NFT_SET_ELEM_ATTR_DATA:	/* NFTA_SET_ELEM_DATA */
 	case NFT_SET_ELEM_ATTR_TIMEOUT:	/* NFTA_SET_ELEM_TIMEOUT */
 	case NFT_SET_ELEM_ATTR_EXPIRATION:	/* NFTA_SET_ELEM_EXPIRATION */
+	case NFT_SET_ELEM_ATTR_USERDATA:	/* NFTA_SET_ELEM_USERDATA */
 		break;
 	default:
 		return;
@@ -108,6 +110,10 @@ void nft_set_elem_attr_set(struct nft_set_elem *s, uint16_t attr,
 	case NFT_SET_ELEM_ATTR_TIMEOUT:	/* NFTA_SET_ELEM_TIMEOUT */
 		s->timeout = *((uint64_t *)data);
 		break;
+	case NFT_SET_ELEM_ATTR_USERDATA: /* NFTA_SET_ELEM_USERDATA */
+		s->user.data = (void *)data;
+		s->user.len  = data_len;
+		break;
 	default:
 		return;
 	}
@@ -155,6 +161,9 @@ const void *nft_set_elem_attr_get(struct nft_set_elem *s, uint16_t attr, uint32_
 		return &s->timeout;
 	case NFT_SET_ELEM_ATTR_EXPIRATION:	/* NFTA_SET_ELEM_EXPIRATION */
 		return &s->expiration;
+	case NFT_SET_ELEM_ATTR_USERDATA:
+		*data_len = s->user.len;
+		return s->user.data;
 	}
 	return NULL;
 }
@@ -233,6 +242,8 @@ void nft_set_elem_nlmsg_build_payload(struct nlmsghdr *nlh,
 		mnl_attr_put(nlh, NFTA_DATA_VALUE, e->data.len, e->data.val);
 		mnl_attr_nest_end(nlh, nest1);
 	}
+	if (e->flags & (1 << NFT_SET_ELEM_ATTR_USERDATA))
+		mnl_attr_put(nlh, NFTA_SET_ELEM_USERDATA, e->user.len, e->user.data);
 }
 
 static void nft_set_elem_nlmsg_build_def(struct nlmsghdr *nlh,
@@ -297,6 +308,10 @@ static int nft_set_elem_parse_attr_cb(const struct nlattr *attr, void *data)
 		if (mnl_attr_validate(attr, MNL_TYPE_NESTED) < 0)
 			abi_breakage();
 		break;
+	case NFTA_SET_ELEM_USERDATA:
+		if (mnl_attr_validate(attr, MNL_TYPE_BINARY) < 0)
+			abi_breakage();
+		break;
 	}
 
 	tb[type] = attr;
@@ -350,7 +365,23 @@ static int nft_set_elems_parse2(struct nft_set *s, const struct nlattr *nest)
 			break;
 		}
         }
+	if (tb[NFTA_SET_ELEM_USERDATA]) {
+		const void *udata =
+			mnl_attr_get_payload(tb[NFTA_SET_ELEM_USERDATA]);
+
+		if (e->user.data)
+			xfree(e->user.data);
+
+		e->user.len  = mnl_attr_get_payload_len(tb[NFTA_SET_ELEM_USERDATA]);
+		e->user.data = malloc(e->user.len);
+		if (e->user.data == NULL)
+			goto err;
+		memcpy(e->user.data, udata, e->user.len);
+		e->flags |= (1 << NFT_RULE_ATTR_USERDATA);
+	}
+
 	if (ret < 0) {
+err:
 		nft_set_elem_free(e);
 		return -1;
 	}
@@ -611,6 +642,22 @@ static int nft_set_elem_snprintf_default(char *buf, size_t size,
 	ret = snprintf(buf+offset, len, "%u [end]", e->set_elem_flags);
 	SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
+	if (e->user.len) {
+		ret = snprintf(buf+offset, len, "  userdata = {");
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+
+		for (i = 0; i < e->user.len; i++) {
+			char *c = e->user.data;
+
+			ret = snprintf(buf+offset, len, "%c",
+				       isalnum(c[i]) ? c[i] : 0);
+			SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+		}
+
+		ret = snprintf(buf+offset, len, " }\n");
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	}
+
 	return offset;
 }
 
-- 
2.1.0

[PATCH 3/3] expr: add support for the dynset expr

[Patrick McHardy]

Signed-off-by: Patrick McHardy <kaber@trash.net>
---
 include/buffer.h                    |   3 +
 include/libnftnl/expr.h             |   9 +
 include/linux/netfilter/nf_tables.h |  27 +++
 src/Makefile.am                     |   1 +
 src/expr/dynset.c                   | 317 ++++++++++++++++++++++++++++++++++++
 src/expr_ops.c                      |   2 +
 6 files changed, 359 insertions(+)

diff --git a/include/buffer.h b/include/buffer.h
index 9d1cb8b..52942ed 100644
--- a/include/buffer.h
+++ b/include/buffer.h
@@ -66,12 +66,15 @@ int nft_buf_reg(struct nft_buf *b, int type, union nft_data_reg *reg,
 #define QTHRESH			"qthreshold"
 #define RATE			"rate"
 #define SET			"set"
+#define SET_NAME		"set_name"
 #define SIZE			"size"
 #define SNAPLEN			"snaplen"
 #define SREG_ADDR_MAX		"sreg_addr_max"
 #define SREG_ADDR_MIN		"sreg_addr_min"
 #define SREG_PROTO_MAX		"sreg_proto_max"
 #define SREG_PROTO_MIN		"sreg_proto_min"
+#define SREG_KEY		"sreg_key"
+#define SREG_DATA		"sreg_data"
 #define SREG			"sreg"
 #define TABLE			"table"
 #define TOTAL			"total"
diff --git a/include/libnftnl/expr.h b/include/libnftnl/expr.h
index 9f25993..7bc0273 100644
--- a/include/libnftnl/expr.h
+++ b/include/libnftnl/expr.h
@@ -111,6 +111,15 @@ enum {
 };
 
 enum {
+	NFT_EXPR_DYNSET_SREG_KEY	= NFT_RULE_EXPR_ATTR_BASE,
+	NFT_EXPR_DYNSET_SREG_DATA,
+	NFT_EXPR_DYNSET_OP,
+	NFT_EXPR_DYNSET_TIMEOUT,
+	NFT_EXPR_DYNSET_SET_NAME,
+	NFT_EXPR_DYNSET_SET_ID,
+};
+
+enum {
 	NFT_EXPR_LOG_PREFIX	= NFT_RULE_EXPR_ATTR_BASE,
 	NFT_EXPR_LOG_GROUP,
 	NFT_EXPR_LOG_SNAPLEN,
diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h
index 334b389..0e96443 100644
--- a/include/linux/netfilter/nf_tables.h
+++ b/include/linux/netfilter/nf_tables.h
@@ -516,6 +516,33 @@ enum nft_lookup_attributes {
 };
 #define NFTA_LOOKUP_MAX		(__NFTA_LOOKUP_MAX - 1)
 
+enum nft_dynset_ops {
+	NFT_DYNSET_OP_ADD,
+	NFT_DYNSET_OP_UPDATE,
+};
+
+/**
+ * enum nft_dynset_attributes - dynset expression attributes
+ *
+ * @NFTA_DYNSET_SET_NAME: name of set the to add data to (NLA_STRING)
+ * @NFTA_DYNSET_SET_ID: uniquely identifier of the set in the transaction (NLA_U32)
+ * @NFTA_DYNSET_OP: operation (NLA_U32)
+ * @NFTA_DYNSET_SREG_KEY: source register of the key (NLA_U32)
+ * @NFTA_DYNSET_SREG_DATA: source register of the data (NLA_U32)
+ * @NFTA_DYNSET_TIMEOUT: timeout value for the new element (NLA_U64)
+ */
+enum nft_dynset_attributes {
+	NFTA_DYNSET_UNSPEC,
+	NFTA_DYNSET_SET_NAME,
+	NFTA_DYNSET_SET_ID,
+	NFTA_DYNSET_OP,
+	NFTA_DYNSET_SREG_KEY,
+	NFTA_DYNSET_SREG_DATA,
+	NFTA_DYNSET_TIMEOUT,
+	__NFTA_DYNSET_MAX,
+};
+#define NFTA_DYNSET_MAX		(__NFTA_DYNSET_MAX - 1)
+
 /**
  * enum nft_payload_bases - nf_tables payload expression offset bases
  *
diff --git a/src/Makefile.am b/src/Makefile.am
index 3fca5e4..a5cbe85 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,6 +29,7 @@ libnftnl_la_SOURCES = utils.c		\
 		      expr/limit.c	\
 		      expr/log.c	\
 		      expr/lookup.c	\
+		      expr/dynset.c	\
 		      expr/immediate.c	\
 		      expr/match.c	\
 		      expr/meta.c	\
diff --git a/src/expr/dynset.c b/src/expr/dynset.c
new file mode 100644
index 0000000..a2c1946
--- /dev/null
+++ b/src/expr/dynset.c
@@ -0,0 +1,317 @@
+/*
+ * Copyright (c) 2014, 2015 Patrick McHardy <kaber@trash.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include "internal.h"
+
+#include <stdio.h>
+#include <stdint.h>
+#include <inttypes.h>
+#include <errno.h>
+#include <arpa/inet.h>
+#include <libmnl/libmnl.h>
+#include <linux/netfilter/nf_tables.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
+#include "data_reg.h"
+#include "expr_ops.h"
+#include <buffer.h>
+
+#ifndef IFNAMSIZ
+#define IFNAMSIZ	16
+#endif
+
+struct nft_expr_dynset {
+	enum nft_registers	sreg_key;
+	enum nft_registers	sreg_data;
+	enum nft_dynset_ops	op;
+	uint64_t		timeout;
+	char			set_name[IFNAMSIZ];
+	uint32_t		set_id;
+};
+
+static int
+nft_rule_expr_dynset_set(struct nft_rule_expr *e, uint16_t type,
+			 const void *data, uint32_t data_len)
+{
+	struct nft_expr_dynset *dynset = nft_expr_data(e);
+
+	switch (type) {
+	case NFT_EXPR_DYNSET_SREG_KEY:
+		dynset->sreg_key = *((uint32_t *)data);
+		break;
+	case NFT_EXPR_DYNSET_SREG_DATA:
+		dynset->sreg_data = *((uint32_t *)data);
+		break;
+	case NFT_EXPR_DYNSET_OP:
+		dynset->op = *((uint32_t *)data);
+		break;
+	case NFT_EXPR_DYNSET_TIMEOUT:
+		dynset->timeout = *((uint64_t *)data);
+		break;
+	case NFT_EXPR_DYNSET_SET_NAME:
+		snprintf(dynset->set_name, sizeof(dynset->set_name), "%s",
+			 (const char *)data);
+		break;
+	case NFT_EXPR_DYNSET_SET_ID:
+		dynset->set_id = *((uint32_t *)data);
+		break;
+	default:
+		return -1;
+	}
+	return 0;
+}
+
+static const void *
+nft_rule_expr_dynset_get(const struct nft_rule_expr *e, uint16_t type,
+			 uint32_t *data_len)
+{
+	struct nft_expr_dynset *dynset = nft_expr_data(e);
+
+	switch (type) {
+	case NFT_EXPR_DYNSET_SREG_KEY:
+		*data_len = sizeof(dynset->sreg_key);
+		return &dynset->sreg_key;
+	case NFT_EXPR_DYNSET_SREG_DATA:
+		*data_len = sizeof(dynset->sreg_data);
+		return &dynset->sreg_data;
+	case NFT_EXPR_DYNSET_OP:
+		*data_len = sizeof(dynset->op);
+		return &dynset->op;
+	case NFT_EXPR_DYNSET_TIMEOUT:
+		*data_len = sizeof(dynset->timeout);
+		return &dynset->timeout;
+	case NFT_EXPR_DYNSET_SET_NAME:
+		return dynset->set_name;
+	case NFT_EXPR_DYNSET_SET_ID:
+		return &dynset->set_id;
+	}
+	return NULL;
+}
+
+static int nft_rule_expr_dynset_cb(const struct nlattr *attr, void *data)
+{
+	const struct nlattr **tb = data;
+	int type = mnl_attr_get_type(attr);
+
+	if (mnl_attr_type_valid(attr, NFTA_SET_MAX) < 0)
+		return MNL_CB_OK;
+
+	switch (type) {
+	case NFTA_DYNSET_SREG_KEY:
+	case NFTA_DYNSET_SREG_DATA:
+	case NFTA_DYNSET_SET_ID:
+	case NFTA_DYNSET_OP:
+		if (mnl_attr_validate(attr, MNL_TYPE_U32) < 0)
+			abi_breakage();
+		break;
+	case NFTA_DYNSET_TIMEOUT:
+		if (mnl_attr_validate(attr, MNL_TYPE_U64) < 0)
+			abi_breakage();
+		break;
+	case NFTA_DYNSET_SET_NAME:
+		if (mnl_attr_validate(attr, MNL_TYPE_STRING) < 0)
+			abi_breakage();
+		break;
+	}
+
+	tb[type] = attr;
+	return MNL_CB_OK;
+}
+
+static void
+nft_rule_expr_dynset_build(struct nlmsghdr *nlh, struct nft_rule_expr *e)
+{
+	struct nft_expr_dynset *dynset = nft_expr_data(e);
+
+	if (e->flags & (1 << NFT_EXPR_DYNSET_SREG_KEY))
+		mnl_attr_put_u32(nlh, NFTA_DYNSET_SREG_KEY, htonl(dynset->sreg_key));
+	if (e->flags & (1 << NFT_EXPR_DYNSET_SREG_DATA))
+		mnl_attr_put_u32(nlh, NFTA_DYNSET_SREG_DATA, htonl(dynset->sreg_data));
+	if (e->flags & (1 << NFT_EXPR_DYNSET_OP))
+		mnl_attr_put_u32(nlh, NFTA_DYNSET_OP, htonl(dynset->op));
+	if (e->flags & (1 << NFT_EXPR_DYNSET_TIMEOUT))
+		mnl_attr_put_u64(nlh, NFTA_DYNSET_TIMEOUT, htobe64(dynset->timeout));
+	if (e->flags & (1 << NFT_EXPR_DYNSET_SET_NAME))
+		mnl_attr_put_strz(nlh, NFTA_DYNSET_SET_NAME, dynset->set_name);
+	if (e->flags & (1 << NFT_EXPR_DYNSET_SET_ID))
+		mnl_attr_put_u32(nlh, NFTA_DYNSET_SET_ID, htonl(dynset->set_id));
+}
+
+static int
+nft_rule_expr_dynset_parse(struct nft_rule_expr *e, struct nlattr *attr)
+{
+	struct nft_expr_dynset *dynset = nft_expr_data(e);
+	struct nlattr *tb[NFTA_SET_MAX+1] = {};
+	int ret = 0;
+
+	if (mnl_attr_parse_nested(attr, nft_rule_expr_dynset_cb, tb) < 0)
+		return -1;
+
+	if (tb[NFTA_DYNSET_SREG_KEY]) {
+		dynset->sreg_key = ntohl(mnl_attr_get_u32(tb[NFTA_DYNSET_SREG_KEY]));
+		e->flags |= (1 << NFT_EXPR_DYNSET_SREG_KEY);
+	}
+	if (tb[NFTA_DYNSET_SREG_DATA]) {
+		dynset->sreg_data = ntohl(mnl_attr_get_u32(tb[NFTA_DYNSET_SREG_DATA]));
+		e->flags |= (1 << NFT_EXPR_DYNSET_SREG_DATA);
+	}
+	if (tb[NFTA_DYNSET_OP]) {
+		dynset->op = ntohl(mnl_attr_get_u32(tb[NFTA_DYNSET_OP]));
+		e->flags |= (1 << NFT_EXPR_DYNSET_OP);
+	}
+	if (tb[NFTA_DYNSET_TIMEOUT]) {
+		dynset->timeout = be64toh(mnl_attr_get_u64(tb[NFTA_DYNSET_TIMEOUT]));
+		e->flags |= (1 << NFT_EXPR_DYNSET_TIMEOUT);
+	}
+	if (tb[NFTA_DYNSET_SET_NAME]) {
+		strcpy(dynset->set_name, mnl_attr_get_str(tb[NFTA_DYNSET_SET_NAME]));
+		e->flags |= (1 << NFT_EXPR_DYNSET_SET_NAME);
+	}
+	if (tb[NFTA_DYNSET_SET_ID]) {
+		dynset->set_id = ntohl(mnl_attr_get_u32(tb[NFTA_DYNSET_SET_ID]));
+		e->flags |= (1 << NFT_EXPR_DYNSET_SET_ID);
+	}
+
+	return ret;
+}
+
+static int
+nft_rule_expr_dynset_json_parse(struct nft_rule_expr *e, json_t *root,
+				struct nft_parse_err *err)
+{
+#ifdef JSON_PARSING
+	const char *set_name;
+	uint32_t sreg, dreg;
+
+	set_name = nft_jansson_parse_str(root, "set", err);
+	if (set_name != NULL)
+		nft_rule_expr_dynset_str(e, NFT_EXPR_DYNSET_SET, set_name);
+
+	if (nft_jansson_parse_reg(root, "sreg", NFT_TYPE_U32, &sreg, err) == 0)
+		nft_rule_expr_dynset_u32(e, NFT_EXPR_DYNSET_SREG, sreg);
+
+	if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &dreg, err) == 0)
+		nft_rule_expr_dynset_u32(e, NFT_EXPR_DYNSET_DREG, dreg);
+
+	return 0;
+#else
+	errno = EOPNOTSUPP;
+	return -1;
+#endif
+}
+
+static int
+nft_rule_expr_dynset_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree,
+			       struct nft_parse_err *err)
+{
+#ifdef XML_PARSING
+	const char *set_name;
+	uint32_t sreg, dreg;
+
+	set_name = nft_mxml_str_parse(tree, "set", MXML_DESCEND_FIRST,
+				      NFT_XML_MAND, err);
+	if (set_name != NULL)
+		nft_rule_expr_dynset_str(e, NFT_EXPR_DYNSET_SET, set_name);
+
+	if (nft_mxml_reg_parse(tree, "sreg", &sreg, MXML_DESCEND, NFT_XML_MAND,
+			       err) == 0)
+		nft_rule_expr_dynset_u32(e, NFT_EXPR_DYNSET_SREG, sreg);
+
+	if (nft_mxml_reg_parse(tree, "dreg", &dreg, MXML_DESCEND, NFT_XML_OPT,
+			       err) == 0)
+		nft_rule_expr_dynset_u32(e, NFT_EXPR_DYNSET_DREG, dreg);
+
+	return 0;
+#else
+	errno = EOPNOTSUPP;
+	return -1;
+#endif
+}
+
+static int
+nft_rule_expr_dynset_export(char *buf, size_t size,
+			    struct nft_rule_expr *e, int type)
+{
+	struct nft_expr_dynset *dynset = nft_expr_data(e);
+	NFT_BUF_INIT(b, buf, size);
+
+	if (e->flags & (1 << NFT_EXPR_DYNSET_SET_NAME))
+		nft_buf_str(&b, type, dynset->set_name, SET_NAME);
+	if (e->flags & (1 << NFT_EXPR_DYNSET_SREG_KEY))
+		nft_buf_u32(&b, type, dynset->sreg_key, SREG_KEY);
+	if (e->flags & (1 << NFT_EXPR_DYNSET_SREG_DATA))
+		nft_buf_u32(&b, type, dynset->sreg_data, SREG_DATA);
+
+	return nft_buf_done(&b);
+}
+
+static char *op2str_array[] = {
+	[NFT_DYNSET_OP_ADD]		= "add",
+	[NFT_DYNSET_OP_UPDATE] 		= "update",
+};
+
+static const char *op2str(enum nft_dynset_ops op)
+{
+	if (op > NFT_DYNSET_OP_UPDATE)
+		return "unknown";
+	return op2str_array[op];
+}
+
+static int
+nft_rule_expr_dynset_snprintf_default(char *buf, size_t size,
+				      struct nft_rule_expr *e)
+{
+	struct nft_expr_dynset *dynset = nft_expr_data(e);
+	int len = size, offset = 0, ret;
+
+	ret = snprintf(buf, len, "%s reg_key %u set %s ",
+		       op2str(dynset->op), dynset->sreg_key, dynset->set_name);
+	SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+
+	if (e->flags & (1 << NFT_EXPR_DYNSET_SREG_DATA)) {
+		ret = snprintf(buf+offset, len, "sreg_data %u ", dynset->sreg_data);
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	}
+	if (e->flags & (1 << NFT_EXPR_DYNSET_TIMEOUT)) {
+		ret = snprintf(buf+offset, len, "timeout %"PRIu64"ms ",
+			       dynset->timeout);
+		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+	}
+	return offset;
+}
+
+static int
+nft_rule_expr_dynset_snprintf(char *buf, size_t size, uint32_t type,
+			      uint32_t flags, struct nft_rule_expr *e)
+{
+
+	switch (type) {
+	case NFT_OUTPUT_DEFAULT:
+		return nft_rule_expr_dynset_snprintf_default(buf, size, e);
+	case NFT_OUTPUT_XML:
+	case NFT_OUTPUT_JSON:
+		return nft_rule_expr_dynset_export(buf, size, e, type);
+	default:
+		break;
+	}
+	return -1;
+}
+
+struct expr_ops expr_ops_dynset = {
+	.name		= "dynset",
+	.alloc_len	= sizeof(struct nft_expr_dynset),
+	.max_attr	= NFTA_DYNSET_MAX,
+	.set		= nft_rule_expr_dynset_set,
+	.get		= nft_rule_expr_dynset_get,
+	.parse		= nft_rule_expr_dynset_parse,
+	.build		= nft_rule_expr_dynset_build,
+	.snprintf	= nft_rule_expr_dynset_snprintf,
+	.xml_parse	= nft_rule_expr_dynset_xml_parse,
+	.json_parse	= nft_rule_expr_dynset_json_parse,
+};
diff --git a/src/expr_ops.c b/src/expr_ops.c
index fce5b02..2de5805 100644
--- a/src/expr_ops.c
+++ b/src/expr_ops.c
@@ -23,6 +23,7 @@ extern struct expr_ops expr_ops_redir;
 extern struct expr_ops expr_ops_reject;
 extern struct expr_ops expr_ops_queue;
 extern struct expr_ops expr_ops_target;
+extern struct expr_ops expr_ops_dynset;
 
 static struct expr_ops *expr_ops[] = {
 	&expr_ops_bitwise,
@@ -44,6 +45,7 @@ static struct expr_ops *expr_ops[] = {
 	&expr_ops_reject,
 	&expr_ops_queue,
 	&expr_ops_target,
+	&expr_ops_dynset,
 	NULL,
 };
 
-- 
2.1.0