X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkctl.c;h=9716499a7393515c54d81c33a593990eb89608a7;hp=f85058c2726d90adf5eab463fc480e639b3a00d8;hb=914d6c09f1a449c60c8495c179a8bbe012315ba2;hpb=1bf7dd6e7d36e997c7283045c2760d14e02904fd diff --git a/src/network/networkctl.c b/src/network/networkctl.c index f85058c27..9716499a7 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -26,7 +26,7 @@ #include "sd-network.h" #include "sd-rtnl.h" #include "sd-hwdb.h" -#include "libudev.h" +#include "sd-device.h" #include "strv.h" #include "build.h" @@ -34,7 +34,7 @@ #include "pager.h" #include "lldp.h" #include "rtnl-util.h" -#include "udev-util.h" +#include "device-util.h" #include "hwdb-util.h" #include "arphrd-list.h" #include "local-addresses.h" @@ -54,17 +54,20 @@ static void pager_open_if_enabled(void) { pager_open(false); } -static int link_get_type_string(int iftype, struct udev_device *d, char **ret) { +static int link_get_type_string(int iftype, sd_device *d, char **ret) { const char *t; char *p; + assert(ret); + if (iftype == ARPHRD_ETHER && d) { const char *devtype, *id = NULL; /* WLANs have iftype ARPHRD_ETHER, but we want * to show a more useful type string for * them */ - devtype = udev_device_get_devtype(d); + (void)sd_device_get_devtype(d, &devtype); + if (streq_ptr(devtype, "wlan")) id = "wlan"; else if (streq_ptr(devtype, "wwan")) @@ -189,7 +192,6 @@ static void setup_state_to_color(const char *state, const char **on, const char static int list_links(int argc, char *argv[], void *userdata) { _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; _cleanup_free_ LinkInfo *links = NULL; int r, c, i; @@ -200,10 +202,6 @@ static int list_links(int argc, char *argv[], void *userdata) { if (r < 0) return log_error_errno(r, "Failed to connect to netlink: %m"); - udev = udev_new(); - 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) return rtnl_log_create_error(r); @@ -225,7 +223,7 @@ static int list_links(int argc, char *argv[], void *userdata) { for (i = 0; i < c; i++) { _cleanup_free_ char *setup_state = NULL, *operational_state = NULL; - _cleanup_udev_device_unref_ struct udev_device *d = NULL; + _cleanup_device_unref_ sd_device *d = NULL; const char *on_color_operational, *off_color_operational, *on_color_setup, *off_color_setup; char devid[2 + DECIMAL_STR_MAX(int)]; @@ -238,7 +236,7 @@ static int list_links(int argc, char *argv[], void *userdata) { 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); + (void)sd_device_new_from_device_id(&d, devid); link_get_type_string(links[i].iftype, d, &t); @@ -495,19 +493,19 @@ static void dump_list(const char *prefix, char **l) { static int link_status_one( sd_rtnl *rtnl, - struct udev *udev, sd_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; + _cleanup_device_unref_ sd_device *d = 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; + _cleanup_strv_free_ char **carrier_bound_to = NULL; + _cleanup_strv_free_ char **carrier_bound_by = NULL; struct ether_addr e; unsigned iftype; int r, ifindex; @@ -515,7 +513,6 @@ static int link_status_one( uint32_t mtu; assert(rtnl); - assert(udev); assert(name); if (safe_atoi(name, &ifindex) >= 0 && ifindex > 0) @@ -587,31 +584,36 @@ static int link_status_one( } sprintf(devid, "n%i", ifindex); - d = udev_device_new_from_device_id(udev, devid); + + (void)sd_device_new_from_device_id(&d, devid); + 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"); + (void)sd_device_get_property_value(d, "ID_NET_LINK_FILE", &link); + (void)sd_device_get_property_value(d, "ID_NET_DRIVER", &driver); + (void)sd_device_get_property_value(d, "ID_PATH", &path); - vendor = udev_device_get_property_value(d, "ID_VENDOR_FROM_DATABASE"); - if (!vendor) - vendor = udev_device_get_property_value(d, "ID_VENDOR"); + r = sd_device_get_property_value(d, "ID_VENDOR_FROM_DATABASE", &vendor); + if (r < 0) + (void)sd_device_get_property_value(d, "ID_VENDOR", &vendor); - model = udev_device_get_property_value(d, "ID_MODEL_FROM_DATABASE"); - if (!model) - model = udev_device_get_property_value(d, "ID_MODEL"); + r = sd_device_get_property_value(d, "ID_MODEL_FROM_DATABASE", &model); + if (r < 0) + (void)sd_device_get_property_value(d, "ID_MODEL", &model); } link_get_type_string(iftype, d, &t); sd_network_link_get_network_file(ifindex, &network); + sd_network_link_get_carrier_bound_to(ifindex, &carrier_bound_to); + sd_network_link_get_carrier_bound_by(ifindex, &carrier_bound_by); + 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", + 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), @@ -619,13 +621,13 @@ static int link_status_one( on_color_setup, strna(setup_state), off_color_setup); if (path) - printf(" Path: %s\n", path); + printf(" Path: %s\n", path); if (driver) - printf(" Driver: %s\n", driver); + printf(" Driver: %s\n", driver); if (vendor) - printf(" Vendor: %s\n", vendor); + printf(" Vendor: %s\n", vendor); if (model) - printf(" Model: %s\n", model); + printf(" Model: %s\n", model); if (have_mac) { _cleanup_free_ char *description = NULL; @@ -634,30 +636,35 @@ static int link_status_one( ieee_oui(hwdb, &e, &description); if (description) - printf(" HW Address: %s (%s)\n", ether_addr_to_string(&e, ea), 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)); + printf(" HW Address: %s\n", ether_addr_to_string(&e, ea)); } if (mtu > 0) - printf(" MTU: %u\n", mtu); + printf(" MTU: %u\n", mtu); - dump_addresses(rtnl, " Address: ", ifindex); - 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); + dump_list(" DNS: ", dns); if (!strv_isempty(domains)) - dump_list(" Domain: ", domains); + dump_list(" Domain: ", domains); if (!strv_isempty(ntp)) - dump_list(" NTP: ", ntp); + dump_list(" NTP: ", ntp); + + if (!strv_isempty(carrier_bound_to)) + dump_list("Carrier Bound To: ", carrier_bound_to); + + if (!strv_isempty(carrier_bound_by)) + dump_list("Carrier Bound By: ", carrier_bound_by); return 0; } static int link_status(int argc, char *argv[], void *userdata) { _cleanup_hwdb_unref_ sd_hwdb *hwdb = NULL; - _cleanup_udev_unref_ struct udev *udev = NULL; _cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL; char **name; int r; @@ -666,10 +673,6 @@ static int link_status(int argc, char *argv[], void *userdata) { if (r < 0) return log_error_errno(r, "Failed to connect to netlink: %m"); - udev = udev_new(); - if (!udev) - return log_error_errno(errno, "Failed to connect to udev: %m"); - r = sd_hwdb_new(&hwdb); if (r < 0) log_debug_errno(r, "Failed to open hardware database: %m"); @@ -731,14 +734,14 @@ static int link_status(int argc, char *argv[], void *userdata) { if (i > 0) fputc('\n', stdout); - link_status_one(rtnl, udev, hwdb, links[i].name); + link_status_one(rtnl, hwdb, links[i].name); } } else { STRV_FOREACH(name, argv + 1) { if (name != argv + 1) fputc('\n', stdout); - link_status_one(rtnl, udev, hwdb, *name); + link_status_one(rtnl, hwdb, *name); } } @@ -898,7 +901,7 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) { _cleanup_free_ LinkInfo *links = NULL; const char *state, *word; - usec_t time, until, ttl; + double ttl = -1; uint32_t capability; int i, r, c, j; size_t ll; @@ -954,23 +957,29 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) { continue; if (streq(a, "_Chassis")) { - chassis = strdup(b); - if (!chassis) - return -ENOMEM; + r = free_and_strdup(&chassis, b); + if (r < 0) + return r; } else if (streq(a, "_Port")) { - port = strdup(b); - if (!port) - return -ENOMEM; + r = free_and_strdup(&port, b); + if (r < 0) + return r; } else if (streq(a, "_TTL")) { + long long unsigned x = 0; + usec_t time; - time = now(CLOCK_BOOTTIME); - - sscanf(b, USEC_FMT, &until); + r = safe_atollu(b, &x); + if (r < 0 || (usec_t) x != x) + return log_warning_errno(r < 0 ? r : ERANGE, + "Failed to parse TTL \"%s\": %m", b); - ttl = (until - time) / USEC_PER_SEC; + time = now(CLOCK_BOOTTIME); + if (x < time) + continue; + ttl = (double) (x - time) / USEC_PER_SEC; } else if (streq(a, "_CAP")) { sscanf(b, "%x", &capability); @@ -980,8 +989,11 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) { } - if (until > time) { - printf("%10s %24s %16s %16"PRIu64" %16s\n", links[i].name, chassis, port, ttl, cap); + if (ttl >= 0) { + printf("%10s %24s %16s %16f %16s\n", + links[i].name, + strna(chassis), strna(port), + ttl, cap); j++; } } @@ -1009,7 +1021,7 @@ static void help(void) { " -a --all Show status for all links\n\n" "Commands:\n" " list List links\n" - " status LINK Show link status\n" + " status [LINK...] Show link status\n" " lldp Show lldp information\n" , program_invocation_short_name); }