1 files changed, 12 insertions, 37 deletions

diff --git a/src/expr/osf.c b/src/expr/osf.c
index 666b6b7..060394b 100644
--- a/src/expr/osf.c
+++ b/src/expr/osf.c
@@ -11,7 +11,6 @@
 #include <libnftnl/rule.h>
 
 #define OSF_GENRE_SIZE	32
-#define NFT_OSF_MAXGENRELEN 16
 
 struct nftnl_expr_osf {
 	enum nft_registers	dreg;
@@ -26,13 +25,13 @@ static int nftnl_expr_osf_set(struct nftnl_expr *e, uint16_t type,
 
 	switch(type) {
 	case NFTNL_EXPR_OSF_DREG:
-		memcpy(&osf->dreg, data, sizeof(osf->dreg));
+		memcpy(&osf->dreg, data, data_len);
 		break;
 	case NFTNL_EXPR_OSF_TTL:
-		memcpy(&osf->ttl, data, sizeof(osf->ttl));
+		memcpy(&osf->ttl, data, data_len);
 		break;
 	case NFTNL_EXPR_OSF_FLAGS:
-		memcpy(&osf->flags, data, sizeof(osf->flags));
+		memcpy(&osf->flags, data, data_len);
 		break;
 	}
 	return 0;
@@ -126,32 +125,6 @@ nftnl_expr_osf_parse(struct nftnl_expr *e, struct nlattr *attr)
 }
 
 static int
-nftnl_expr_osf_reg_len(const struct nftnl_expr *e)
-{
-	return NFT_OSF_MAXGENRELEN;
-}
-
-static bool
-nftnl_expr_osf_reg_cmp(const struct nftnl_reg *reg,
-		       const struct nftnl_expr *e)
-{
-	const struct nftnl_expr_osf *osf = nftnl_expr_data(e);
-
-	return reg->osf.ttl == osf->ttl &&
-	       reg->osf.flags == osf->flags;
-}
-
-static void
-nftnl_expr_osf_reg_update(struct nftnl_reg *reg,
-			  const struct nftnl_expr *e)
-{
-	const struct nftnl_expr_osf *osf = nftnl_expr_data(e);
-
-	reg->osf.ttl = osf->ttl;
-	reg->osf.flags = osf->flags;
-}
-
-static int
 nftnl_expr_osf_snprintf(char *buf, size_t len,
 			uint32_t flags, const struct nftnl_expr *e)
 {
@@ -166,18 +139,20 @@ nftnl_expr_osf_snprintf(char *buf, size_t len,
 	return offset;
 }
 
+static struct attr_policy osf_attr_policy[__NFTNL_EXPR_OSF_MAX] = {
+	[NFTNL_EXPR_OSF_DREG]  = { .maxlen = sizeof(uint32_t) },
+	[NFTNL_EXPR_OSF_TTL]   = { .maxlen = sizeof(uint8_t) },
+	[NFTNL_EXPR_OSF_FLAGS] = { .maxlen = sizeof(uint32_t) },
+};
+
 struct expr_ops expr_ops_osf = {
 	.name		= "osf",
 	.alloc_len	= sizeof(struct nftnl_expr_osf),
-	.max_attr	= NFTA_OSF_MAX,
+	.nftnl_max_attr	= __NFTNL_EXPR_OSF_MAX - 1,
+	.attr_policy	= osf_attr_policy,
 	.set		= nftnl_expr_osf_set,
 	.get		= nftnl_expr_osf_get,
 	.parse		= nftnl_expr_osf_parse,
 	.build		= nftnl_expr_osf_build,
-	.snprintf	= nftnl_expr_osf_snprintf,
-	.reg		= {
-		.len	= nftnl_expr_osf_reg_len,
-		.cmp	= nftnl_expr_osf_reg_cmp,
-		.update	= nftnl_expr_osf_reg_update,
-	},
+	.output		= nftnl_expr_osf_snprintf,
 };