From 3e1c7b67837228e6b6b6c8cbd74500a9369c77c6 Mon Sep 17 00:00:00 2001 From: Arturo Borrero Date: Mon, 14 Apr 2014 12:17:35 +0200 Subject: netlink: refactorize set_elem conversion from netlink Lets refactorize set_elem handling. Signed-off-by: Arturo Borrero Gonzalez Signed-off-by: Pablo Neira Ayuso --- src/netlink.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/netlink.c b/src/netlink.c index 5308aea1..025566ad 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -953,11 +953,10 @@ int netlink_delete_setelems(struct netlink_ctx *ctx, const struct handle *h, return err; } -static int list_setelem_cb(struct nft_set_elem *nlse, void *arg) +static int netlink_delinearize_setelem(struct nft_set_elem *nlse, + struct set *set) { struct nft_data_delinearize nld; - struct netlink_ctx *ctx = arg; - struct set *set = ctx->set; struct expr *expr, *data; uint32_t flags = 0; @@ -1001,6 +1000,12 @@ out: return 0; } +static int list_setelem_cb(struct nft_set_elem *nlse, void *arg) +{ + struct netlink_ctx *ctx = arg; + return netlink_delinearize_setelem(nlse, ctx->set); +} + extern void interval_map_decompose(struct expr *set); int netlink_get_setelems(struct netlink_ctx *ctx, const struct handle *h, -- cgit v1.2.3