summaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-08-12 15:41:01 +0200
committerLennart Poettering <lennart@poettering.net>2014-08-12 15:41:01 +0200
commitdf3fb561b2df486a495a5f0bcc83168bd1860533 (patch)
treed58717ad99c00639c1f7ec0497afb7d82fa45ef7 /src/network
parent9085f64a6694f2928c79fcce365edb1dca6937d4 (diff)
networkctl: add a bit of color to the output
Diffstat (limited to 'src/network')
-rw-r--r--src/network/networkctl.c30
1 files changed, 24 insertions, 6 deletions
diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 2da5c834a7..9aec3f418a 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -125,12 +125,13 @@ static int list_links(char **args, unsigned n) {
}
if (arg_legend)
- printf("%3s %-16s %-10s %-10s %-10s\n", "IDX", "LINK", "TYPE", "STATE", "OPERATIONAL");
+ printf("%3s %-16s %-10s %-10s %-10s\n", "IDX", "LINK", "TYPE", "ADMIN", "OPERATIONAL");
for (i = reply; i; i = sd_rtnl_message_next(i)) {
_cleanup_free_ char *state = NULL, *operational_state = NULL;
_cleanup_udev_device_unref_ struct udev_device *d = NULL;
- char devid[2 + DECIMAL_STR_MAX(int)];
+ const char *on_color = "", *off_color = "";
+ char devid[2 + DECIMAL_STR_MAX(int)];
_cleanup_free_ char *t = NULL;
const char *name;
unsigned iftype;
@@ -164,7 +165,15 @@ static int list_links(char **args, unsigned n) {
link_get_type_string(iftype, d, &t);
- printf("%3i %-16s %-10s %-10s %-10s\n", ifindex, name, strna(t), strna(state), strna(operational_state));
+ if (streq_ptr(operational_state, "routable")) {
+ on_color = ansi_highlight_green();
+ off_color = ansi_highlight_off();
+ } else if (streq_ptr(operational_state, "degraded")) {
+ on_color = ansi_highlight_yellow();
+ off_color = ansi_highlight_off();
+ }
+
+ printf("%3i %-16s %-10s %-10s %s%-10s%s\n", ifindex, name, strna(t), strna(state), on_color, strna(operational_state), off_color);
c++;
}
@@ -217,6 +226,7 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
char devid[2 + DECIMAL_STR_MAX(int)];
_cleanup_free_ char *t = NULL;
const char *driver = NULL, *path = NULL, *vendor = NULL, *model = NULL;
+ const char *on_color = "", *off_color = "";
struct ether_addr e;
unsigned iftype;
int r, ifindex;
@@ -300,12 +310,20 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
model = udev_device_get_property_value(d, "ID_MODEL");
}
- printf("%i: %s\n", ifindex, name);
+ if (streq_ptr(operational_state, "routable")) {
+ on_color = ansi_highlight_green();
+ off_color = ansi_highlight_off();
+ } else if (streq_ptr(operational_state, "degraded")) {
+ on_color = ansi_highlight_yellow();
+ off_color = ansi_highlight_off();
+ }
+
+ printf("%s%s%s %i: %s\n", on_color, draw_special_char(DRAW_BLACK_CIRCLE), off_color, ifindex, name);
printf(" Type: %s\n"
- " State: %s (%s)\n",
+ " State: %s%s%s (%s)\n",
strna(t),
- strna(operational_state),
+ on_color, strna(operational_state), off_color,
strna(state));
if (path)