chiark / gitweb /
networkctl: use the shared functions for enumerating the local gateways
[elogind.git] / src / network / networkctl.c
index 2a7a1daf0f3b26ed05aa8071fe322b9bf55e9c9e..815ea1698d575b8ef11964e9933ad0f93eeda3e1 100644 (file)
@@ -34,6 +34,7 @@
 #include "arphrd-list.h"
 #include "local-addresses.h"
 #include "socket-util.h"
+#include "ether-addr-util.h"
 
 static bool arg_no_pager = false;
 static bool arg_legend = true;
@@ -190,16 +191,12 @@ static int list_links(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;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to connect to netlink: %m");
 
         udev = udev_new();
-        if (!udev) {
-                log_error("Failed to connect to udev: %m");
-                return -errno;
-        }
+        if (!udev)
+                return log_error_errno(errno, "Failed to connect to udev: %m");
 
         r = sd_rtnl_message_new_link(rtnl, &req, RTM_GETLINK, 0);
         if (r < 0)
@@ -210,10 +207,8 @@ static int list_links(char **args, unsigned n) {
                 return rtnl_log_create_error(r);
 
         r = sd_rtnl_call(rtnl, req, 0, &reply);
-        if (r < 0) {
-                log_error("Failed to enumerate links: %s", strerror(-r));
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to enumerate links: %m");
 
         if (arg_legend)
                 printf("%3s %-16s %-18s %-11s %-10s\n", "IDX", "LINK", "TYPE", "OPERATIONAL", "SETUP");
@@ -253,11 +248,171 @@ static int list_links(char **args, unsigned n) {
         return 0;
 }
 
+/* IEEE Organizationally Unique Identifier vendor string */
+static int ieee_oui(struct udev_hwdb *hwdb, struct ether_addr *mac, char **ret) {
+        struct udev_list_entry *entry;
+        char *description;
+        char str[strlen("OUI:XXYYXXYYXXYY") + 1];
+
+        /* skip commonly misused 00:00:00 (Xerox) prefix */
+        if (memcmp(mac, "\0\0\0", 3) == 0)
+                return -EINVAL;
+
+        snprintf(str, sizeof(str), "OUI:" ETHER_ADDR_FORMAT_STR, ETHER_ADDR_FORMAT_VAL(*mac));
+
+        udev_list_entry_foreach(entry, udev_hwdb_get_properties_list_entry(hwdb, str, 0))
+                if (strcmp(udev_list_entry_get_name(entry), "ID_OUI_FROM_DATABASE") == 0) {
+                        description = strdup(udev_list_entry_get_value(entry));
+                        if (!description)
+                                return -ENOMEM;
+
+                        *ret = description;
+                        return 0;
+                }
+
+        return -ENODATA;
+}
+
+static int get_gateway_description(sd_rtnl *rtnl, struct udev_hwdb *hwdb, int ifindex, int family,
+                                   union in_addr_union *gateway, char **gateway_description) {
+        _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL;
+        sd_rtnl_message *m;
+        int r;
+
+        assert(rtnl);
+        assert(ifindex >= 0);
+        assert(family == AF_INET || family == AF_INET6);
+        assert(gateway);
+        assert(gateway_description);
+
+        r = sd_rtnl_message_new_neigh(rtnl, &req, RTM_GETNEIGH, ifindex, family);
+        if (r < 0)
+                return r;
+
+        r = sd_rtnl_message_request_dump(req, true);
+        if (r < 0)
+                return r;
+
+        r = sd_rtnl_call(rtnl, req, 0, &reply);
+        if (r < 0)
+                return r;
+
+        for (m = reply; m; m = sd_rtnl_message_next(m)) {
+                union in_addr_union gw = {};
+                struct ether_addr mac = {};
+                uint16_t type;
+                int ifi, fam;
+
+                r = sd_rtnl_message_get_errno(m);
+                if (r < 0) {
+                        log_error_errno(r, "got error: %m");
+                        continue;
+                }
+
+                r = sd_rtnl_message_get_type(m, &type);
+                if (r < 0) {
+                        log_error_errno(r, "could not get type: %m");
+                        continue;
+                }
+
+                if (type != RTM_NEWNEIGH) {
+                        log_error("type is not RTM_NEWNEIGH");
+                        continue;
+                }
+
+                r = sd_rtnl_message_neigh_get_family(m, &fam);
+                if (r < 0) {
+                        log_error_errno(r, "could not get family: %m");
+                        continue;
+                }
+
+                if (fam != family) {
+                        log_error("family is not correct");
+                        continue;
+                }
+
+                r = sd_rtnl_message_neigh_get_ifindex(m, &ifi);
+                if (r < 0) {
+                        log_error_errno(r, "could not get ifindex: %m");
+                        continue;
+                }
+
+                if (ifindex > 0 && ifi != ifindex)
+                        continue;
+
+                switch (fam) {
+                case AF_INET:
+                        r = sd_rtnl_message_read_in_addr(m, NDA_DST, &gw.in);
+                        if (r < 0)
+                                continue;
+
+                        break;
+                case AF_INET6:
+                        r = sd_rtnl_message_read_in6_addr(m, NDA_DST, &gw.in6);
+                        if (r < 0)
+                                continue;
+
+                        break;
+                default:
+                        continue;
+                }
+
+                if (!in_addr_equal(fam, &gw, gateway))
+                        continue;
+
+                r = sd_rtnl_message_read_ether_addr(m, NDA_LLADDR, &mac);
+                if (r < 0)
+                        continue;
+
+                r = ieee_oui(hwdb, &mac, gateway_description);
+                if (r < 0)
+                        continue;
+
+                return 0;
+        }
+
+        return -ENODATA;
+}
+
+static int dump_gateways(sd_rtnl *rtnl, struct udev_hwdb *hwdb, const char *prefix, int ifindex) {
+        _cleanup_free_ struct local_address *local = NULL;
+        int r, n, i;
+
+        n = local_gateways(rtnl, ifindex, AF_UNSPEC, &local);
+        if (n < 0)
+                return n;
+
+        for (i = 0; i < n; i++) {
+                _cleanup_free_ char *gateway = NULL, *description = NULL;
+
+                r = in_addr_to_string(local[i].family, &local[i].address, &gateway);
+                if (r < 0)
+                        return r;
+
+                r = get_gateway_description(rtnl, hwdb, ifindex, local[i].family, &local[i].address, &description);
+                if (r < 0)
+                        log_debug_errno(r, "Could not get description of gateway: %m");
+
+                if (description)
+                        printf("%*s%s (%s)\n",
+                               (int) strlen(prefix),
+                               i == 0 ? prefix : "",
+                               gateway, description);
+                else
+                        printf("%*s%s\n",
+                               (int) strlen(prefix),
+                               i == 0 ? prefix : "",
+                               gateway);
+        }
+
+        return 0;
+}
+
 static int dump_addresses(sd_rtnl *rtnl, const char *prefix, int ifindex) {
         _cleanup_free_ struct local_address *local = NULL;
         int r, n, i;
 
-        n = local_addresses(rtnl, ifindex, &local);
+        n = local_addresses(rtnl, ifindex, AF_UNSPEC, &local);
         if (n < 0)
                 return n;
 
@@ -293,9 +448,10 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
         _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;
+        _cleanup_udev_hwdb_unref_ struct udev_hwdb *hwdb = NULL;
         char devid[2 + DECIMAL_STR_MAX(int)];
-        _cleanup_free_ char *t = NULL;
-        const char *driver = NULL, *path = NULL, *vendor = NULL, *model = NULL;
+        _cleanup_free_ char *t = NULL, *network = NULL;
+        const char *driver = NULL, *path = NULL, *vendor = NULL, *model = NULL, *link = NULL;
         const char *on_color_operational, *off_color_operational,
                    *on_color_setup, *off_color_setup;
         struct ether_addr e;
@@ -322,10 +478,8 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
                 return rtnl_log_create_error(r);
 
         r = sd_rtnl_call(rtnl, req, 0, &reply);
-        if (r < 0) {
-                log_error("Failed to query link: %s", strerror(-r));
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to query link: %m");
 
         r = sd_rtnl_message_link_get_ifindex(reply, &ifindex);
         if (r < 0)
@@ -384,6 +538,7 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
         link_get_type_string(iftype, d, &t);
 
         if (d) {
+                link = udev_device_get_property_value(d, "ID_NET_LINK_FILE");
                 driver = udev_device_get_property_value(d, "ID_NET_DRIVER");
                 path = udev_device_get_property_value(d, "ID_PATH");
 
@@ -396,11 +551,16 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
                         model = udev_device_get_property_value(d, "ID_MODEL");
         }
 
+        sd_network_link_get_network_file(ifindex, &network);
 
         printf("%s%s%s %i: %s\n", on_color_operational, draw_special_char(DRAW_BLACK_CIRCLE), off_color_operational, ifindex, name);
 
-        printf("        Type: %s\n"
+        printf("   Link File: %s\n"
+               "Network File: %s\n"
+               "        Type: %s\n"
                "       State: %s%s%s (%s%s%s)\n",
+               strna(link),
+               strna(network),
                strna(t),
                on_color_operational, strna(operational_state), off_color_operational,
                on_color_setup, strna(setup_state), off_color_setup);
@@ -422,6 +582,10 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
         if (mtu > 0)
                 printf("         MTU: %u\n", mtu);
 
+        hwdb = udev_hwdb_new(udev);
+
+        dump_gateways(rtnl, hwdb, "     Gateway: ", ifindex);
+
         dump_addresses(rtnl, "     Address: ", ifindex);
 
         if (!strv_isempty(dns))
@@ -441,16 +605,12 @@ static int link_status(char **args, unsigned n) {
         int r;
 
         r = sd_rtnl_open(&rtnl, 0);
-        if (r < 0) {
-                log_error("Failed to connect to netlink: %s", strerror(-r));
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to connect to netlink: %m");
 
         udev = udev_new();
-        if (!udev) {
-                log_error("Failed to connect to udev: %m");
-                return -errno;
-        }
+        if (!udev)
+                return log_error_errno(errno, "Failed to connect to udev: %m");
 
         if (n <= 1 && !arg_all) {
                 _cleanup_free_ char *operational_state = NULL;
@@ -464,7 +624,7 @@ static int link_status(char **args, unsigned n) {
 
                 printf("       State: %s%s%s\n", on_color_operational, strna(operational_state), off_color_operational);
 
-                c = local_addresses(rtnl, 0, &addresses);
+                c = local_addresses(rtnl, 0, AF_UNSPEC, &addresses);
                 for (i = 0; i < c; i++) {
                         _cleanup_free_ char *pretty = NULL;
 
@@ -484,7 +644,7 @@ static int link_status(char **args, unsigned n) {
                 if (!strv_isempty(domains))
                         dump_list("      Domain: ", domains);
 
-                sd_network_get_dns(&ntp);
+                sd_network_get_ntp(&ntp);
                 if (!strv_isempty(ntp))
                         dump_list("         NTP: ", ntp);
 
@@ -507,10 +667,8 @@ static int link_status(char **args, unsigned n) {
                         return rtnl_log_create_error(r);
 
                 r = sd_rtnl_call(rtnl, req, 0, &reply);
-                if (r < 0) {
-                        log_error("Failed to enumerate links: %s", strerror(-r));
-                        return r;
-                }
+                if (r < 0)
+                        return log_error_errno(r, "Failed to enumerate links: %m");
 
                 c = decode_and_sort_links(reply, &links);
                 if (c < 0)