erspan: fix JSON output

The format for erspan/erspan6 output is not valid JSON, as on version 2 a
valueless key was presented. The direction should be value and erspan_dir
should be the key.

Fixes: 289763626721 ("erspan: add erspan version II support")
Cc: u9012063@gmail.com
Reported-by: Christian Pössinger <christian@poessinger.com>
Signed-off-by: Christian Pössinger <christian@poessinger.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/ip/link_gre.c b/ip/link_gre.c
index 0461e5d06ef31c3ba7d3625f96838366da7b4af7..6d4a8be81da6ed1b6855a1342afe998fb722b68f 100644 (file)
--- a/ip/link_gre.c
+++ b/ip/link_gre.c
@@ -536,10 +536,10 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
 
                if (erspan_dir == 0)
                        print_string(PRINT_ANY, "erspan_dir",
-                                    "erspan_dir ingress ", NULL);
+                                    "erspan_dir %s ", "ingress");
                else
                        print_string(PRINT_ANY, "erspan_dir",
-                                    "erspan_dir egress ", NULL);
+                                    "erspan_dir %s ", "egress");
        }
 
        if (tb[IFLA_GRE_ERSPAN_HWID]) {

diff --git a/ip/link_gre6.c b/ip/link_gre6.c
index 9d270f4b44558dfcd09341fe424a2456bc2e73b9..f33598af89897d40f5bacc6fd3ba34b718df7ca7 100644 (file)
--- a/ip/link_gre6.c
+++ b/ip/link_gre6.c
@@ -594,10 +594,10 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
 
                if (erspan_dir == 0)
                        print_string(PRINT_ANY, "erspan_dir",
-                                    "erspan_dir ingress ", NULL);
+                                    "erspan_dir %s ", "ingress");
                else
                        print_string(PRINT_ANY, "erspan_dir",
-                                    "erspan_dir egress ", NULL);
+                                    "erspan_dir %s ", "egress");
        }
 
        if (tb[IFLA_GRE_ERSPAN_HWID]) {