From patchwork Sat Dec 23 19:45:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harsha Sharma X-Patchwork-Id: 852692 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="Xd10w4r/"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z3wpl2y8pz9s84 for ; Sun, 24 Dec 2017 06:45:51 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752080AbdLWTpu (ORCPT ); Sat, 23 Dec 2017 14:45:50 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:34540 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751217AbdLWTpu (ORCPT ); Sat, 23 Dec 2017 14:45:50 -0500 Received: by mail-pf0-f196.google.com with SMTP id a90so16582077pfk.1 for ; Sat, 23 Dec 2017 11:45:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=vPqnqSHAxyT9pFO0CEyvj9tSHL0luaFVoOoJVeOzmh4=; b=Xd10w4r/2IxkFh9YJAjQV6F3SP496EFawq11c07LqD9PYFXaNlSvo5Lv+eObEpyZYf qMVzxYyQB21X1LUxKWuKCMBuehqFA4eR85sbf38OIGfv1ESv7eLPUTVyUQHcePi76yzJ 8JlwpfZYgKMtZ7xezHmMht1ZtHGxwqIn/XlWivfdUBxBe1UcTZ9Vy/2SusvGfXmwd3Yj ypJKUpf32kcqbxR6ifEccbjQtClzlLnSMlsfdYahT3mLRQV6O3CD8M9m2sXOtNUBiflP eUfG1rpmgYF2iIhau9z2oVaqibHC7wiCIuO3LJzSpJOWS4++n1JhT/QkNUkg2fqu3AHp nFIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=vPqnqSHAxyT9pFO0CEyvj9tSHL0luaFVoOoJVeOzmh4=; b=CBjd0AX16SyYUttx2yvj8OljXyqWL5qbeRlF8hD+BRRZUDJ4CizTBrZuI/rw8TB5Jr 86JtnMNDgsBZNZTbRK0Z+aaifu44b4Ii0GHbguj5rBzyimpYqwbwsj5qlzcugaiMBxdQ j+GddstUkkuNax+6P6cUNL49e7KmywO8WTSLzyqPOQqj0WRp9NFe6xAE40qaekCpdsL4 8dVBRQeJqdpa+BGr/L755khVfR+dBpVj7BxTNmZLDjCuE02/Gkb3FY+Q6UuYTH77C3at 0tqafwK5a+UE6tn3lBjkICCubf5BEHsK+xlxY5S6L/ba7l63IkP6A1UGRx2LdtNqEEFu Peow== X-Gm-Message-State: AKGB3mJNPc2Z9ijGSWp/pXXNkTn7QXXksqEC7R5oSbu1R9qAAPg40+IF 5sVrNjTt8wohSQrdOZpM4II= X-Google-Smtp-Source: ACJfBotB/HMrAg3YYTyEPf968LpKPjnpRg3BIoIfR8z/6hJKU/IxCMFpFnY0cSOBqzV6HM83DGNasg== X-Received: by 10.99.95.13 with SMTP id t13mr16593877pgb.235.1514058349578; Sat, 23 Dec 2017 11:45:49 -0800 (PST) Received: from ubuntu.localdomain ([157.37.15.9]) by smtp.gmail.com with ESMTPSA id a22sm53337281pfc.47.2017.12.23.11.45.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Dec 2017 11:45:49 -0800 (PST) From: Harsha Sharma To: pablo@netfilter.org, harshasharmaiitr@gmail.com Cc: netfilter-devel@vger.kernel.org Subject: [PATCH] src: print 'handle' attribute in tables Date: Sat, 23 Dec 2017 11:45:25 -0800 Message-Id: <20171223194525.6058-1-harshasharmaiitr@gmail.com> X-Mailer: git-send-email 2.11.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Print 'handle' attribute in tables, when listing via '-a' option For eg. nft list ruleset -a table ip test-ip4 { chain input { ip saddr 8.8.8.8 counter packets 0 bytes 0 # handle 3 } # handle 1} table ip filter { chain output { tcp dport ssh counter packets 0 bytes 0 # handle 4 } # handle 2} table ip xyz { # handle 3} Signed-off-by: Harsha Sharma --- include/linux/netfilter/nf_tables.h | 4 ++++ src/netlink.c | 6 +++++- src/rule.c | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h index f328944..6db9130 100644 --- a/include/linux/netfilter/nf_tables.h +++ b/include/linux/netfilter/nf_tables.h @@ -160,12 +160,14 @@ enum nft_table_flags { * @NFTA_TABLE_NAME: name of the table (NLA_STRING) * @NFTA_TABLE_FLAGS: bitmask of enum nft_table_flags (NLA_U32) * @NFTA_TABLE_USE: number of chains in this table (NLA_U32) + * @NFTA_TABLE_HANDLE: numeric handle of the table (NLA_U64) */ enum nft_table_attributes { NFTA_TABLE_UNSPEC, NFTA_TABLE_NAME, NFTA_TABLE_FLAGS, NFTA_TABLE_USE, + NFTA_TABLE_HANDLE, __NFTA_TABLE_MAX }; #define NFTA_TABLE_MAX (__NFTA_TABLE_MAX - 1) @@ -1307,6 +1309,7 @@ enum nft_object_attributes { * * @NFTA_TRACE_TABLE: name of the table (NLA_STRING) * @NFTA_TRACE_CHAIN: name of the chain (NLA_STRING) + * @NFTA_TRACE_TABLE_HANDLE: numeric handle of the table (NLA_U64) * @NFTA_TRACE_RULE_HANDLE: numeric handle of the rule (NLA_U64) * @NFTA_TRACE_TYPE: type of the event (NLA_U32: nft_trace_types) * @NFTA_TRACE_VERDICT: verdict returned by hook (NLA_NESTED: nft_verdicts) @@ -1326,6 +1329,7 @@ enum nft_trace_attributes { NFTA_TRACE_UNSPEC, NFTA_TRACE_TABLE, NFTA_TRACE_CHAIN, + NFTA_TRACE_TABLE_HANDLE, NFTA_TRACE_RULE_HANDLE, NFTA_TRACE_TYPE, NFTA_TRACE_VERDICT, diff --git a/src/netlink.c b/src/netlink.c index 8653ae6..59d7096 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -123,6 +123,8 @@ struct nftnl_table *alloc_nftnl_table(const struct handle *h) nftnl_table_set_u32(nlt, NFTNL_TABLE_FAMILY, h->family); if (h->table != NULL) nftnl_table_set(nlt, NFTNL_TABLE_NAME, h->table); + if (h->handle.id) + nftnl_table_set_u64(nlt, NFTNL_TABLE_HANDLE, h->handle.id); return nlt; } @@ -137,7 +139,7 @@ struct nftnl_chain *alloc_nftnl_chain(const struct handle *h) nftnl_chain_set_u32(nlc, NFTNL_CHAIN_FAMILY, h->family); nftnl_chain_set_str(nlc, NFTNL_CHAIN_TABLE, h->table); - if (h->handle.id != 0) + if (h->handle.id) nftnl_chain_set_u64(nlc, NFTNL_CHAIN_HANDLE, h->handle.id); if (h->chain != NULL) nftnl_chain_set_str(nlc, NFTNL_CHAIN_NAME, h->chain); @@ -964,6 +966,7 @@ static struct table *netlink_delinearize_table(struct netlink_ctx *ctx, table->handle.family = nftnl_table_get_u32(nlt, NFTNL_TABLE_FAMILY); table->handle.table = xstrdup(nftnl_table_get_str(nlt, NFTNL_TABLE_NAME)); table->flags = nftnl_table_get_u32(nlt, NFTNL_TABLE_FLAGS); + table->handle.handle.id = nftnl_table_get_u64(nlt, NFTNL_TABLE_HANDLE); return table; } @@ -992,6 +995,7 @@ int netlink_list_tables(struct netlink_ctx *ctx, const struct handle *h, return 0; } + ctx->data = h; nftnl_table_list_foreach(table_cache, list_table_cb, ctx); nftnl_table_list_free(table_cache); return 0; diff --git a/src/rule.c b/src/rule.c index bb9add0..e875816 100644 --- a/src/rule.c +++ b/src/rule.c @@ -820,6 +820,8 @@ static void table_print(const struct table *table, struct output_ctx *octx) chain_print(chain, octx); delim = "\n"; } + if (octx->handle > 0) + nft_print(octx, " # handle %" PRIu64, table->handle.handle.id); nft_print(octx, "}\n"); }