X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkctl.c;h=d6d2e1dd274ad980f5c1888264edbb56ea2532b9;hp=dc0bb4da7c9c3bcd2d79fe4584fce0f8151ae866;hb=78c958f82e929f015169ce1ed614d1e9c50928aa;hpb=d57c365bf8f09fbcc649e00f7060ff30809f67c2

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index dc0bb4da7..d6d2e1dd2 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -33,6 +33,7 @@
 #include "udev-util.h"
 #include "arphrd-list.h"
 #include "local-addresses.h"
+#include "socket-util.h"
 
 static bool arg_no_pager = false;
 static bool arg_legend = true;
@@ -140,7 +141,7 @@ static int decode_and_sort_links(sd_rtnl_message *m, LinkInfo **ret) {
                 c++;
         }
 
-        qsort(links, c, sizeof(LinkInfo), link_info_compare);
+        qsort_safe(links, c, sizeof(LinkInfo), link_info_compare);
 
         *ret = links;
         links = NULL;
@@ -215,7 +216,7 @@ static int list_links(char **args, unsigned n) {
         }
 
         if (arg_legend)
-                printf("%3s %-16s %-10s %-11s %-10s\n", "IDX", "LINK", "TYPE", "OPERATIONAL", "SETUP");
+                printf("%3s %-16s %-18s %-11s %-10s\n", "IDX", "LINK", "TYPE", "OPERATIONAL", "SETUP");
 
         c = decode_and_sort_links(reply, &links);
         if (c < 0)
@@ -240,7 +241,7 @@ static int list_links(char **args, unsigned n) {
 
                 link_get_type_string(links[i].iftype, d, &t);
 
-                printf("%3i %-16s %-10s %s%-11s%s %s%-10s%s\n",
+                printf("%3i %-16s %-18s %s%-11s%s %s%-10s%s\n",
                        links[i].ifindex, links[i].name, strna(t),
                        on_color_operational, strna(operational_state), off_color_operational,
                        on_color_setup, strna(setup_state), off_color_setup);
@@ -288,7 +289,7 @@ static void dump_list(const char *prefix, char **l) {
 }
 
 static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
-        _cleanup_strv_free_ char **dns = NULL, **ntp = NULL;
+        _cleanup_strv_free_ char **dns = NULL, **ntp = NULL, **domains = NULL;
         _cleanup_free_ char *setup_state = NULL, *operational_state = NULL;
         _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL;
         _cleanup_udev_device_unref_ struct udev_device *d = NULL;
@@ -364,6 +365,18 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
 
         sd_network_link_get_dns(ifindex, &dns);
         sd_network_link_get_ntp(ifindex, &ntp);
+        sd_network_link_get_domains(ifindex, &domains);
+        r = sd_network_link_get_wildcard_domain(ifindex);
+        if (r > 0) {
+                char *wildcard;
+
+                wildcard = strdup("*");
+                if (!wildcard)
+                        return log_oom();
+
+                if (strv_consume(&domains, wildcard) < 0)
+                        return log_oom();
+        }
 
         sprintf(devid, "n%i", ifindex);
         d = udev_device_new_from_device_id(udev, devid);
@@ -401,8 +414,10 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
         if (model)
                 printf("       Model: %s\n", model);
 
-        if (have_mac)
-                printf("  HW Address: %s\n", ether_ntoa(&e));
+        if (have_mac) {
+                char ea[ETHER_ADDR_TO_STRING_MAX];
+                printf("  HW Address: %s\n", ether_addr_to_string(&e, ea));
+        }
 
         if (mtu > 0)
                 printf("         MTU: %u\n", mtu);
@@ -411,6 +426,8 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
 
         if (!strv_isempty(dns))
                 dump_list("         DNS: ", dns);
+        if (!strv_isempty(domains))
+                dump_list("      Domain: ", domains);
         if (!strv_isempty(ntp))
                 dump_list("         NTP: ", ntp);
 
@@ -437,21 +454,15 @@ static int link_status(char **args, unsigned n) {
 
         if (n <= 1 && !arg_all) {
                 _cleanup_free_ char *operational_state = NULL;
-                _cleanup_strv_free_ char **dns = NULL, **ntp = NULL;
+                _cleanup_strv_free_ char **dns = NULL, **ntp = NULL, **domains = NULL;
                 _cleanup_free_ struct local_address *addresses = NULL;
-                const char *on_color_oper = "", *off_color_oper = "";
+                const char *on_color_operational, *off_color_operational;
                 int i, c;
 
                 sd_network_get_operational_state(&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();
-                }
+                operational_state_to_color(operational_state, &on_color_operational, &off_color_operational);
 
-                printf("       State: %s%s%s\n", on_color_oper, strna(operational_state), off_color_oper);
+                printf("       State: %s%s%s\n", on_color_operational, strna(operational_state), off_color_operational);
 
                 c = local_addresses(rtnl, 0, &addresses);
                 for (i = 0; i < c; i++) {
@@ -469,7 +480,11 @@ static int link_status(char **args, unsigned n) {
                 if (!strv_isempty(dns))
                         dump_list("         DNS: ", dns);
 
-                sd_network_get_dns(&ntp);
+                sd_network_get_domains(&domains);
+                if (!strv_isempty(domains))
+                        dump_list("      Domain: ", domains);
+
+                sd_network_get_ntp(&ntp);
                 if (!strv_isempty(ntp))
                         dump_list("         NTP: ", ntp);