From patchwork Tue Oct 23 17:14:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 988290 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=netfilter.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42fg3y2K8bz9sCQ for ; Wed, 24 Oct 2018 04:14:38 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728537AbeJXBiw (ORCPT ); Tue, 23 Oct 2018 21:38:52 -0400 Received: from mail.us.es ([193.147.175.20]:44742 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727758AbeJXBiw (ORCPT ); Tue, 23 Oct 2018 21:38:52 -0400 Received: from antivirus1-rhel7.int (unknown [192.168.2.11]) by mail.us.es (Postfix) with ESMTP id 2E292CE76D for ; Tue, 23 Oct 2018 19:14:35 +0200 (CEST) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id 165CBDA7AB for ; Tue, 23 Oct 2018 19:14:35 +0200 (CEST) Received: by antivirus1-rhel7.int (Postfix, from userid 99) id 158FEDA79C; Tue, 23 Oct 2018 19:14:35 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on antivirus1-rhel7.int X-Spam-Level: X-Spam-Status: No, score=-108.2 required=7.5 tests=ALL_TRUSTED,BAYES_50, SMTPAUTH_US2,USER_IN_WHITELIST autolearn=disabled version=3.4.1 Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id F2B7BDA57F for ; Tue, 23 Oct 2018 19:14:32 +0200 (CEST) Received: from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int (F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); Tue, 23 Oct 2018 19:14:32 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int) Received: from salvia.here (sys.soleta.eu [212.170.55.40]) (Authenticated sender: pneira@us.es) by entrada.int (Postfix) with ESMTPA id DAE084265A31 for ; Tue, 23 Oct 2018 19:14:32 +0200 (CEST) X-SMTPAUTHUS: auth mail.us.es From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Subject: [PATCH nft 1/3] src: move socket open and reopen to mnl.c Date: Tue, 23 Oct 2018 19:14:28 +0200 Message-Id: <20181023171430.23677-1-pablo@netfilter.org> X-Mailer: git-send-email 2.11.0 X-Virus-Scanned: ClamAV using ClamSMTP Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org These functions are part of the mnl backend, move them there. Remove netlink_close_sock(), use direct call to mnl_socket_close(). Signed-off-by: Pablo Neira Ayuso --- include/mnl.h | 4 ++-- include/netlink.h | 1 - src/libnftables.c | 4 ++-- src/mnl.c | 22 ++++++++++++++++++++++ src/netlink.c | 27 --------------------------- src/rule.c | 2 +- 6 files changed, 27 insertions(+), 33 deletions(-) diff --git a/include/mnl.h b/include/mnl.h index 3ddc82a05cb0..676030e6c4c6 100644 --- a/include/mnl.h +++ b/include/mnl.h @@ -6,8 +6,8 @@ #include #include -struct mnl_socket *netlink_open_sock(void); -void netlink_close_sock(struct mnl_socket *nf_sock); +struct mnl_socket *nft_mnl_socket_open(void); +struct mnl_socket *nft_mnl_socket_reopen(struct mnl_socket *nf_sock); uint32_t mnl_seqnum_alloc(uint32_t *seqnum); uint16_t mnl_genid_get(struct netlink_ctx *ctx); diff --git a/include/netlink.h b/include/netlink.h index 66e400d88f19..af9313d51453 100644 --- a/include/netlink.h +++ b/include/netlink.h @@ -157,7 +157,6 @@ extern void netlink_dump_obj(struct nftnl_obj *nlo, struct netlink_ctx *ctx); extern int netlink_batch_send(struct netlink_ctx *ctx, struct list_head *err_list); -extern struct mnl_socket *netlink_restart(struct mnl_socket *nf_sock); #define netlink_abi_error() \ __netlink_abi_error(__FILE__, __LINE__, strerror(errno)); extern void __noreturn __netlink_abi_error(const char *file, int line, const char *reason); diff --git a/src/libnftables.c b/src/libnftables.c index 44869602c875..0731c532a22a 100644 --- a/src/libnftables.c +++ b/src/libnftables.c @@ -129,7 +129,7 @@ void nft_ctx_clear_include_paths(struct nft_ctx *ctx) static void nft_ctx_netlink_init(struct nft_ctx *ctx) { - ctx->nf_sock = netlink_open_sock(); + ctx->nf_sock = nft_mnl_socket_open(); } struct nft_ctx *nft_ctx_new(uint32_t flags) @@ -266,7 +266,7 @@ const char *nft_ctx_get_error_buffer(struct nft_ctx *ctx) void nft_ctx_free(struct nft_ctx *ctx) { if (ctx->nf_sock) - netlink_close_sock(ctx->nf_sock); + mnl_socket_close(ctx->nf_sock); exit_cookie(&ctx->output.output_cookie); exit_cookie(&ctx->output.error_cookie); diff --git a/src/mnl.c b/src/mnl.c index 9a6248aa0ad9..84727094e27e 100644 --- a/src/mnl.c +++ b/src/mnl.c @@ -28,10 +28,32 @@ #include #include #include +#include #include #include #include +struct mnl_socket *nft_mnl_socket_open(void) +{ + struct mnl_socket *nf_sock; + + nf_sock = mnl_socket_open(NETLINK_NETFILTER); + if (!nf_sock) + netlink_init_error(); + + if (fcntl(mnl_socket_get_fd(nf_sock), F_SETFL, O_NONBLOCK)) + netlink_init_error(); + + return nf_sock; +} + +struct mnl_socket *nft_mnl_socket_reopen(struct mnl_socket *nf_sock) +{ + mnl_socket_close(nf_sock); + + return nft_mnl_socket_open(); +} + uint32_t mnl_seqnum_alloc(unsigned int *seqnum) { return (*seqnum)++; diff --git a/src/netlink.c b/src/netlink.c index 403780ffdefb..8eb2ccad2f8c 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -10,7 +10,6 @@ */ #include -#include #include #include #include @@ -53,32 +52,6 @@ const struct location netlink_location = { .indesc = &indesc_netlink, }; -struct mnl_socket *netlink_open_sock(void) -{ - struct mnl_socket *nf_sock; - - nf_sock = mnl_socket_open(NETLINK_NETFILTER); - if (nf_sock == NULL) - netlink_init_error(); - - if (fcntl(mnl_socket_get_fd(nf_sock), F_SETFL, O_NONBLOCK)) - netlink_init_error(); - - return nf_sock; -} - -void netlink_close_sock(struct mnl_socket *nf_sock) -{ - if (nf_sock) - mnl_socket_close(nf_sock); -} - -struct mnl_socket *netlink_restart(struct mnl_socket *nf_sock) -{ - netlink_close_sock(nf_sock); - return netlink_open_sock(); -} - void __noreturn __netlink_abi_error(const char *file, int line, const char *reason) { diff --git a/src/rule.c b/src/rule.c index 12ac1310034d..9087fd2bd193 100644 --- a/src/rule.c +++ b/src/rule.c @@ -243,7 +243,7 @@ replay: if (ret < 0) { cache_release(cache); if (errno == EINTR) { - nft->nf_sock = netlink_restart(nft->nf_sock); + nft->nf_sock = nft_mnl_socket_reopen(nft->nf_sock); goto replay; } return -1;