sd-network: /_get_link_/_link_get_/

[elogind.git] / src / network / networkctl.c

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 731ad27d530de703a4a4f03515ffb0f44ee61cde..6fb9e627757f654cdd52a90af9d9c87f28f4ddfc 100644 (file)
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -198,8 +198,8 @@ static int list_links(char **args, unsigned n) {
                  char devid[2 + DECIMAL_STR_MAX(int)];
                 _cleanup_free_ char *t = NULL;
 
-                sd_network_get_link_state(links[i].ifindex, &state);
-                sd_network_get_link_operational_state(links[i].ifindex, &operational_state);
+                sd_network_link_get_state(links[i].ifindex, &state);
+                sd_network_link_get_operational_state(links[i].ifindex, &operational_state);
 
                 sprintf(devid, "n%i", links[i].ifindex);
                 d = udev_device_new_from_device_id(udev, devid);
@@ -340,11 +340,11 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
 
         sd_rtnl_message_read_u32(reply, IFLA_MTU, &mtu);
 
-        sd_network_get_link_state(ifindex, &state);
-        sd_network_get_link_operational_state(ifindex, &operational_state);
+        sd_network_link_get_state(ifindex, &state);
+        sd_network_link_get_operational_state(ifindex, &operational_state);
 
-        sd_network_get_link_dns(ifindex, &dns);
-        sd_network_get_link_ntp(ifindex, &ntp);
+        sd_network_link_get_dns(ifindex, &dns);
+        sd_network_link_get_ntp(ifindex, &ntp);
 
         sprintf(devid, "n%i", ifindex);
         d = udev_device_new_from_device_id(udev, devid);
@@ -427,11 +427,19 @@ static int link_status(char **args, unsigned n) {
                 _cleanup_free_ char *operational_state = NULL;
                 _cleanup_strv_free_ char **dns = NULL, **ntp = NULL;
                 _cleanup_free_ struct local_address *addresses = NULL;
+                const char *on_color_oper = "", *off_color_oper = "";
                 int i, c;
 
                 sd_network_get_operational_state(&operational_state);
-                if (operational_state)
-                        printf("       State: %s\n", operational_state);
+                if (streq_ptr(operational_state, "routable")) {
+                        on_color_oper = ansi_highlight_green();
+                        off_color_oper = ansi_highlight_off();
+                } else if (streq_ptr(operational_state, "degraded")) {
+                        on_color_oper = ansi_highlight_yellow();
+                        off_color_oper = ansi_highlight_off();
+                }
+
+                printf("       State: %s%s%s\n", on_color_oper, strna(operational_state), off_color_oper);
 
                 c = local_addresses(rtnl, 0, &addresses);
                 for (i = 0; i < c; i++) {