X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkctl.c;h=d6d2e1dd274ad980f5c1888264edbb56ea2532b9;hp=2da5c834a7d4d13519584583ce89140b34e28f7c;hb=78c958f82e929f015169ce1ed614d1e9c50928aa;hpb=9085f64a6694f2928c79fcce365edb1dca6937d4 diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 2da5c834a..d6d2e1dd2 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -33,6 +33,7 @@ #include "udev-util.h" #include "arphrd-list.h" #include "local-addresses.h" +#include "socket-util.h" static bool arg_no_pager = false; static bool arg_legend = true; @@ -88,13 +89,103 @@ 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(); @@ -125,51 +216,39 @@ static int list_links(char **args, unsigned n) { } 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; - uint16_t type; - int ifindex; - - r = sd_rtnl_message_get_type(i, &type); - if (r < 0) - return rtnl_log_parse_error(r); - - if (type != RTM_NEWLINK) - continue; - - r = sd_rtnl_message_link_get_ifindex(i, &ifindex); - if (r < 0) - return rtnl_log_parse_error(r); - - r = sd_rtnl_message_read_string(i, IFLA_IFNAME, &name); - if (r < 0) - return rtnl_log_parse_error(r); - r = sd_rtnl_message_link_get_type(i, &iftype); - if (r < 0) - return rtnl_log_parse_error(r); + 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_get_link_state(ifindex, &state); - sd_network_get_link_operational_state(ifindex, &operational_state); + 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", ifindex); + sprintf(devid, "n%i", links[i].ifindex); d = udev_device_new_from_device_id(udev, devid); - link_get_type_string(iftype, d, &t); + link_get_type_string(links[i].iftype, d, &t); - printf("%3i %-16s %-10s %-10s %-10s\n", ifindex, name, strna(t), strna(state), strna(operational_state)); - c++; + 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%u links listed.\n", c); + printf("\n%i links listed.\n", c); return 0; } @@ -210,13 +289,15 @@ static void dump_list(const char *prefix, char **l) { } static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) { - _cleanup_strv_free_ char **dns = NULL, **ntp = NULL; - _cleanup_free_ char *state = NULL, *operational_state = NULL; + _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; + const char *on_color_operational, *off_color_operational, + *on_color_setup, *off_color_setup; struct ether_addr e; unsigned iftype; int r, ifindex; @@ -276,11 +357,26 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) { sd_rtnl_message_read_u32(reply, IFLA_MTU, &mtu); - sd_network_get_link_state(ifindex, &state); - sd_network_get_link_operational_state(ifindex, &operational_state); + sd_network_link_get_operational_state(ifindex, &operational_state); + operational_state_to_color(operational_state, &on_color_operational, &off_color_operational); + + sd_network_link_get_setup_state(ifindex, &setup_state); + setup_state_to_color(setup_state, &on_color_setup, &off_color_setup); + + 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; + + wildcard = strdup("*"); + if (!wildcard) + return log_oom(); - sd_network_get_link_dns(ifindex, &dns); - sd_network_get_link_ntp(ifindex, &ntp); + if (strv_consume(&domains, wildcard) < 0) + return log_oom(); + } sprintf(devid, "n%i", ifindex); d = udev_device_new_from_device_id(udev, devid); @@ -300,13 +396,14 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) { model = udev_device_get_property_value(d, "ID_MODEL"); } - printf("%i: %s\n", ifindex, name); + + 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" - " State: %s (%s)\n", + " State: %s%s%s (%s%s%s)\n", strna(t), - strna(operational_state), - strna(state)); + 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); @@ -317,8 +414,10 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) { if (model) printf(" Model: %s\n", model); - if (have_mac) - printf(" HW Address: %s\n", ether_ntoa(&e)); + if (have_mac) { + char ea[ETHER_ADDR_TO_STRING_MAX]; + printf(" HW Address: %s\n", ether_addr_to_string(&e, ea)); + } if (mtu > 0) printf(" MTU: %u\n", mtu); @@ -327,6 +426,8 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) { if (!strv_isempty(dns)) dump_list(" DNS: ", dns); + if (!strv_isempty(domains)) + dump_list(" Domain: ", domains); if (!strv_isempty(ntp)) dump_list(" NTP: ", ntp); @@ -339,19 +440,51 @@ static int link_status(char **args, unsigned n) { 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; + } + + udev = udev_new(); + if (!udev) { + log_error("Failed to connect to udev: %m"); + return -errno; + } + 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); - if (operational_state) - printf(" State: %s\n", 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); + } 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); @@ -360,23 +493,10 @@ static int link_status(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; - } - - udev = udev_new(); - if (!udev) { - log_error("Failed to connect to udev: %m"); - return -errno; - } - if (arg_all) { _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL; - sd_rtnl_message *i; - bool space = false; - uint16_t type; + _cleanup_free_ LinkInfo *links = NULL; + int c, i; r = sd_rtnl_message_new_link(rtnl, &req, RTM_GETLINK, 0); if (r < 0) @@ -392,25 +512,15 @@ static int link_status(char **args, unsigned n) { return r; } - for (i = reply; i; i = sd_rtnl_message_next(i)) { - const char *nn; - - r = sd_rtnl_message_get_type(i, &type); - if (r < 0) - return rtnl_log_parse_error(r); - - if (type != RTM_NEWLINK) - continue; - - r = sd_rtnl_message_read_string(i, IFLA_IFNAME, &nn); - if (r < 0) - return rtnl_log_parse_error(r); + c = decode_and_sort_links(reply, &links); + if (c < 0) + return rtnl_log_parse_error(c); - if (space) + for (i = 0; i < c; i++) { + if (i > 0) fputc('\n', stdout); - link_status_one(rtnl, udev, nn); - space = true; + link_status_one(rtnl, udev, links[i].name); } }