From 67cc041bd34ac7a3b3f6a3e7e811cf33ca757226 Mon Sep 17 00:00:00 2001 From: Varsha Rao Date: Wed, 2 Aug 2017 12:43:08 +0100 Subject: src: netlink: Subscribe nft monitor and nft monitor trace to respective groups. Subscribe nft monitor to both NFNLGRP_NFTABLES and NFNLGRP_NFTRACE. nft monitor trace subscribes only to NFNLGRP_NFTRACE. Other event reporting options to only NFNLGRP_NFTABLES. Joint work with Pablo Neira. Signed-off-by: Varsha Rao Signed-off-by: Pablo Neira Ayuso --- src/netlink.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) (limited to 'src/netlink.c') diff --git a/src/netlink.c b/src/netlink.c index b4386ad4..ffdadfb1 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -3080,22 +3080,26 @@ int netlink_monitor(struct netlink_mon_handler *monhandler, { int group; - 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)); - - 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_sock, netlink_events_cb, - monhandler); + if (monhandler->monitor_flags & (1 << NFT_MSG_TRACE)) { + 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)); + } + if (monhandler->monitor_flags & ~(1 << NFT_MSG_TRACE)) { + 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)); + } + + return mnl_nft_event_listener(nf_sock, netlink_events_cb, monhandler); } bool netlink_batch_supported(struct mnl_socket *nf_sock) -- cgit v1.2.3