1 files changed, 12 insertions, 52 deletions

diff --git a/src/expr/fib.c b/src/expr/fib.c
index 59b335a..20bc125 100644
--- a/src/expr/fib.c
+++ b/src/expr/fib.c
@@ -14,7 +14,6 @@
 #include <string.h>
 #include <arpa/inet.h>
 #include <errno.h>
-#include <net/if.h>
 #include <linux/netfilter/nf_tables.h>
 
 #include "internal.h"
@@ -36,16 +35,14 @@ nftnl_expr_fib_set(struct nftnl_expr *e, uint16_t result,
 
 	switch (result) {
 	case NFTNL_EXPR_FIB_RESULT:
-		memcpy(&fib->result, data, sizeof(fib->result));
+		memcpy(&fib->result, data, data_len);
 		break;
 	case NFTNL_EXPR_FIB_DREG:
-		memcpy(&fib->dreg, data, sizeof(fib->dreg));
+		memcpy(&fib->dreg, data, data_len);
 		break;
 	case NFTNL_EXPR_FIB_FLAGS:
-		memcpy(&fib->flags, data, sizeof(fib->flags));
+		memcpy(&fib->flags, data, data_len);
 		break;
-	default:
-		return -1;
 	}
 	return 0;
 }
@@ -129,45 +126,6 @@ nftnl_expr_fib_parse(struct nftnl_expr *e, struct nlattr *attr)
 	return ret;
 }
 
-static int
-nftnl_expr_fib_reg_len(const struct nftnl_expr *e)
-{
-	const struct nftnl_expr_fib *fib = nftnl_expr_data(e);
-
-	switch (fib->result) {
-	case NFT_FIB_RESULT_OIF:
-		return sizeof(int);
-	case NFT_FIB_RESULT_OIFNAME:
-		return IFNAMSIZ;
-	case NFT_FIB_RESULT_ADDRTYPE:
-		return sizeof(uint32_t);
-	default:
-		assert(0);
-		break;
-	}
-	return sizeof(uint32_t);
-}
-
-static bool
-nftnl_expr_fib_reg_cmp(const struct nftnl_reg *reg,
-			       const struct nftnl_expr *e)
-{
-	const struct nftnl_expr_fib *fib = nftnl_expr_data(e);
-
-	return reg->fib.result == fib->result &&
-	       reg->fib.flags == fib->flags;
-}
-
-static void
-nftnl_expr_fib_reg_update(struct nftnl_reg *reg,
-				  const struct nftnl_expr *e)
-{
-	const struct nftnl_expr_fib *fib = nftnl_expr_data(e);
-
-	reg->fib.result = fib->result;
-	reg->fib.flags = fib->flags;
-}
-
 static const char *fib_type[NFT_FIB_RESULT_MAX + 1] = {
 	[NFT_FIB_RESULT_OIF] = "oif",
 	[NFT_FIB_RESULT_OIFNAME] = "oifname",
@@ -230,18 +188,20 @@ nftnl_expr_fib_snprintf(char *buf, size_t remain,
 	return offset;
 }
 
+static struct attr_policy fib_attr_policy[__NFTNL_EXPR_FIB_MAX] = {
+	[NFTNL_EXPR_FIB_DREG]   = { .maxlen = sizeof(uint32_t) },
+	[NFTNL_EXPR_FIB_RESULT] = { .maxlen = sizeof(uint32_t) },
+	[NFTNL_EXPR_FIB_FLAGS]  = { .maxlen = sizeof(uint32_t) },
+};
+
 struct expr_ops expr_ops_fib = {
 	.name		= "fib",
 	.alloc_len	= sizeof(struct nftnl_expr_fib),
-	.max_attr	= NFTA_FIB_MAX,
+	.nftnl_max_attr	= __NFTNL_EXPR_FIB_MAX - 1,
+	.attr_policy	= fib_attr_policy,
 	.set		= nftnl_expr_fib_set,
 	.get		= nftnl_expr_fib_get,
 	.parse		= nftnl_expr_fib_parse,
 	.build		= nftnl_expr_fib_build,
-	.snprintf	= nftnl_expr_fib_snprintf,
-	.reg		= {
-		.len	= nftnl_expr_fib_reg_len,
-		.cmp	= nftnl_expr_fib_reg_cmp,
-		.update	= nftnl_expr_fib_reg_update,
-	},
+	.output		= nftnl_expr_fib_snprintf,
 };