From 4b8cfe020c9adc71dad857106b915aae01348df4 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Fri, 1 Sep 2017 12:00:21 +0200 Subject: src: add nft_ctx_netlink_init() Add these two new functions to set up netlink sockets in the global context structure. Signed-off-by: Pablo Neira Ayuso --- src/main.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index a891832e..fce9bfec 100644 --- a/src/main.c +++ b/src/main.c @@ -298,12 +298,20 @@ static struct nft_ctx *nft_ctx_new(void) static void nft_ctx_free(const struct nft_ctx *ctx) { + if (ctx->nf_sock) + netlink_close_sock(ctx->nf_sock); + iface_cache_release(); cache_release(&nft->cache); xfree(ctx); nft_exit(); } +static void nft_ctx_netlink_init(struct nft_ctx *ctx) +{ + ctx->nf_sock = netlink_open_sock(); +} + static int nft_run_cmd_from_buffer(struct nft_ctx *nft, char *buf, size_t buflen) { @@ -361,7 +369,8 @@ int main(int argc, char * const *argv) nft = nft_ctx_new(); - nft->nf_sock = netlink_open_sock(); + nft_ctx_netlink_init(nft); + while (1) { val = getopt_long(argc, argv, OPTSTRING, options, NULL); if (val == -1) @@ -472,7 +481,6 @@ int main(int argc, char * const *argv) } xfree(buf); - netlink_close_sock(nft->nf_sock); nft_ctx_free(nft); return rc; -- cgit v1.2.3