X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkctl.c;h=815ea1698d575b8ef11964e9933ad0f93eeda3e1;hp=93b12934575044a8e7bff7fe6ce9763a4710dde8;hb=b6a3ca6d876ab59b4f29ed67f54ef87005177906;hpb=ee8c45689526ca973407cbb77bce7b96a062c40b diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 93b129345..815ea1698 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -33,9 +33,12 @@ #include "udev-util.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 bool arg_all = false; static void pager_open_if_enabled(void) { @@ -87,27 +90,113 @@ static int link_get_type_string(int iftype, struct udev_device *d, char **ret) { return 0; } +typedef struct LinkInfo { + const char *name; + int ifindex; + unsigned iftype; +} LinkInfo; + +static int link_info_compare(const void *a, const void *b) { + const LinkInfo *x = a, *y = b; + + return x->ifindex - y->ifindex; +} + +static int decode_and_sort_links(sd_rtnl_message *m, LinkInfo **ret) { + _cleanup_free_ LinkInfo *links = NULL; + size_t size = 0, c = 0; + sd_rtnl_message *i; + int r; + + for (i = m; i; i = sd_rtnl_message_next(i)) { + const char *name; + unsigned iftype; + uint16_t type; + int ifindex; + + r = sd_rtnl_message_get_type(i, &type); + if (r < 0) + return r; + + if (type != RTM_NEWLINK) + continue; + + r = sd_rtnl_message_link_get_ifindex(i, &ifindex); + if (r < 0) + return r; + + r = sd_rtnl_message_read_string(i, IFLA_IFNAME, &name); + if (r < 0) + return r; + + r = sd_rtnl_message_link_get_type(i, &iftype); + if (r < 0) + return r; + + if (!GREEDY_REALLOC(links, size, c+1)) + return -ENOMEM; + + links[c].name = name; + links[c].ifindex = ifindex; + links[c].iftype = iftype; + c++; + } + + qsort_safe(links, c, sizeof(LinkInfo), link_info_compare); + + *ret = links; + links = NULL; + + return (int) c; +} + +static void operational_state_to_color(const char *state, const char **on, const char **off) { + assert(on); + assert(off); + + if (streq_ptr(state, "routable")) { + *on = ansi_highlight_green(); + *off = ansi_highlight_off(); + } else if (streq_ptr(state, "degraded")) { + *on = ansi_highlight_yellow(); + *off = ansi_highlight_off(); + } else + *on = *off = ""; +} + +static void setup_state_to_color(const char *state, const char **on, const char **off) { + assert(on); + assert(off); + + if (streq_ptr(state, "configured")) { + *on = ansi_highlight_green(); + *off = ansi_highlight_off(); + } else if (streq_ptr(state, "configuring")) { + *on = ansi_highlight_yellow(); + *off = ansi_highlight_off(); + } else if (streq_ptr(state, "failed") || streq_ptr(state, "linger")) { + *on = ansi_highlight_red(); + *off = ansi_highlight_off(); + } else + *on = *off = ""; +} + static int list_links(char **args, unsigned n) { _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL; _cleanup_udev_unref_ struct udev *udev = NULL; _cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL; - sd_rtnl_message *i; - unsigned c = 0; - int r; + _cleanup_free_ LinkInfo *links = NULL; + int r, c, i; 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) @@ -118,57 +207,203 @@ 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 %-10s %-10s %-10s\n", "IDX", "LINK", "TYPE", "STATE", "OPERATIONAL"); + printf("%3s %-16s %-18s %-11s %-10s\n", "IDX", "LINK", "TYPE", "OPERATIONAL", "SETUP"); - for (i = reply; i; i = sd_rtnl_message_next(i)) { - _cleanup_free_ char *state = NULL, *operational_state = NULL; + c = decode_and_sort_links(reply, &links); + if (c < 0) + return rtnl_log_parse_error(c); + + for (i = 0; i < c; i++) { + _cleanup_free_ char *setup_state = NULL, *operational_state = NULL; _cleanup_udev_device_unref_ struct udev_device *d = NULL; - char devid[2 + DECIMAL_STR_MAX(int)]; + const char *on_color_operational, *off_color_operational, + *on_color_setup, *off_color_setup; + char devid[2 + DECIMAL_STR_MAX(int)]; _cleanup_free_ char *t = NULL; - const char *name; - unsigned iftype; + + sd_network_link_get_operational_state(links[i].ifindex, &operational_state); + operational_state_to_color(operational_state, &on_color_operational, &off_color_operational); + + sd_network_link_get_setup_state(links[i].ifindex, &setup_state); + setup_state_to_color(setup_state, &on_color_setup, &off_color_setup); + + sprintf(devid, "n%i", links[i].ifindex); + d = udev_device_new_from_device_id(udev, devid); + + link_get_type_string(links[i].iftype, d, &t); + + 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); + } + + if (arg_legend) + printf("\n%i links listed.\n", c); + + 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 ifindex; + int ifi, fam; - r = sd_rtnl_message_get_type(i, &type); - if (r < 0) - return rtnl_log_parse_error(r); + r = sd_rtnl_message_get_errno(m); + if (r < 0) { + log_error_errno(r, "got error: %m"); + continue; + } - if (type != RTM_NEWLINK) + r = sd_rtnl_message_get_type(m, &type); + if (r < 0) { + log_error_errno(r, "could not get type: %m"); continue; + } - r = sd_rtnl_message_link_get_ifindex(i, &ifindex); - if (r < 0) - return rtnl_log_parse_error(r); + if (type != RTM_NEWNEIGH) { + log_error("type is not RTM_NEWNEIGH"); + continue; + } - r = sd_rtnl_message_read_string(i, IFLA_IFNAME, &name); + 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) - return rtnl_log_parse_error(r); + continue; - r = sd_rtnl_message_link_get_type(i, &iftype); + r = ieee_oui(hwdb, &mac, gateway_description); if (r < 0) - return rtnl_log_parse_error(r); + continue; - sd_network_get_link_state(ifindex, &state); - sd_network_get_link_operational_state(ifindex, &operational_state); + return 0; + } - sprintf(devid, "n%i", ifindex); - d = udev_device_new_from_device_id(udev, devid); + return -ENODATA; +} - link_get_type_string(iftype, d, &t); +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; - printf("%3i %-16s %-10s %-10s %-10s\n", ifindex, name, strna(t), strna(state), strna(operational_state)); - c++; - } + n = local_gateways(rtnl, ifindex, AF_UNSPEC, &local); + if (n < 0) + return n; - if (arg_legend) - printf("\n%u links listed.\n", c); + 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; } @@ -177,7 +412,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; @@ -208,166 +443,250 @@ static void dump_list(const char *prefix, char **l) { } } -static int link_status(char **args, unsigned n) { - _cleanup_udev_unref_ struct udev *udev = NULL; - _cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL; - char **name; - int r; +static int link_status_one(sd_rtnl *rtnl, struct udev *udev, 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; + _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; + const char *on_color_operational, *off_color_operational, + *on_color_setup, *off_color_setup; + struct ether_addr e; + unsigned iftype; + int r, ifindex; + bool have_mac; + uint32_t mtu; + + assert(rtnl); + assert(udev); + assert(name); + + if (safe_atoi(name, &ifindex) >= 0 && ifindex > 0) + r = sd_rtnl_message_new_link(rtnl, &req, RTM_GETLINK, ifindex); + else { + r = sd_rtnl_message_new_link(rtnl, &req, RTM_GETLINK, 0); + if (r < 0) + return rtnl_log_create_error(r); - if (n <= 1) { - _cleanup_free_ char *operational_state = NULL; + r = sd_rtnl_message_append_string(req, IFLA_IFNAME, name); + } - r = sd_network_get_operational_state(&operational_state); - if (r < 0) { - log_error("Failed to get operational state: %s", strerror(-r)); - return r; - } + if (r < 0) + return rtnl_log_create_error(r); - printf("State: %s\n", operational_state); - return 0; - } + r = sd_rtnl_call(rtnl, req, 0, &reply); + if (r < 0) + return log_error_errno(r, "Failed to query link: %m"); - pager_open_if_enabled(); + r = sd_rtnl_message_link_get_ifindex(reply, &ifindex); + if (r < 0) + return rtnl_log_parse_error(r); - r = sd_rtnl_open(&rtnl, 0); - if (r < 0) { - log_error("Failed to connect to netlink: %s", strerror(-r)); - return r; - } + r = sd_rtnl_message_read_string(reply, IFLA_IFNAME, &name); + if (r < 0) + return rtnl_log_parse_error(r); - udev = udev_new(); - if (!udev) { - log_error("Failed to connect to udev: %m"); - return -errno; + r = sd_rtnl_message_link_get_type(reply, &iftype); + if (r < 0) + return rtnl_log_parse_error(r); + + have_mac = sd_rtnl_message_read_ether_addr(reply, IFLA_ADDRESS, &e) >= 0; + + if (have_mac) { + const uint8_t *p; + bool all_zeroes = true; + + for (p = (uint8_t*) &e; p < (uint8_t*) &e + sizeof(e); p++) + if (*p != 0) { + all_zeroes = false; + break; + } + + if (all_zeroes) + have_mac = false; } - STRV_FOREACH(name, args + 1) { - _cleanup_strv_free_ char **dns = NULL, **ntp = NULL; - _cleanup_free_ char *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; - const char *canonical_name = NULL; - char devid[2 + DECIMAL_STR_MAX(int)]; - int ifindex, canonical_ifindex; - _cleanup_free_ char *t = NULL; - const char *driver = NULL, *path = NULL, *vendor = NULL, *model = NULL; - struct ether_addr e; - unsigned iftype; - bool have_mac; - uint32_t mtu; + sd_rtnl_message_read_u32(reply, IFLA_MTU, &mtu); - if (name != args+1) - printf("\n"); + sd_network_link_get_operational_state(ifindex, &operational_state); + operational_state_to_color(operational_state, &on_color_operational, &off_color_operational); - if (safe_atoi(*name, &ifindex) >= 0 && ifindex > 0) - r = sd_rtnl_message_new_link(rtnl, &req, RTM_GETLINK, ifindex); - else { - r = sd_rtnl_message_new_link(rtnl, &req, RTM_GETLINK, 0); - if (r < 0) - return rtnl_log_create_error(r); + sd_network_link_get_setup_state(ifindex, &setup_state); + setup_state_to_color(setup_state, &on_color_setup, &off_color_setup); - r = sd_rtnl_message_append_string(req, IFLA_IFNAME, *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; - if (r < 0) - return rtnl_log_create_error(r); + wildcard = strdup("*"); + if (!wildcard) + return log_oom(); - r = sd_rtnl_call(rtnl, req, 0, &reply); - if (r < 0) { - log_error("Failed to query link: %s", strerror(-r)); - continue; - } + if (strv_consume(&domains, wildcard) < 0) + return log_oom(); + } - r = sd_rtnl_message_link_get_ifindex(reply, &canonical_ifindex); - if (r < 0) - return rtnl_log_parse_error(r); + sprintf(devid, "n%i", ifindex); + d = udev_device_new_from_device_id(udev, devid); - r = sd_rtnl_message_read_string(reply, IFLA_IFNAME, &canonical_name); - if (r < 0) - return rtnl_log_parse_error(r); + link_get_type_string(iftype, d, &t); - r = sd_rtnl_message_link_get_type(reply, &iftype); - if (r < 0) - return rtnl_log_parse_error(r); + 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"); - have_mac = sd_rtnl_message_read_ether_addr(reply, IFLA_ADDRESS, &e) >= 0; + vendor = udev_device_get_property_value(d, "ID_VENDOR_FROM_DATABASE"); + if (!vendor) + vendor = udev_device_get_property_value(d, "ID_VENDOR"); - if (have_mac) { - const uint8_t *p; - bool all_zeroes = true; + model = udev_device_get_property_value(d, "ID_MODEL_FROM_DATABASE"); + if (!model) + model = udev_device_get_property_value(d, "ID_MODEL"); + } - for (p = (uint8_t*) &e; p < (uint8_t*) &e + sizeof(e); p++) - if (*p != 0) { - all_zeroes = false; - break; - } + 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(" 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); + + if (path) + printf(" Path: %s\n", path); + if (driver) + printf(" Driver: %s\n", driver); + if (vendor) + printf(" Vendor: %s\n", vendor); + if (model) + printf(" Model: %s\n", model); + + if (have_mac) { + char ea[ETHER_ADDR_TO_STRING_MAX]; + printf(" HW Address: %s\n", ether_addr_to_string(&e, ea)); + } - if (all_zeroes) - have_mac = false; - } + if (mtu > 0) + printf(" MTU: %u\n", mtu); - sd_rtnl_message_read_u32(reply, IFLA_MTU, &mtu); + hwdb = udev_hwdb_new(udev); - sd_network_get_link_state(canonical_ifindex, &state); - sd_network_get_link_operational_state(canonical_ifindex, &operational_state); + dump_gateways(rtnl, hwdb, " Gateway: ", ifindex); - sd_network_get_link_dns(canonical_ifindex, &dns); - sd_network_get_link_dns(canonical_ifindex, &ntp); + dump_addresses(rtnl, " Address: ", ifindex); - sprintf(devid, "n%i", canonical_ifindex); - d = udev_device_new_from_device_id(udev, devid); + if (!strv_isempty(dns)) + dump_list(" DNS: ", dns); + if (!strv_isempty(domains)) + dump_list(" Domain: ", domains); + if (!strv_isempty(ntp)) + dump_list(" NTP: ", ntp); - link_get_type_string(iftype, d, &t); + return 0; +} - if (d) { - driver = udev_device_get_property_value(d, "ID_NET_DRIVER"); - path = udev_device_get_property_value(d, "ID_PATH"); +static int link_status(char **args, unsigned n) { + _cleanup_udev_unref_ struct udev *udev = NULL; + _cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL; + char **name; + int r; - vendor = udev_device_get_property_value(d, "ID_VENDOR_FROM_DATABASE"); - if (!vendor) - vendor = udev_device_get_property_value(d, "ID_VENDOR"); + r = sd_rtnl_open(&rtnl, 0); + if (r < 0) + return log_error_errno(r, "Failed to connect to netlink: %m"); - model = udev_device_get_property_value(d, "ID_MODEL_FROM_DATABASE"); - if (!model) - model = udev_device_get_property_value(d, "ID_MODEL"); - } + udev = udev_new(); + if (!udev) + return log_error_errno(errno, "Failed to connect to udev: %m"); - printf("%i: %s\n", canonical_ifindex, canonical_name); + 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; - printf(" Type: %s\n" - " State: %s (%s)\n", - strna(t), - strna(operational_state), - strna(state)); + sd_network_get_operational_state(&operational_state); + operational_state_to_color(operational_state, &on_color_operational, &off_color_operational); - if (path) - printf(" Path: %s\n", path); - if (driver) - printf(" Driver: %s\n", driver); - if (vendor) - printf(" Vendor: %s\n", vendor); - if (model) - printf(" Model: %s\n", model); + printf(" State: %s%s%s\n", on_color_operational, strna(operational_state), off_color_operational); - if (have_mac) { - _cleanup_free_ char *h = NULL; + c = local_addresses(rtnl, 0, AF_UNSPEC, &addresses); + for (i = 0; i < c; i++) { + _cleanup_free_ char *pretty = NULL; - h = hexmem(&e, sizeof(e)); - if (!h) + r = in_addr_to_string(addresses[i].family, &addresses[i].address, &pretty); + if (r < 0) return log_oom(); - printf(" HW Address: %s\n", h); + printf("%13s %s\n", + i > 0 ? "" : "Address:", pretty); } - if (mtu > 0) - printf(" MTU: %u\n", mtu); - - dump_addresses(rtnl, " Address: ", canonical_ifindex); - + sd_network_get_dns(&dns); if (!strv_isempty(dns)) dump_list(" DNS: ", dns); + + 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); + + return 0; + } + + pager_open_if_enabled(); + + if (arg_all) { + _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL; + _cleanup_free_ LinkInfo *links = NULL; + int c, i; + + r = sd_rtnl_message_new_link(rtnl, &req, RTM_GETLINK, 0); + if (r < 0) + return rtnl_log_create_error(r); + + r = sd_rtnl_message_request_dump(req, true); + if (r < 0) + return rtnl_log_create_error(r); + + r = sd_rtnl_call(rtnl, req, 0, &reply); + if (r < 0) + return log_error_errno(r, "Failed to enumerate links: %m"); + + c = decode_and_sort_links(reply, &links); + if (c < 0) + return rtnl_log_parse_error(c); + + for (i = 0; i < c; i++) { + if (i > 0) + fputc('\n', stdout); + + link_status_one(rtnl, udev, links[i].name); + } + } + + STRV_FOREACH(name, args + 1) { + if (name != args+1) + fputc('\n', stdout); + + link_status_one(rtnl, udev, *name); } return 0; @@ -377,7 +696,10 @@ static void help(void) { printf("%s [OPTIONS...]\n\n" "Query and control the networking subsystem.\n\n" " -h --help Show this help\n" - " --version Show package version\n\n" + " --version Show package version\n" + " --no-pager Do not pipe output into a pager\n" + " --no-legend Do not show the headers and footers\n" + " -a --all Show status for all links\n\n" "Commands:\n" " list List links\n" " status LINK Show link status\n" @@ -397,6 +719,7 @@ static int parse_argv(int argc, char *argv[]) { { "version", no_argument, NULL, ARG_VERSION }, { "no-pager", no_argument, NULL, ARG_NO_PAGER }, { "no-legend", no_argument, NULL, ARG_NO_LEGEND }, + { "all", no_argument, NULL, 'a' }, {} }; @@ -405,7 +728,7 @@ static int parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "ha", options, NULL)) >= 0) { switch (c) { @@ -426,6 +749,10 @@ static int parse_argv(int argc, char *argv[]) { arg_legend = false; break; + case 'a': + arg_all = true; + break; + case '?': return -EINVAL;