networkctl: show MAC address OUI vendor next to MAC addresses

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

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 3e304b261f147d8a8ff6144896d8b0d558c137a5..b3c5a6c2ca109f7664260457cfbf2f41ec863275 100644 (file)
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -254,6 +254,9 @@ static int ieee_oui(struct udev_hwdb *hwdb, struct ether_addr *mac, char **ret)
         char *description;
         char str[strlen("OUI:XXYYXXYYXXYY") + 1];
 
+        if (!hwdb)
+                return -EINVAL;
+
         /* skip commonly misused 00:00:00 (Xerox) prefix */
         if (memcmp(mac, "\0\0\0", 3) == 0)
                 return -EINVAL;
@@ -375,118 +378,34 @@ static int get_gateway_description(sd_rtnl *rtnl, struct udev_hwdb *hwdb, int if
 }
 
 static int dump_gateways(sd_rtnl *rtnl, struct udev_hwdb *hwdb, const char *prefix, int ifindex) {
-        _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL;
-        sd_rtnl_message *m;
-        bool first = true;
-        int r;
-
-        assert(rtnl);
-        assert(ifindex >= 0);
-
-        r = sd_rtnl_message_new_route(rtnl, &req, RTM_GETROUTE, AF_UNSPEC, RTPROT_UNSPEC);
-        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)) {
-                _cleanup_free_ char *gateway = NULL, *gateway_description = NULL;
-                union in_addr_union gw = {};
-                uint16_t type;
-                uint32_t ifi;
-                int family;
-
-                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_NEWROUTE) {
-                        log_error("type is not RTM_NEWROUTE");
-                        continue;
-                }
-
-                r = sd_rtnl_message_route_get_family(m, &family);
-                if (r < 0) {
-                        log_error_errno(r, "could not get family: %m");
-                        continue;
-                }
-
-                r = sd_rtnl_message_read_u32(m, RTA_OIF, &ifi);
-                if (r < 0) {
-                        log_error_errno(r, "could not get RTA_OIF: %m");
-                        continue;
-                }
-
-                if (ifindex > 0 && ifi != (unsigned) ifindex)
-                        continue;
-
-                switch (family) {
-                case AF_INET:
-                        r = sd_rtnl_message_read_in_addr(m, RTA_GATEWAY, &gw.in);
-                        if (r < 0)
-                                continue;
-
-                        r = sd_rtnl_message_read_in_addr(m, RTA_DST, NULL);
-                        if (r >= 0)
-                                continue;
-
-                        r = sd_rtnl_message_read_in_addr(m, RTA_SRC, NULL);
-                        if (r >= 0)
-                                continue;
-
-                        break;
-                case AF_INET6:
-                        r = sd_rtnl_message_read_in6_addr(m, RTA_GATEWAY, &gw.in6);
-                        if (r < 0)
-                                continue;
-
-                        r = sd_rtnl_message_read_in6_addr(m, RTA_DST, NULL);
-                        if (r >= 0)
-                                continue;
+        _cleanup_free_ struct local_address *local = NULL;
+        int r, n, i;
 
-                        r = sd_rtnl_message_read_in6_addr(m, RTA_SRC, NULL);
-                        if (r >= 0)
-                                continue;
+        n = local_gateways(rtnl, ifindex, AF_UNSPEC, &local);
+        if (n < 0)
+                return n;
 
-                        break;
-                default:
-                        continue;
-                }
+        for (i = 0; i < n; i++) {
+                _cleanup_free_ char *gateway = NULL, *description = NULL;
 
-                r = in_addr_to_string(family, &gw, &gateway);
+                r = in_addr_to_string(local[i].family, &local[i].address, &gateway);
                 if (r < 0)
-                        continue;
+                        return r;
 
-                r = get_gateway_description(rtnl, hwdb, ifi, family, &gw, &gateway_description);
+                r = get_gateway_description(rtnl, hwdb, ifindex, local[i].family, &local[i].address, &description);
                 if (r < 0)
-                        log_debug("could not get description of gateway: %s", strerror(-r));
+                        log_debug_errno(r, "Could not get description of gateway: %m");
 
-                if (gateway_description)
+                if (description)
                         printf("%*s%s (%s)\n",
                                (int) strlen(prefix),
-                               first ? prefix : "",
-                               gateway, gateway_description);
+                               i == 0 ? prefix : "",
+                               gateway, description);
                 else
                         printf("%*s%s\n",
                                (int) strlen(prefix),
-                               first ? prefix : "",
+                               i == 0 ? prefix : "",
                                gateway);
-
-                first = false;
         }
 
         return 0;
@@ -496,7 +415,7 @@ 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;
 
@@ -658,19 +577,25 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
         if (model)
                 printf("       Model: %s\n", model);
 
+        hwdb = udev_hwdb_new(udev);
+
         if (have_mac) {
+                _cleanup_free_ char *description = NULL;
                 char ea[ETHER_ADDR_TO_STRING_MAX];
-                printf("  HW Address: %s\n", ether_addr_to_string(&e, ea));
+
+                ieee_oui(hwdb, &e, &description);
+
+                if (description)
+                        printf("  HW Address: %s (%s)\n", ether_addr_to_string(&e, ea), description);
+                else
+                        printf("  HW Address: %s\n", ether_addr_to_string(&e, ea));
         }
 
         if (mtu > 0)
                 printf("         MTU: %u\n", mtu);
 
-        hwdb = udev_hwdb_new(udev);
-
-        dump_gateways(rtnl, hwdb, "     Gateway: ", ifindex);
-
         dump_addresses(rtnl, "     Address: ", ifindex);
+        dump_gateways(rtnl, hwdb, "     Gateway: ", ifindex);
 
         if (!strv_isempty(dns))
                 dump_list("         DNS: ", dns);
@@ -708,7 +633,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;