X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkctl.c;h=3760de71dd2056762bb4af424ea40ae07fb4456e;hb=1693a943ca581aca2beebb4c812ec6c9f17b8164;hp=8f2c1b397534ed508f5905a1432cef604ea56846;hpb=1405434b6986d3c3d6ccaaa2e472bad843cbbfa1;p=elogind.git diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 8f2c1b397..3760de71d 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -21,6 +21,7 @@ #include #include +#include #include "sd-network.h" #include "sd-rtnl.h" @@ -34,6 +35,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; @@ -141,7 +143,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; @@ -190,16 +192,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 +208,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 +249,200 @@ static int list_links(char **args, unsigned n) { return 0; } -static int dump_addresses(sd_rtnl *rtnl, const char *prefix, int ifindex) { +/* 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]; + + 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:" 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, local[i].ifindex, local[i].family, &local[i].address, &description); + if (r < 0) + log_debug_errno(r, "Could not get description of gateway: %m"); + + printf("%*s%s", + (int) strlen(prefix), + i == 0 ? prefix : "", + gateway); + + if (description) + printf(" (%s)", description); + + /* Show interface name for the entry if we show + * entries for all interfaces */ + 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 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; @@ -268,10 +453,22 @@ static int dump_addresses(sd_rtnl *rtnl, const char *prefix, int ifindex) { 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; @@ -288,14 +485,19 @@ static void dump_list(const char *prefix, char **l) { } } -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; _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL; _cleanup_udev_device_unref_ struct udev_device *d = 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 +524,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 +584,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 +597,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); @@ -415,19 +621,27 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *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); dump_addresses(rtnl, " Address: ", ifindex); + dump_gateways(rtnl, hwdb, " Gateway: ", ifindex); if (!strv_isempty(dns)) dump_list(" DNS: ", dns); if (!strv_isempty(domains)) - dump_list(" Domains: ", domains); + dump_list(" Domain: ", domains); if (!strv_isempty(ntp)) dump_list(" NTP: ", ntp); @@ -435,52 +649,47 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) { } 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; 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"); + + 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; + _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("%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)) 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); @@ -503,10 +712,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) @@ -516,15 +723,15 @@ static int link_status(char **args, unsigned n) { 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;