]> git.ipfire.org Git - thirdparty/systemd.git/blobdiff - src/network/networkctl.c
util-lib: split our string related calls from util.[ch] into its own file string...
[thirdparty/systemd.git] / src / network / networkctl.c
index f42bc62678e9e0695f3a094c47b35d992a1a46ec..acb6b7ce240d11d805cf8729db655b203cb08c0c 100644 (file)
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <stdbool.h>
 #include <getopt.h>
 #include <net/if.h>
+#include <stdbool.h>
 
-#include "sd-network.h"
-#include "sd-rtnl.h"
+#include "sd-device.h"
 #include "sd-hwdb.h"
-#include "libudev.h"
+#include "sd-netlink.h"
+#include "sd-network.h"
 
-#include "strv.h"
-#include "build.h"
-#include "util.h"
-#include "pager.h"
-#include "rtnl-util.h"
-#include "udev-util.h"
-#include "hwdb-util.h"
 #include "arphrd-list.h"
+#include "device-util.h"
+#include "ether-addr-util.h"
+#include "hwdb-util.h"
+#include "lldp.h"
 #include "local-addresses.h"
+#include "netlink-util.h"
+#include "pager.h"
 #include "socket-util.h"
-#include "ether-addr-util.h"
+#include "string-util.h"
+#include "strv.h"
+#include "terminal-util.h"
+#include "util.h"
+#include "verbs.h"
 
 static bool arg_no_pager = false;
 static bool arg_legend = true;
@@ -52,17 +55,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;
+                const char *devtype = NULL, *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"))
@@ -106,19 +112,19 @@ static int link_info_compare(const void *a, const void *b) {
         return x->ifindex - y->ifindex;
 }
 
-static int decode_and_sort_links(sd_rtnl_message *m, LinkInfo **ret) {
+static int decode_and_sort_links(sd_netlink_message *m, LinkInfo **ret) {
         _cleanup_free_ LinkInfo *links = NULL;
         size_t size = 0, c = 0;
-        sd_rtnl_message *i;
+        sd_netlink_message *i;
         int r;
 
-        for (i = m; i; i = sd_rtnl_message_next(i)) {
+        for (i = m; i; i = sd_netlink_message_next(i)) {
                 const char *name;
                 unsigned iftype;
                 uint16_t type;
                 int ifindex;
 
-                r = sd_rtnl_message_get_type(i, &type);
+                r = sd_netlink_message_get_type(i, &type);
                 if (r < 0)
                         return r;
 
@@ -129,7 +135,7 @@ static int decode_and_sort_links(sd_rtnl_message *m, LinkInfo **ret) {
                 if (r < 0)
                         return r;
 
-                r = sd_rtnl_message_read_string(i, IFLA_IFNAME, &name);
+                r = sd_netlink_message_read_string(i, IFLA_IFNAME, &name);
                 if (r < 0)
                         return r;
 
@@ -160,10 +166,10 @@ static void operational_state_to_color(const char *state, const char **on, const
 
         if (streq_ptr(state, "routable")) {
                 *on = ansi_highlight_green();
-                *off = ansi_highlight_off();
+                *off = ansi_normal();
         } else if (streq_ptr(state, "degraded")) {
                 *on = ansi_highlight_yellow();
-                *off = ansi_highlight_off();
+                *off = ansi_normal();
         } else
                 *on = *off = "";
 }
@@ -174,43 +180,38 @@ static void setup_state_to_color(const char *state, const char **on, const char
 
         if (streq_ptr(state, "configured")) {
                 *on = ansi_highlight_green();
-                *off = ansi_highlight_off();
+                *off = ansi_normal();
         } else if (streq_ptr(state, "configuring")) {
                 *on = ansi_highlight_yellow();
-                *off = ansi_highlight_off();
+                *off = ansi_normal();
         } else if (streq_ptr(state, "failed") || streq_ptr(state, "linger")) {
                 *on = ansi_highlight_red();
-                *off = ansi_highlight_off();
+                *off = ansi_normal();
         } 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;
+static int list_links(int argc, char *argv[], void *userdata) {
+        _cleanup_netlink_message_unref_ sd_netlink_message *req = NULL, *reply = NULL;
+        _cleanup_netlink_unref_ sd_netlink *rtnl = NULL;
         _cleanup_free_ LinkInfo *links = NULL;
         int r, c, i;
 
         pager_open_if_enabled();
 
-        r = sd_rtnl_open(&rtnl, 0);
+        r = sd_netlink_open(&rtnl);
         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);
 
-        r = sd_rtnl_message_request_dump(req, true);
+        r = sd_netlink_message_request_dump(req, true);
         if (r < 0)
                 return rtnl_log_create_error(r);
 
-        r = sd_rtnl_call(rtnl, req, 0, &reply);
+        r = sd_netlink_call(rtnl, req, 0, &reply);
         if (r < 0)
                 return log_error_errno(r, "Failed to enumerate links: %m");
 
@@ -223,10 +224,10 @@ static int list_links(char **args, unsigned n) {
 
         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)];
+                char devid[2 + DECIMAL_STR_MAX(int)];
                 _cleanup_free_ char *t = NULL;
 
                 sd_network_link_get_operational_state(links[i].ifindex, &operational_state);
@@ -236,7 +237,7 @@ static int list_links(char **args, unsigned n) {
                 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);
 
@@ -286,14 +287,14 @@ static int ieee_oui(sd_hwdb *hwdb, struct ether_addr *mac, char **ret) {
 }
 
 static int get_gateway_description(
-                sd_rtnl *rtnl,
+                sd_netlink *rtnl,
                 sd_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;
+        _cleanup_netlink_message_unref_ sd_netlink_message *req = NULL, *reply = NULL;
+        sd_netlink_message *m;
         int r;
 
         assert(rtnl);
@@ -306,27 +307,27 @@ static int get_gateway_description(
         if (r < 0)
                 return r;
 
-        r = sd_rtnl_message_request_dump(req, true);
+        r = sd_netlink_message_request_dump(req, true);
         if (r < 0)
                 return r;
 
-        r = sd_rtnl_call(rtnl, req, 0, &reply);
+        r = sd_netlink_call(rtnl, req, 0, &reply);
         if (r < 0)
                 return r;
 
-        for (m = reply; m; m = sd_rtnl_message_next(m)) {
+        for (m = reply; m; m = sd_netlink_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);
+                r = sd_netlink_message_get_errno(m);
                 if (r < 0) {
                         log_error_errno(r, "got error: %m");
                         continue;
                 }
 
-                r = sd_rtnl_message_get_type(m, &type);
+                r = sd_netlink_message_get_type(m, &type);
                 if (r < 0) {
                         log_error_errno(r, "could not get type: %m");
                         continue;
@@ -359,13 +360,13 @@ static int get_gateway_description(
 
                 switch (fam) {
                 case AF_INET:
-                        r = sd_rtnl_message_read_in_addr(m, NDA_DST, &gw.in);
+                        r = sd_netlink_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);
+                        r = sd_netlink_message_read_in6_addr(m, NDA_DST, &gw.in6);
                         if (r < 0)
                                 continue;
 
@@ -377,7 +378,7 @@ static int get_gateway_description(
                 if (!in_addr_equal(fam, &gw, gateway))
                         continue;
 
-                r = sd_rtnl_message_read_ether_addr(m, NDA_LLADDR, &mac);
+                r = sd_netlink_message_read_ether_addr(m, NDA_LLADDR, &mac);
                 if (r < 0)
                         continue;
 
@@ -392,7 +393,7 @@ static int get_gateway_description(
 }
 
 static int dump_gateways(
-                sd_rtnl *rtnl,
+                sd_netlink *rtnl,
                 sd_hwdb *hwdb,
                 const char *prefix,
                 int ifindex) {
@@ -441,7 +442,7 @@ static int dump_gateways(
 }
 
 static int dump_addresses(
-                sd_rtnl *rtnl,
+                sd_netlink *rtnl,
                 const char *prefix,
                 int ifindex) {
 
@@ -492,20 +493,20 @@ static void dump_list(const char *prefix, char **l) {
 }
 
 static int link_status_one(
-                sd_rtnl *rtnl,
-                struct udev *udev,
+                sd_netlink *rtnl,
                 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_free_ char *setup_state = NULL, *operational_state = NULL, *tz = NULL;
+        _cleanup_netlink_message_unref_ sd_netlink_message *req = NULL, *reply = 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;
@@ -513,7 +514,6 @@ static int link_status_one(
         uint32_t mtu;
 
         assert(rtnl);
-        assert(udev);
         assert(name);
 
         if (safe_atoi(name, &ifindex) >= 0 && ifindex > 0)
@@ -523,13 +523,13 @@ static int link_status_one(
                 if (r < 0)
                         return rtnl_log_create_error(r);
 
-                r = sd_rtnl_message_append_string(req, IFLA_IFNAME, name);
+                r = sd_netlink_message_append_string(req, IFLA_IFNAME, name);
         }
 
         if (r < 0)
                 return rtnl_log_create_error(r);
 
-        r = sd_rtnl_call(rtnl, req, 0, &reply);
+        r = sd_netlink_call(rtnl, req, 0, &reply);
         if (r < 0)
                 return log_error_errno(r, "Failed to query link: %m");
 
@@ -537,7 +537,7 @@ static int link_status_one(
         if (r < 0)
                 return rtnl_log_parse_error(r);
 
-        r = sd_rtnl_message_read_string(reply, IFLA_IFNAME, &name);
+        r = sd_netlink_message_read_string(reply, IFLA_IFNAME, &name);
         if (r < 0)
                 return rtnl_log_parse_error(r);
 
@@ -545,7 +545,7 @@ static int link_status_one(
         if (r < 0)
                 return rtnl_log_parse_error(r);
 
-        have_mac = sd_rtnl_message_read_ether_addr(reply, IFLA_ADDRESS, &e) >= 0;
+        have_mac = sd_netlink_message_read_ether_addr(reply, IFLA_ADDRESS, &e) >= 0;
 
         if (have_mac) {
                 const uint8_t *p;
@@ -561,7 +561,7 @@ static int link_status_one(
                         have_mac = false;
         }
 
-        sd_rtnl_message_read_u32(reply, IFLA_MTU, &mtu);
+        sd_netlink_message_read_u32(reply, IFLA_MTU, &mtu);
 
         sd_network_link_get_operational_state(ifindex, &operational_state);
         operational_state_to_color(operational_state, &on_color_operational, &off_color_operational);
@@ -570,7 +570,6 @@ static int link_status_one(
         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) {
@@ -585,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),
@@ -617,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;
@@ -632,47 +636,54 @@ 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);
+
+        (void) sd_network_link_get_ntp(ifindex, &ntp);
         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);
+
+        (void) sd_network_link_get_timezone(ifindex, &tz);
+        if (tz)
+                printf("       Time Zone: %s", tz);
 
         return 0;
 }
 
-static int link_status(char **args, unsigned n) {
+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;
+        _cleanup_netlink_unref_ sd_netlink *rtnl = NULL;
         char **name;
         int r;
 
-        r = sd_rtnl_open(&rtnl, 0);
+        r = sd_netlink_open(&rtnl);
         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");
 
-        if (n <= 1 && !arg_all) {
+        if (argc <= 1 && !arg_all) {
                 _cleanup_free_ char *operational_state = NULL;
                 _cleanup_strv_free_ char **dns = NULL, **ntp = NULL, **domains = NULL;
                 const char *on_color_operational, *off_color_operational;
@@ -705,7 +716,7 @@ static int link_status(char **args, unsigned n) {
         pager_open_if_enabled();
 
         if (arg_all) {
-                _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL;
+                _cleanup_netlink_message_unref_ sd_netlink_message *req = NULL, *reply = NULL;
                 _cleanup_free_ LinkInfo *links = NULL;
                 int c, i;
 
@@ -713,11 +724,11 @@ static int link_status(char **args, unsigned n) {
                 if (r < 0)
                         return rtnl_log_create_error(r);
 
-                r = sd_rtnl_message_request_dump(req, true);
+                r = sd_netlink_message_request_dump(req, true);
                 if (r < 0)
                         return rtnl_log_create_error(r);
 
-                r = sd_rtnl_call(rtnl, req, 0, &reply);
+                r = sd_netlink_call(rtnl, req, 0, &reply);
                 if (r < 0)
                         return log_error_errno(r, "Failed to enumerate links: %m");
 
@@ -729,17 +740,280 @@ static int link_status(char **args, unsigned n) {
                         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, args + 1) {
-                        if (name != args+1)
+                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);
+                }
+        }
+
+        return 0;
+}
+
+const char *lldp_system_capability_to_string(LLDPSystemCapabilities d) _const_;
+LLDPSystemCapabilities lldp_system_capability_from_string(const char *d) _pure_;
+
+static const char* const lldp_system_capability_table[_LLDP_SYSTEM_CAPABILITIES_MAX + 1] = {
+        [LLDP_SYSTEM_CAPABILITIES_OTHER] = "O",
+        [LLDP_SYSTEM_CAPABILITIES_REPEATER] = "P",
+        [LLDP_SYSTEM_CAPABILITIES_BRIDGE] = "B",
+        [LLDP_SYSTEM_CAPABILITIES_WLAN_AP] = "W",
+        [LLDP_SYSTEM_CAPABILITIES_ROUTER] = "R",
+        [LLDP_SYSTEM_CAPABILITIES_PHONE] = "T",
+        [LLDP_SYSTEM_CAPABILITIES_DOCSIS] = "D",
+        [LLDP_SYSTEM_CAPABILITIES_STATION] = "A",
+        [LLDP_SYSTEM_CAPABILITIES_CVLAN] = "C",
+        [LLDP_SYSTEM_CAPABILITIES_SVLAN] = "S",
+        [LLDP_SYSTEM_CAPABILITIES_TPMR] = "M",
+        [_LLDP_SYSTEM_CAPABILITIES_MAX] = "N/A",
+};
+
+DEFINE_STRING_TABLE_LOOKUP(lldp_system_capability, LLDPSystemCapabilities);
+
+static char *lldp_system_caps(uint16_t cap) {
+        _cleanup_free_ char *s = NULL, *t = NULL;
+        char *capability;
+
+        t = strdup("[ ");
+        if (!t)
+                return NULL;
+
+        if (cap & LLDP_SYSTEM_CAPABILITIES_OTHER) {
+                s = strjoin(t, lldp_system_capability_to_string(LLDP_SYSTEM_CAPABILITIES_OTHER), " ", NULL);
+                if (!s)
+                        return NULL;
+
+                free(t);
+                t = s;
+        }
+
+        if (cap & LLDP_SYSTEM_CAPABILITIES_REPEATER) {
+                s = strjoin(t, lldp_system_capability_to_string(LLDP_SYSTEM_CAPABILITIES_REPEATER), " ", NULL);
+                if (!s)
+                        return NULL;
+
+                free(t);
+                t = s;
+        }
+
+        if (cap & LLDP_SYSTEM_CAPABILITIES_BRIDGE) {
+                s = strjoin(t, lldp_system_capability_to_string(LLDP_SYSTEM_CAPABILITIES_BRIDGE), " ", NULL);
+                if (!s)
+                        return NULL;
+
+                free(t);
+                t = s;
+        }
+
+        if (cap & LLDP_SYSTEM_CAPABILITIES_WLAN_AP) {
+                s = strjoin(t, lldp_system_capability_to_string(LLDP_SYSTEM_CAPABILITIES_WLAN_AP), " ", NULL);
+                if (!s)
+                        return NULL;
+
+                free(t);
+                t = s;
+        }
+
+        if (cap & LLDP_SYSTEM_CAPABILITIES_ROUTER) {
+                s = strjoin(t, lldp_system_capability_to_string(LLDP_SYSTEM_CAPABILITIES_ROUTER), " ", NULL);
+                if (!s)
+                        return NULL;
+
+                free(t);
+                t = s;
+        }
+
+        if (cap & LLDP_SYSTEM_CAPABILITIES_PHONE) {
+                s = strjoin(t, lldp_system_capability_to_string(LLDP_SYSTEM_CAPABILITIES_PHONE), " ", NULL);
+                if (!s)
+                        return NULL;
+
+                free(t);
+                t = s;
+        }
+
+        if (cap & LLDP_SYSTEM_CAPABILITIES_DOCSIS) {
+                s = strjoin(t, lldp_system_capability_to_string(LLDP_SYSTEM_CAPABILITIES_DOCSIS), " ", NULL);
+                if (!s)
+                        return NULL;
+
+                free(t);
+                t = s;
+        }
+
+        if (cap & LLDP_SYSTEM_CAPABILITIES_STATION) {
+                s = strjoin(t, lldp_system_capability_to_string(LLDP_SYSTEM_CAPABILITIES_STATION), " ", NULL);
+                if (!s)
+                        return NULL;
+
+                free(t);
+                t = s;
+        }
+
+        if (cap & LLDP_SYSTEM_CAPABILITIES_CVLAN) {
+                s = strjoin(t, lldp_system_capability_to_string(LLDP_SYSTEM_CAPABILITIES_CVLAN), " ", NULL);
+                if (!s)
+                        return NULL;
+
+                free(t);
+                t = s;
+        }
+
+        if (cap & LLDP_SYSTEM_CAPABILITIES_SVLAN) {
+                s = strjoin(t, lldp_system_capability_to_string(LLDP_SYSTEM_CAPABILITIES_SVLAN), " ", NULL);
+                if (!s)
+                        return NULL;
+
+                free(t);
+                t = s;
+        }
+
+        if (cap & LLDP_SYSTEM_CAPABILITIES_TPMR) {
+                s = strappend(t, lldp_system_capability_to_string(LLDP_SYSTEM_CAPABILITIES_TPMR));
+                if (!s)
+                        return NULL;
+
+                free(t);
+        }
+
+        if (!s) {
+                s = strappend(t, lldp_system_capability_to_string(_LLDP_SYSTEM_CAPABILITIES_MAX));
+                if (!s)
+                        return NULL;
+
+                free(t);
+        }
+
+        t = strappend(s, "]");
+        if (!t)
+                return NULL;
+
+        free(s);
+        capability = t;
+
+        s = NULL;
+        t = NULL;
+
+        return capability;
+}
+
+static int link_lldp_status(int argc, char *argv[], void *userdata) {
+        _cleanup_netlink_message_unref_ sd_netlink_message *req = NULL, *reply = NULL;
+        _cleanup_netlink_unref_ sd_netlink *rtnl = NULL;
+        _cleanup_free_ LinkInfo *links = NULL;
+        const char *state, *word;
+
+        double ttl = -1;
+        uint32_t capability;
+        int i, r, c, j;
+        size_t ll;
+        char **s;
+
+        pager_open_if_enabled();
+
+        r = sd_netlink_open(&rtnl);
+        if (r < 0)
+                return log_error_errno(r, "Failed to connect to netlink: %m");
+
+        r = sd_rtnl_message_new_link(rtnl, &req, RTM_GETLINK, 0);
+        if (r < 0)
+                return rtnl_log_create_error(r);
+
+        r = sd_netlink_message_request_dump(req, true);
+        if (r < 0)
+                return rtnl_log_create_error(r);
+
+        r = sd_netlink_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);
+
+        if (arg_legend)
+                printf("%s %16s %24s %16s %16s\n", "Local Intf", "Device ID", "Port ID", "TTL", "Capability");
+
+        for (i = j = 0; i < c; i++) {
+                _cleanup_free_ char *chassis = NULL, *port = NULL, *cap = NULL, *lldp = NULL;
+                _cleanup_strv_free_ char **l = NULL;
+
+                r = sd_network_link_get_lldp(links[i].ifindex, &lldp);
+                if (r < 0)
+                        continue;
+
+                l = strv_split_newlines(lldp);
+                if (!l)
+                        return -ENOMEM;
+
+                STRV_FOREACH(s, l) {
+                        FOREACH_WORD_QUOTED(word, ll, *s, state) {
+                                _cleanup_free_ char *t = NULL, *a = NULL, *b = NULL;
+
+                                t = strndup(word, ll);
+                                if (!t)
+                                        return -ENOMEM;
+
+                                r = split_pair(t, "=", &a, &b);
+                                if (r < 0)
+                                        continue;
+
+                                if (streq(a, "_Chassis")) {
+                                        r = free_and_strdup(&chassis, b);
+                                        if (r < 0)
+                                                return r;
+
+                                } else if (streq(a, "_Port")) {
+                                        r = free_and_strdup(&port, b);
+                                        if (r < 0)
+                                                return r;
+
+                                } else if (streq(a, "_TTL")) {
+                                        long long unsigned x = 0;
+                                        usec_t time;
+
+                                        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);
+
+                                        time = now(clock_boottime_or_monotonic());
+                                        if (x < time)
+                                                continue;
+
+                                        ttl = (double) (x - time) / USEC_PER_SEC;
+
+                                } else if (streq(a, "_CAP")) {
+                                        sscanf(b, "%x", &capability);
+
+                                        cap = lldp_system_caps(capability);
+                                }
+
+                        }
+
+                        if (ttl >= 0) {
+                                printf("%10s %24s %16s %16f %16s\n",
+                                       links[i].name,
+                                       strna(chassis), strna(port),
+                                       ttl, cap);
+                                j++;
+                        }
                 }
         }
 
+        if (arg_legend) {
+                printf("\nCapability Codes:\n"
+                       "(O) - Other, (P) - Repeater,  (B) - Bridge , (W) - WLAN Access Point, (R) = Router,\n"
+                       "(T) - Telephone, (D) - Data Over Cable Service Interface Specifications, (A) - Station,\n"
+                       "(C) - Customer VLAN, (S) - Service VLAN, (M) - Two-port MAC Relay (TPMR)\n\n");
+
+                printf("Total entries displayed: %d\n", j);
+        }
+
         return 0;
 }
 
@@ -753,7 +1027,8 @@ 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);
 }
 
@@ -788,9 +1063,7 @@ static int parse_argv(int argc, char *argv[]) {
                         return 0;
 
                 case ARG_VERSION:
-                        puts(PACKAGE_STRING);
-                        puts(SYSTEMD_FEATURES);
-                        return 0;
+                        return version();
 
                 case ARG_NO_PAGER:
                         arg_no_pager = true;
@@ -816,79 +1089,14 @@ static int parse_argv(int argc, char *argv[]) {
 }
 
 static int networkctl_main(int argc, char *argv[]) {
-
-        static const struct {
-                const char* verb;
-                const enum {
-                        MORE,
-                        LESS,
-                        EQUAL
-                } argc_cmp;
-                const int argc;
-                int (* const dispatch)(char **args, unsigned n);
-        } verbs[] = {
-                { "list",   LESS, 1, list_links  },
-                { "status", MORE, 1, link_status },
+        const Verb verbs[] = {
+                { "list", VERB_ANY, 1, VERB_DEFAULT, list_links },
+                { "status", 1, VERB_ANY, 0, link_status },
+                { "lldp", VERB_ANY, 1, VERB_DEFAULT, link_lldp_status },
+                {}
         };
 
-        int left;
-        unsigned i;
-
-        assert(argc >= 0);
-        assert(argv);
-
-        left = argc - optind;
-
-        if (left <= 0)
-                /* Special rule: no arguments means "list" */
-                i = 0;
-        else {
-                if (streq(argv[optind], "help")) {
-                        help();
-                        return 0;
-                }
-
-                for (i = 0; i < ELEMENTSOF(verbs); i++)
-                        if (streq(argv[optind], verbs[i].verb))
-                                break;
-
-                if (i >= ELEMENTSOF(verbs)) {
-                        log_error("Unknown operation %s", argv[optind]);
-                        return -EINVAL;
-                }
-        }
-
-        switch (verbs[i].argc_cmp) {
-
-        case EQUAL:
-                if (left != verbs[i].argc) {
-                        log_error("Invalid number of arguments.");
-                        return -EINVAL;
-                }
-
-                break;
-
-        case MORE:
-                if (left < verbs[i].argc) {
-                        log_error("Too few arguments.");
-                        return -EINVAL;
-                }
-
-                break;
-
-        case LESS:
-                if (left > verbs[i].argc) {
-                        log_error("Too many arguments.");
-                        return -EINVAL;
-                }
-
-                break;
-
-        default:
-                assert_not_reached("Unknown comparison operator.");
-        }
-
-        return verbs[i].dispatch(argv + optind, left);
+        return dispatch_verb(argc, argv, verbs, NULL);
 }
 
 int main(int argc, char* argv[]) {