diff mbox series

iplink: support JSON in MPLS output

Message ID 20221210034648.90592-1-stephen@networkplumber.org (mailing list archive)
State Accepted
Commit 13cd02228fd6211910535ea3d33ff4ef51169178
Headers show
Series iplink: support JSON in MPLS output | expand

Checks

Context Check Description
netdev/tree_selection success Not a local patch

Commit Message

Stephen Hemminger Dec. 10, 2022, 3:46 a.m. UTC 
The MPLS statistics did not support oneline or JSON
in current code.

Fixes: 837552b445f5 ("iplink: add support for afstats subcommand")
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 ip/iplink.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

Comments

patchwork-bot+netdevbpf@kernel.org Dec. 12, 2022, 4:40 p.m. UTC | #1 
Hello:

This patch was applied to iproute2/iproute2.git (main)
by Stephen Hemminger <stephen@networkplumber.org>:

On Fri,  9 Dec 2022 19:46:48 -0800 you wrote:
> The MPLS statistics did not support oneline or JSON
> in current code.
> 
> Fixes: 837552b445f5 ("iplink: add support for afstats subcommand")
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---
>  ip/iplink.c | 19 ++++++++++++++-----
>  1 file changed, 14 insertions(+), 5 deletions(-)

Here is the summary with links:
  - iplink: support JSON in MPLS output
    https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=13cd02228fd6

You are awesome, thank you!
diff mbox series

Patch

diff --git a/ip/iplink.c b/ip/iplink.c
index adb9524c3b93..b8a5284febfb 100644
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -1570,7 +1570,7 @@  void print_mpls_link_stats(FILE *fp, const struct mpls_link_stats *stats,
 		print_num(fp, cols[2], stats->rx_errors);
 		print_num(fp, cols[3], stats->rx_dropped);
 		print_num(fp, cols[4], stats->rx_noroute);
-		fprintf(fp, "\n");
+		print_nl();
 
 		fprintf(fp, "%sTX: %*s %*s %*s %*s%s", indent,
 			cols[0] - 4, "bytes", cols[1], "packets",
@@ -1594,9 +1594,11 @@  static void print_mpls_stats(FILE *fp, struct rtattr *attr)
 		return;
 
 	stats = RTA_DATA(mrtb[MPLS_STATS_LINK]);
-	fprintf(fp, "    mpls:\n");
+	print_string(PRINT_FP, NULL, "    mpls:", NULL);
+	print_nl();
 	print_mpls_link_stats(fp, stats, "        ");
-	fprintf(fp, "\n");
+	print_string(PRINT_FP, NULL, "%s", "\n");
+	fflush(fp);
 }
 
 static void print_af_stats_attr(FILE *fp, int ifindex, struct rtattr *attr)
@@ -1612,8 +1614,12 @@  static void print_af_stats_attr(FILE *fp, int ifindex, struct rtattr *attr)
 			continue;
 
 		if (!if_printed) {
-			fprintf(fp, "%u: %s\n", ifindex,
-				ll_index_to_name(ifindex));
+			print_uint(PRINT_ANY, "ifindex",
+				   "%u:", ifindex);
+			print_color_string(PRINT_ANY, COLOR_IFNAME, 
+					   "ifname", "%s",
+					   ll_index_to_name(ifindex));
+			print_nl();
 			if_printed = true;
 		}
 
@@ -1696,6 +1702,8 @@  static int iplink_afstats(int argc, char **argv)
 		}
 	}
 
+	new_json_obj(json);
+
 	if (rtnl_statsdump_req_filter(&rth, AF_UNSPEC, filt_mask,
 				      NULL, NULL) < 0) {
 		perror("Cannont send dump request");
@@ -1707,6 +1715,7 @@  static int iplink_afstats(int argc, char **argv)
 		return 1;
 	}
 
+	delete_json_obj();
 	return 0;
 }