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 397a0d31d2494543b019239e0a11afb6e3397930..6fb9e627757f654cdd52a90af9d9c87f28f4ddfc 100644 (file)
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -184,7 +184,7 @@ static int list_links(char **args, unsigned n) {
         }
 
         if (arg_legend)
-                printf("%3s %-16s %-10s %-10s %-10s\n", "IDX", "LINK", "TYPE", "ADMIN", "OPERATIONAL");
+                printf("%3s %-16s %-10s %-11s %-10s\n", "IDX", "LINK", "TYPE", "ADMIN", "OPERATIONAL");
 
         c = decode_and_sort_links(reply, &links);
         if (c < 0)
@@ -193,12 +193,13 @@ static int list_links(char **args, unsigned n) {
         for (i = 0; i < c; i++) {
                 _cleanup_free_ char *state = NULL, *operational_state = NULL;
                 _cleanup_udev_device_unref_ struct udev_device *d = NULL;
-                const char *on_color = "", *off_color = "";
+                const char *on_color_oper = "", *off_color_oper = "",
+                           *on_color = "", *off_color = "";
                  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);
@@ -206,14 +207,28 @@ static int list_links(char **args, unsigned n) {
                 link_get_type_string(links[i].iftype, d, &t);
 
                 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();
+                }
+
+                if (streq_ptr(state, "configured")) {
                         on_color = ansi_highlight_green();
                         off_color = ansi_highlight_off();
-                } else if (streq_ptr(operational_state, "degraded")) {
+                } else if (streq_ptr(state, "configuring")) {
                         on_color = ansi_highlight_yellow();
                         off_color = ansi_highlight_off();
+                } else if (streq_ptr(state, "failed") ||
+                           streq_ptr(state, "linger")) {
+                        on_color = ansi_highlight_red();
+                        off_color = ansi_highlight_off();
                 }
 
-                printf("%3i %-16s %-10s %-10s %s%-10s%s\n", links[i].ifindex, links[i].name, strna(t), strna(state), on_color, strna(operational_state), off_color);
+                printf("%3i %-16s %-10s %s%-11s%s %s%-10s%s\n", links[i].ifindex,
+                       links[i].name, strna(t), on_color, strna(state), off_color,
+                       on_color_oper, strna(operational_state), off_color_oper);
         }
 
         if (arg_legend)
@@ -325,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);
@@ -396,13 +411,47 @@ static int link_status(char **args, unsigned n) {
         char **name;
         int r;
 
+        r = sd_rtnl_open(&rtnl, 0);
+        if (r < 0) {
+                log_error("Failed to connect to netlink: %s", strerror(-r));
+                return r;
+        }
+
+        udev = udev_new();
+        if (!udev) {
+                log_error("Failed to connect to udev: %m");
+                return -errno;
+        }
+
         if (n <= 1 && !arg_all) {
                 _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++) {
+                        _cleanup_free_ char *pretty = NULL;
+
+                        r = in_addr_to_string(addresses[i].family, &addresses[i].address, &pretty);
+                        if (r < 0)
+                                return log_oom();
+
+                        printf("%13s %s\n",
+                               i > 0 ? "" : "Address:", pretty);
+                }
 
                 sd_network_get_dns(&dns);
                 if (!strv_isempty(dns))
@@ -417,18 +466,6 @@ static int link_status(char **args, unsigned n) {
 
         pager_open_if_enabled();
 
-        r = sd_rtnl_open(&rtnl, 0);
-        if (r < 0) {
-                log_error("Failed to connect to netlink: %s", strerror(-r));
-                return r;
-        }
-
-        udev = udev_new();
-        if (!udev) {
-                log_error("Failed to connect to udev: %m");
-                return -errno;
-        }
-
         if (arg_all) {
                 _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL;
                 _cleanup_free_ LinkInfo *links = NULL;