fprintf(f, "%s ", port_ifname);
}
}
+
+ if (!show_stats)
+ print_nl();
+
close_json_array(PRINT_JSON, NULL);
}
if (n->nlmsg_type == RTM_DELMDB)
print_bool(PRINT_ANY, "deleted", "Deleted ", true);
-
- if (is_json_context()) {
- print_int(PRINT_JSON, "index", NULL, ifindex);
- print_string(PRINT_JSON, "dev", NULL, dev);
- } else {
- fprintf(f, "%u: ", ifindex);
- color_fprintf(f, COLOR_IFNAME, "%s ", dev);
- }
-
+ print_int(PRINT_ANY, "index", "%u: ", ifindex);
+ print_color_string(PRINT_ANY, COLOR_IFNAME, "dev", "%s ", dev);
print_string(PRINT_ANY, "port", " %s ",
ll_index_to_name(e->ifindex));
print_string(PRINT_ANY, "timer", " %s",
format_timer(timer));
}
+
+ print_nl();
close_json_object();
}
} else {
struct rtattr *i = RTA_DATA(router);
uint32_t *port_ifindex = RTA_DATA(i);
+ const char *port_name = ll_index_to_name(*port_ifindex);
if (is_json_context()) {
open_json_array(PRINT_JSON, brifname);
open_json_object(NULL);
print_string(PRINT_JSON, "port", NULL,
- ll_index_to_name(*port_ifindex));
+ port_name);
close_json_object();
close_json_array(PRINT_JSON, NULL);
} else {
fprintf(fp, "router port dev %s master %s\n",
- ll_index_to_name(*port_ifindex),
- brifname);
+ port_name, brifname);
}
}
close_json_array(PRINT_JSON, NULL);