#include <stdbool.h>
#include <getopt.h>
+#include <net/if.h>
#include "sd-network.h"
#include "sd-rtnl.h"
#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;
static int ieee_oui(struct udev_hwdb *hwdb, struct ether_addr *mac, char **ret) {
struct udev_list_entry *entry;
char *description;
- char str[32];
+ 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;
- snprintf(str, sizeof(str), "OUI:%02X%02X%02X%02X%02X%02X", mac->ether_addr_octet[0], mac->ether_addr_octet[1], mac->ether_addr_octet[2],
- mac->ether_addr_octet[3], mac->ether_addr_octet[4], mac->ether_addr_octet[5]);
+ 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) {
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) {
+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;
r = sd_rtnl_message_neigh_get_ifindex(m, &ifi);
if (r < 0) {
- log_error_errno(r, "colud not get ifindex: %m");
+ log_error_errno(r, "could not get ifindex: %m");
continue;
}
return -ENODATA;
}
-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;
- }
+static int dump_gateways(
+ sd_rtnl *rtnl,
+ struct udev_hwdb *hwdb,
+ const char *prefix,
+ int ifindex) {
- r = sd_rtnl_message_read_u32(m, RTA_OIF, &ifi);
- if (r < 0) {
- log_error_errno(r, "colud not get RTA_OIF: %m");
- continue;
- }
+ _cleanup_free_ struct local_address *local = NULL;
+ int r, n, i;
- if (ifindex > 0 && ifi != (unsigned) ifindex)
- continue;
+ n = local_gateways(rtnl, ifindex, AF_UNSPEC, &local);
+ if (n < 0)
+ return n;
- switch (family) {
- case AF_INET:
- r = sd_rtnl_message_read_in_addr(m, RTA_GATEWAY, &gw.in);
- if (r < 0)
- continue;
+ for (i = 0; i < n; i++) {
+ _cleanup_free_ char *gateway = NULL, *description = NULL;
- r = sd_rtnl_message_read_in_addr(m, RTA_DST, NULL);
- if (r >= 0)
- continue;
+ r = in_addr_to_string(local[i].family, &local[i].address, &gateway);
+ if (r < 0)
+ return r;
- r = sd_rtnl_message_read_in_addr(m, RTA_SRC, NULL);
- if (r >= 0)
- continue;
+ r = get_gateway_description(rtnl, hwdb, local[i].ifindex, local[i].family, &local[i].address, &description);
+ if (r < 0)
+ log_debug_errno(r, "Could not get description of gateway: %m");
- break;
- case AF_INET6:
- r = sd_rtnl_message_read_in6_addr(m, RTA_GATEWAY, &gw.in6);
- if (r < 0)
- continue;
+ printf("%*s%s",
+ (int) strlen(prefix),
+ i == 0 ? prefix : "",
+ gateway);
- r = sd_rtnl_message_read_in6_addr(m, RTA_DST, NULL);
- if (r >= 0)
- continue;
+ if (description)
+ printf(" (%s)", description);
- r = sd_rtnl_message_read_in6_addr(m, RTA_SRC, NULL);
- if (r >= 0)
- continue;
+ /* Show interface name for the entry if we show
+ * entries for all interfaces */
+ if (ifindex <= 0) {
+ char name[IF_NAMESIZE+1];
- break;
- default:
- continue;
+ if (if_indextoname(local[i].ifindex, name)) {
+ fputs(" on ", stdout);
+ fputs(name, stdout);
+ } else
+ printf(" on %%%i", local[i].ifindex);
}
- r = in_addr_to_string(family, &gw, &gateway);
- if (r < 0)
- continue;
-
- r = get_gateway_description(rtnl, hwdb, ifi, family, &gw, &gateway_description);
- if (r < 0)
- log_debug("could not get description of gateway: %s", strerror(-r));
-
- if (gateway_description)
- printf("%*s%s (%s)\n",
- (int) strlen(prefix),
- first ? prefix : "",
- gateway, gateway_description);
- else
- printf("%*s%s\n",
- (int) strlen(prefix),
- first ? prefix : "",
- gateway);
-
- first = false;
+ fputc('\n', stdout);
}
return 0;
}
-static int dump_addresses(sd_rtnl *rtnl, const char *prefix, int ifindex) {
+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;
if (r < 0)
return r;
- printf("%*s%s\n",
+ printf("%*s%s",
(int) strlen(prefix),
i == 0 ? prefix : "",
pretty);
+
+ if (ifindex <= 0) {
+ char name[IF_NAMESIZE+1];
+
+ if (if_indextoname(local[i].ifindex, name)) {
+ fputs(" on ", stdout);
+ fputs(name, stdout);
+ } else
+ printf(" on %%%i", local[i].ifindex);
+ }
+
+ fputc('\n', stdout);
}
return 0;
}
}
-static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
+static int link_status_one(
+ sd_rtnl *rtnl,
+ struct udev *udev,
+ struct udev_hwdb *hwdb,
+ const char *name) {
+
_cleanup_strv_free_ char **dns = NULL, **ntp = NULL, **domains = NULL;
- _cleanup_free_ char *setup_state = NULL, *operational_state = NULL, *gateway = NULL, *gateway_description = NULL,
- *gateway6 = NULL, *gateway6_description = 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;
- _cleanup_udev_hwdb_unref_ struct udev_hwdb *hwdb = NULL;
char devid[2 + DECIMAL_STR_MAX(int)];
_cleanup_free_ char *t = NULL, *network = NULL;
const char *driver = NULL, *path = NULL, *vendor = NULL, *model = NULL, *link = NULL;
sprintf(devid, "n%i", ifindex);
d = udev_device_new_from_device_id(udev, devid);
-
- 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");
model = udev_device_get_property_value(d, "ID_MODEL");
}
+ link_get_type_string(iftype, d, &t);
+
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(" Model: %s\n", model);
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);
}
static int link_status(char **args, unsigned n) {
+ _cleanup_udev_hwdb_unref_ struct udev_hwdb *hwdb = NULL;
_cleanup_udev_unref_ struct udev *udev = NULL;
_cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL;
char **name;
if (!udev)
return log_error_errno(errno, "Failed to connect to udev: %m");
+ hwdb = udev_hwdb_new(udev);
+ if (!hwdb)
+ log_debug_errno(errno, "Failed to open hardware database: %m");
+
if (n <= 1 && !arg_all) {
_cleanup_free_ char *operational_state = NULL;
_cleanup_strv_free_ char **dns = NULL, **ntp = NULL, **domains = NULL;
_cleanup_free_ struct local_address *addresses = NULL;
const char *on_color_operational, *off_color_operational;
- int i, c;
sd_network_get_operational_state(&operational_state);
operational_state_to_color(operational_state, &on_color_operational, &off_color_operational);
- 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++) {
- _cleanup_free_ char *pretty = NULL;
-
- r = in_addr_to_string(addresses[i].family, &addresses[i].address, &pretty);
- if (r < 0)
- return log_oom();
+ printf("%s%s%s State: %s%s%s\n",
+ on_color_operational, draw_special_char(DRAW_BLACK_CIRCLE), off_color_operational,
+ on_color_operational, strna(operational_state), off_color_operational);
- printf("%13s %s\n",
- i > 0 ? "" : "Address:", pretty);
- }
+ dump_addresses(rtnl, " Address: ", 0);
+ dump_gateways(rtnl, hwdb, " Gateway: ", 0);
sd_network_get_dns(&dns);
if (!strv_isempty(dns))
if (i > 0)
fputc('\n', stdout);
- link_status_one(rtnl, udev, links[i].name);
+ link_status_one(rtnl, udev, hwdb, links[i].name);
}
- }
-
- STRV_FOREACH(name, args + 1) {
- if (name != args+1)
- fputc('\n', stdout);
+ } else {
+ STRV_FOREACH(name, args + 1) {
+ if (name != args+1)
+ fputc('\n', stdout);
- link_status_one(rtnl, udev, *name);
+ link_status_one(rtnl, udev, hwdb, *name);
+ }
}
return 0;
~ianmdlvl / elogind.git / blobdiff