From patchwork Wed Jul 19 12:34:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varsha Rao X-Patchwork-Id: 790994 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hYI/9QRH"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xCGgD2JD1z9sNc for ; Wed, 19 Jul 2017 22:34:16 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752973AbdGSMeP (ORCPT ); Wed, 19 Jul 2017 08:34:15 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:33909 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753249AbdGSMeO (ORCPT ); Wed, 19 Jul 2017 08:34:14 -0400 Received: by mail-pf0-f196.google.com with SMTP id o88so6254137pfk.1 for ; Wed, 19 Jul 2017 05:34:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:date:from:to:subject:mime-version:content-disposition :user-agent; bh=ijtBxSAGgxfXSeWSzzY44eWIZt9tPpWCstB2ddO4yJY=; b=hYI/9QRHiaVGLAovDYH+8A0abtRkA5wGT3nNvVJBbyQmIQv3qhkVc9t6px02oLowDP hTBxXw4w+a/LRwRB8KnQuf6bXbgtSkFqymyhFetV4SEqsSyENanr2k+ORCNsk8+ZBrk/ y+TZEgkpOWRAF7EnHzgzFdH/L6xaIeiS1Jv6ep4KFH6XA2LeWw/A0LBfS1KXLSx4eKG0 Z9PzgGgi7rOo4LEz27HkDVvx99D+3jzxwASz4Pc1NjUiqXvXt0/E3At60VG8T2xUFSVI C3j3LoicNQt0JcP5lBbEqLvmS6sH1M8h4rpSqPIemlDc2rQYM83dreOc3efjIw+gThYS EqVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:date:from:to:subject:mime-version :content-disposition:user-agent; bh=ijtBxSAGgxfXSeWSzzY44eWIZt9tPpWCstB2ddO4yJY=; b=kHwBRkwSY7acAybbBW0qtW32D8pSIoZnPrZH1AGbUcLgqHY00mkya7Y6HKgFfPsnVN OcEvJKOOA14XEDtTZ49jmln2VTcDvr3Gn7l1NPqRWEJA62tG2haGzAFvDCMbV30h0R0Z DHacxHZpYmy2aNykje4eT+nSeRSPfpGqcU47rof7ep5XhCPxhczdn8gLpbChCQm2Dl0B BVnhNmlPeF/Dk0jhBWcUa2JgreR3Vf2V9y3v/C8SnWgI351yXjMeBYI5/vz4LbIvDA3a vOxuApGhVIW0UvX6xiMywwZSGBNEO+8isDd03gKCzY9kFKToqOCLAbMKYryHEGq9iFTc mgjg== X-Gm-Message-State: AIVw111rBapScqbQUkxOBLGxrYxaS6/kielUXKT2IixnM4Hv6CYI86qv 0MJne1jFHJ8KBtdJZ/Y= X-Received: by 10.99.1.139 with SMTP id 133mr470082pgb.319.1500467653447; Wed, 19 Jul 2017 05:34:13 -0700 (PDT) Received: from euri ([2405:204:d:e935:3f03:9d1a:1286:9da5]) by smtp.gmail.com with ESMTPSA id m68sm11623757pfi.12.2017.07.19.05.34.12 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 19 Jul 2017 05:34:12 -0700 (PDT) Message-ID: <596f51c4.c744620a.84997.9346@mx.google.com> X-Google-Original-Message-ID: <20170719123407.GA9389@> Date: Wed, 19 Jul 2017 18:04:07 +0530 From: Varsha Rao To: pablo@netfilter.org, netfilter-devel@vger.kernel.org Subject: [PATCH nft] src: netlink: Remove variable nf_mon_sock. MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.8.3 (2017-05-23) Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Remove variable nf_mon_sock of type structure mnl_socket to avoid duplicity. Instead variable nf_sock of the same type is passed as argument to netlink_monitor(). Also remove netlink_open_mon_sock() function definition, which is no longer required. Signed-off-by: Varsha Rao --- include/netlink.h | 3 ++- src/mnl.c | 34 +++++++++++++++++++++++++--------- src/netlink.c | 33 ++++++++++++++++----------------- src/rule.c | 2 +- 4 files changed, 44 insertions(+), 28 deletions(-) diff --git a/include/netlink.h b/include/netlink.h index 5b43c5c..7865186 100644 --- a/include/netlink.h +++ b/include/netlink.h @@ -218,7 +218,8 @@ struct netlink_mon_handler { bool cache_needed; }; -extern int netlink_monitor(struct netlink_mon_handler *monhandler); +extern int netlink_monitor(struct netlink_mon_handler *monhandler, + struct mnl_socket *nf_sock); bool netlink_batch_supported(struct mnl_socket *nf_sock); #endif /* NFTABLES_NETLINK_H */ diff --git a/src/mnl.c b/src/mnl.c index cf060a4..b7a96dd 100644 --- a/src/mnl.c +++ b/src/mnl.c @@ -1116,28 +1116,44 @@ int mnl_nft_event_listener(struct mnl_socket *nf_sock, unsigned int bufsiz = NFTABLES_NLEVENT_BUFSIZ; char buf[NFT_NLMSG_MAXSIZE]; int ret; + struct timeval tv = { + .tv_sec = 0, + .tv_usec = 0 + }; ret = setsockopt(mnl_socket_get_fd(nf_sock), SOL_SOCKET, SO_RCVBUFFORCE, &bufsiz, sizeof(socklen_t)); - if (ret < 0) { + if (ret < 0) { /* If this doesn't work, try to reach the system wide maximum * (or whatever the user requested). */ - ret = setsockopt(mnl_socket_get_fd(nf_sock), SOL_SOCKET, + ret = setsockopt(mnl_socket_get_fd(nf_sock), SOL_SOCKET, SO_RCVBUF, &bufsiz, sizeof(socklen_t)); printf("# Cannot set up netlink socket buffer size to %u bytes, falling back to %u bytes\n", NFTABLES_NLEVENT_BUFSIZ, bufsiz); } while (1) { - ret = mnl_socket_recvfrom(nf_sock, buf, sizeof(buf)); - if (ret < 0) { - if (errno == ENOBUFS) { - printf("# ERROR: We lost some netlink events!\n"); - continue; + int fd = mnl_socket_get_fd(nf_sock); + fd_set readfds; + + FD_ZERO(&readfds); + FD_SET(fd, &readfds); + + ret = select(fd+1, &readfds, NULL, NULL, &tv); + if (ret < 0) + return -1; + + if (FD_ISSET(fd, &readfds)) { + ret = mnl_socket_recvfrom(nf_sock, buf, sizeof(buf)); + if (ret < 0) { + if (errno == ENOBUFS) { + printf("# ERROR: We lost some netlink events!\n"); + continue; + } + fprintf(stdout, "# ERROR: %s\n", strerror(errno)); + break; } - fprintf(stdout, "# ERROR: %s\n", strerror(errno)); - break; } #ifdef DEBUG diff --git a/src/netlink.c b/src/netlink.c index e3c90da..d5d3c73 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -39,8 +39,6 @@ #include #include -static struct mnl_socket *nf_mon_sock; - const struct input_descriptor indesc_netlink = { .name = "netlink", .type = INDESC_NETLINK, @@ -73,8 +71,6 @@ void netlink_close_sock(struct mnl_socket *nf_sock) { if (nf_sock) mnl_socket_close(nf_sock); - if (nf_mon_sock) - mnl_socket_close(nf_mon_sock); } void netlink_restart(struct mnl_socket *nf_sock) @@ -88,11 +84,6 @@ void netlink_genid_get(struct mnl_socket *nf_sock) mnl_genid_get(nf_sock); } -static void netlink_open_mon_sock(void) -{ - nf_mon_sock = nfsock_open(); -} - void __noreturn __netlink_abi_error(const char *file, int line, const char *reason) { @@ -2961,18 +2952,26 @@ static int netlink_events_cb(const struct nlmsghdr *nlh, void *data) return ret; } -int netlink_monitor(struct netlink_mon_handler *monhandler) +int netlink_monitor(struct netlink_mon_handler *monhandler, + struct mnl_socket *nf_sock) { - netlink_open_mon_sock(); + int group; - if (mnl_socket_bind(nf_mon_sock, (1 << (NFNLGRP_NFTABLES-1)) | - (1 << (NFNLGRP_NFTRACE-1)), - MNL_SOCKET_AUTOPID) < 0) + group = NFNLGRP_NFTABLES; + if (mnl_socket_setsockopt(nf_sock, NETLINK_ADD_MEMBERSHIP, &group, + sizeof(int)) < 0) return netlink_io_error(monhandler->ctx, monhandler->loc, - "Could not bind to netlink socket %s", - strerror(errno)); + "Could not bind to netlink socket %s", + strerror(errno)); + + group = NFNLGRP_NFTRACE; + if (mnl_socket_setsockopt(nf_sock, NETLINK_ADD_MEMBERSHIP, &group, + sizeof(int)) < 0) + return netlink_io_error(monhandler->ctx, monhandler->loc, + "Could not bind to netlink socket %s", + strerror(errno)); - return mnl_nft_event_listener(nf_mon_sock, netlink_events_cb, + return mnl_nft_event_listener(nf_sock, netlink_events_cb, monhandler); } diff --git a/src/rule.c b/src/rule.c index 1d89feb..7f83980 100644 --- a/src/rule.c +++ b/src/rule.c @@ -1659,7 +1659,7 @@ static int do_command_monitor(struct netlink_ctx *ctx, struct cmd *cmd) monhandler.ctx = ctx; monhandler.loc = &cmd->location; - return netlink_monitor(&monhandler); + return netlink_monitor(&monhandler, ctx->nf_sock); } static int do_command_describe(struct netlink_ctx *ctx, struct cmd *cmd)