bridge: fdb: Fix for missing keywords in non-JSON output

While migrating to JSON print library, some keywords were dropped from
standard output by accident. Add them back to unbreak output parsers.

Fixes: c7c1a1ef51aea ("bridge: colorize output and use JSON print library")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/bridge/fdb.c b/bridge/fdb.c
index 4dbc894ceab9396ac53712dc1d55bdbb2589fd90..6487fac579c20de7da73df026c9d97d63364d488 100644 (file)
--- a/bridge/fdb.c
+++ b/bridge/fdb.c
@@ -182,7 +182,7 @@ int print_fdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
                if (!is_json_context())
                        fprintf(fp, "dev ");
                print_color_string(PRINT_ANY, COLOR_IFNAME,
-                                  "ifname", "%s ",
+                                  "ifname", "dev %s ",
                                   ll_index_to_name(r->ndm_ifindex));
        }
 
@@ -199,7 +199,7 @@ int print_fdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 
                print_color_string(PRINT_ANY,
                                   ifa_family_color(family),
-                                   "dst", "%s ", dst);
+                                   "dst", "dst %s ", dst);
        }
 
        if (vid)
@@ -246,7 +246,7 @@ int print_fdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 
 
        if (tb[NDA_MASTER])
-               print_string(PRINT_ANY, "master", "%s ",
+               print_string(PRINT_ANY, "master", "master %s ",
                             ll_index_to_name(rta_getattr_u32(tb[NDA_MASTER])));
 
        print_string(PRINT_ANY, "state", "%s\n",