[nft RFC PATCH] expression: print sets and maps in pretty format

[nft RFC PATCH] expression: print sets and maps in pretty format

[Arturo Borrero Gonzalez]

Print elements per line instead of all in a single line.
The elements which can be 'short' are printed 5 per line,
and others, like IPv4 addresses are printed 2 per line.

Example:

% nft list ruleset -nnn
table ip t {
	set s {
		type inet_service
		elements = {1, 2, 3, 4, 10,
				432, 433, 434, 435, 436,
				437, 438, 439, 440, 441,
				442, 443, 444, 445, 446,
				447, 448, 449, 450, 12345 }
	}

	map m {
		type inet_service . iface_index : verdict
		elements = {123 . "lo" : accept,
				1234 . "lo" : accept,
				12345 . "lo" : accept,
				12346 . "lo" : accept,
				12347 . "lo" : accept }
	}


	set s2 {
		type ipv4_addr
		elements = { 1.1.1.1, 2.2.2.2,
				3.3.3.3, 4.4.3.4,
				4.4.4.4, 5.5.5.3,
				5.5.5.5 }
	}

	chain c {
		ip saddr . tcp dport {1.1.1.1 . 22, 2.2.2.2 . 80 }
		tcp dport {33333, 44444 }
		iif vmap {0 : accept }
	}
}

NOTE: some testcases require updates because the output change.

Signed-off-by: Arturo Borrero Gonzalez <arturo@debian.org>
---
 include/expression.h |    1 +
 include/nftables.h   |    1 +
 src/expression.c     |   58 +++++++++++++++++++++++++++++++++++++++++++++++++-
 src/netlink.c        |    2 ++
 4 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/include/expression.h b/include/expression.h
index 9ba87e8..2721434 100644
--- a/include/expression.h
+++ b/include/expression.h
@@ -243,6 +243,7 @@ struct expr {
 			struct list_head	expressions;
 			unsigned int		size;
 			uint32_t		set_flags;
+			const char		*delim;
 		};
 		struct {
 			/* EXPR_SET_REF */
diff --git a/include/nftables.h b/include/nftables.h
index 6f54155..93b3845 100644
--- a/include/nftables.h
+++ b/include/nftables.h
@@ -29,6 +29,7 @@ extern unsigned int numeric_output;
 extern unsigned int stateless_output;
 extern unsigned int ip2name_output;
 extern unsigned int handle_output;
+extern unsigned int elements_output;
 extern unsigned int debug_level;
 extern const char *include_paths[INCLUDE_PATHS_MAX];
 
diff --git a/src/expression.c b/src/expression.c
index 45f3ed8..7646b30 100644
--- a/src/expression.c
+++ b/src/expression.c
@@ -742,10 +742,66 @@ struct expr *list_expr_alloc(const struct location *loc)
 	return compound_expr_alloc(loc, &list_expr_ops);
 }
 
+static const char *calculate_delim(const struct expr *expr, int *count)
+{
+	const char *newline = ",\n\t\t\t\t";
+	const char *singleline = ", ";
+
+	if (expr->set_flags & NFT_SET_ANONYMOUS)
+		return singleline;
+
+	if (!expr->dtype)
+		return newline;
+
+	switch (expr->dtype->type) {
+	case TYPE_NFPROTO:
+	case TYPE_INTEGER:
+	case TYPE_ARPOP:
+	case TYPE_INET_PROTOCOL:
+	case TYPE_INET_SERVICE:
+	case TYPE_TCP_FLAG:
+	case TYPE_DCCP_PKTTYPE:
+	case TYPE_MARK:
+	case TYPE_IFINDEX:
+	case TYPE_CLASSID:
+	case TYPE_UID:
+	case TYPE_GID:
+	case TYPE_CT_DIR:
+		if (*count < 5)
+			return singleline;
+		*count = 0;
+		break;
+	case TYPE_IPADDR:
+	case TYPE_CT_STATE:
+	case TYPE_CT_STATUS:
+	case TYPE_PKTTYPE:
+		if (*count < 2)
+			return singleline;
+		*count = 0;
+		break;
+
+	default:
+		break;
+	}
+
+	return newline;
+}
+
 static void set_expr_print(const struct expr *expr)
 {
+	const struct expr *i;
+	const char *d = "";
+	int count = 0;
+
 	printf("{ ");
-	compound_expr_print(expr, ", ");
+
+	list_for_each_entry(i, &expr->expressions, list) {
+		printf("%s", d);
+		expr_print(i);
+		count++;
+		d = calculate_delim(expr, &count);
+	}
+
 	printf(" }");
 }
 
diff --git a/src/netlink.c b/src/netlink.c
index 6fbb67d..59e8918 100644
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -1730,6 +1730,8 @@ int netlink_get_setelems(struct netlink_ctx *ctx, const struct handle *h,
 	ctx->set = set;
 	set->init = set_expr_alloc(loc);
 	nftnl_set_elem_foreach(nls, list_setelem_cb, ctx);
+	set->init->set_flags = set->flags;
+	set->init->dtype = set->keytype;
 
 	if (!(set->flags & NFT_SET_INTERVAL))
 		list_expr_sort(&ctx->set->init->expressions);

Re: [nft RFC PATCH] expression: print sets and maps in pretty format

[Pablo M. Bermudo Garay]

2017-04-25 14:35 GMT+02:00 Arturo Borrero Gonzalez <arturo@debian.org>:
> Print elements per line instead of all in a single line.
> The elements which can be 'short' are printed 5 per line,
> and others, like IPv4 addresses are printed 2 per line.

The default terminfo tab size is 8. Why not align the first column of
elements for this case? It is only needed to replace the last tab of
"newline" with five spaces.

-       const char *newline = ",\n\t\t\t\t";
+       const char *newline = ",\n\t\t\t     ";

Re: [nft RFC PATCH] expression: print sets and maps in pretty format

[Arturo Borrero Gonzalez]

On 26 April 2017 at 00:00, Pablo M. Bermudo Garay <pablombg@gmail.com> wrote:
> 2017-04-25 14:35 GMT+02:00 Arturo Borrero Gonzalez <arturo@debian.org>:
>> Print elements per line instead of all in a single line.
>> The elements which can be 'short' are printed 5 per line,
>> and others, like IPv4 addresses are printed 2 per line.
>
> The default terminfo tab size is 8. Why not align the first column of
> elements for this case? It is only needed to replace the last tab of
> "newline" with five spaces.
>
> -       const char *newline = ",\n\t\t\t\t";
> +       const char *newline = ",\n\t\t\t     ";

yeah far better, sending v2 now